* [gentoo-commits] gentoo-x86 commit in sci-geosciences/josm: josm-9999.ebuild josm-5608.ebuild ChangeLog josm-5356.ebuild josm-4550.ebuild josm-5315.ebuild josm-4203.ebuild
@ 2013-01-13 12:28 Hanno Boeck (hanno)
0 siblings, 0 replies; only message in thread
From: Hanno Boeck (hanno) @ 2013-01-13 12:28 UTC (permalink / raw
To: gentoo-commits
hanno 13/01/13 12:28:13
Modified: josm-9999.ebuild ChangeLog
Added: josm-5608.ebuild
Removed: josm-5356.ebuild josm-4550.ebuild josm-5315.ebuild
josm-4203.ebuild
Log:
Version bump, switch to different source archives that allow building without svn
(Portage version: 2.1.11.40/cvs/Linux x86_64, signed Manifest commit with key 0xA5880072BBB51E42)
Revision Changes Path
1.2 sci-geosciences/josm/josm-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/josm/josm-9999.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/josm/josm-9999.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/josm/josm-9999.ebuild?r1=1.1&r2=1.2
Index: josm-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/josm/josm-9999.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- josm-9999.ebuild 17 Jun 2011 10:00:39 -0000 1.1
+++ josm-9999.ebuild 13 Jan 2013 12:28:13 -0000 1.2
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/josm/josm-9999.ebuild,v 1.1 2011/06/17 10:00:39 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/josm/josm-9999.ebuild,v 1.2 2013/01/13 12:28:13 hanno Exp $
-EAPI=4
+EAPI=5
JAVA_ANT_ENCODING=UTF-8
@@ -13,25 +13,24 @@
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"
+[[ ${PV} == "9999" ]] || SRC_URI="http://josm.hboeck.de/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-[[ ${PV} == "9999" ]] || KEYWORDS="~amd64 ~x86"
+
+# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
+[[ ${PV} == "9999" ]] || \
+KEYWORDS="~amd64 ~x86"
DEPEND=">=virtual/jdk-1.6"
RDEPEND=">=virtual/jre-1.6"
-S="${WORKDIR}/${PN}"
+S="${WORKDIR}/${P}"
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
@@ -42,13 +41,13 @@
}
src_compile() {
- eant dist
+ eant dist-optimized
}
src_install() {
- java-pkg_newjar "dist/${PN}.jar" || die "java-pkg_newjar failed"
+ java-pkg_newjar "dist/${PN}-custom-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"
+ make_desktop_entry "${PN}" "Java OpenStreetMap Editor" josm "Utility;Science;Geoscience"
}
1.46 sci-geosciences/josm/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/josm/ChangeLog?rev=1.46&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/josm/ChangeLog?rev=1.46&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/josm/ChangeLog?r1=1.45&r2=1.46
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/josm/ChangeLog,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- ChangeLog 16 Nov 2012 20:12:26 -0000 1.45
+++ ChangeLog 13 Jan 2013 12:28:13 -0000 1.46
@@ -1,6 +1,14 @@
# ChangeLog for sci-geosciences/josm
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/josm/ChangeLog,v 1.45 2012/11/16 20:12:26 ago Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/josm/ChangeLog,v 1.46 2013/01/13 12:28:13 hanno Exp $
+
+*josm-5608 (13 Jan 2013)
+
+ 13 Jan 2013; Hanno Boeck <hanno@gentoo.org> +josm-5608.ebuild,
+ -josm-4203.ebuild, -josm-4550.ebuild, -josm-5315.ebuild, -josm-5356.ebuild,
+ josm-9999.ebuild:
+ Version bump, switch to different source archives that allow building without
+ svn
16 Nov 2012; Agostino Sarubbo <ago@gentoo.org> josm-4203.ebuild,
josm-4550.ebuild, josm-5315.ebuild, josm-5356.ebuild, josm-5485.ebuild:
1.1 sci-geosciences/josm/josm-5608.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/josm/josm-5608.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/josm/josm-5608.ebuild?rev=1.1&content-type=text/plain
Index: josm-5608.ebuild
===================================================================
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/josm/josm-5608.ebuild,v 1.1 2013/01/13 12:28:13 hanno Exp $
EAPI=5
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.hboeck.de/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
[[ ${PV} == "9999" ]] || \
KEYWORDS="~amd64 ~x86"
DEPEND=">=virtual/jdk-1.6"
RDEPEND=">=virtual/jre-1.6"
S="${WORKDIR}/${P}"
IUSE=""
src_prepare() {
if [[ ${PV} == "9999" ]]; then
# 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}-custom-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 "Utility;Science;Geoscience"
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2013-01-13 12:28 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-01-13 12:28 [gentoo-commits] gentoo-x86 commit in sci-geosciences/josm: josm-9999.ebuild josm-5608.ebuild ChangeLog josm-5356.ebuild josm-4550.ebuild josm-5315.ebuild josm-4203.ebuild Hanno Boeck (hanno)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox