nixphoeni 14/09/06 19:37:21 Modified: ChangeLog josm-9999.ebuild Added: josm-7347.ebuild Log: Version bump, cf. bug #483114 (Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key 35488453)
Revision Changes Path 1.48 sci-geosciences/josm/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/josm/ChangeLog?rev=1.48&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/josm/ChangeLog?rev=1.48&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/josm/ChangeLog?r1=1.47&r2=1.48 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/josm/ChangeLog,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- ChangeLog 17 Jul 2013 10:06:32 -0000 1.47 +++ ChangeLog 6 Sep 2014 19:37:21 -0000 1.48 @@ -1,6 +1,13 @@ # ChangeLog for sci-geosciences/josm -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/josm/ChangeLog,v 1.47 2013/07/17 10:06:32 hanno Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/josm/ChangeLog,v 1.48 2014/09/06 19:37:21 nixphoeni Exp $ + +*josm-7347 (06 Sep 2014) + + 06 Sep 2014; Joe Sapp <[email protected]> +josm-7347.ebuild, + +files/josm-7347-dist-optimized-fix.patch: + Version bump; thanks to Marcel Pennewiß, Elias Probst, Thomas Beutin, and + Jean-Claude Repetto on bug #483114 *josm-6060 (17 Jul 2013) 1.4 sci-geosciences/josm/josm-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/josm/josm-9999.ebuild?rev=1.4&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/josm/josm-9999.ebuild?rev=1.4&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/josm/josm-9999.ebuild?r1=1.3&r2=1.4 Index: josm-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/josm/josm-9999.ebuild,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- josm-9999.ebuild 17 Jul 2013 10:06:32 -0000 1.3 +++ josm-9999.ebuild 6 Sep 2014 19:37:21 -0000 1.4 @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 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.3 2013/07/17 10:06:32 hanno Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/josm/josm-9999.ebuild,v 1.4 2014/09/06 19:37:21 nixphoeni Exp $ EAPI=5 1.1 sci-geosciences/josm/josm-7347.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/josm/josm-7347.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/josm/josm-7347.ebuild?rev=1.1&content-type=text/plain Index: josm-7347.ebuild =================================================================== # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/sci-geosciences/josm/josm-7347.ebuild,v 1.1 2014/09/06 19:37:21 nixphoeni 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/"; # Upstream doesn't provide versioned tarballs, so we'll have to create one on our own: # REVISION=${PV} # mkdir -p josm-${REVISION} # svn co -r ${REVISION} http://josm.openstreetmap.de/svn/trunk/ josm-${REVISION} # cd josm-${REVISION} && ant init-svn-revision-xml && cd - # tar -cz --exclude=.svn -f /usr/portage/distfiles/josm-${REVISION}.tar.gz josm-${REVISION} [[ ${PV} == "9999" ]] || SRC_URI="mirror://gentoo/${P}.tar.gz" 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.7" RDEPEND=">=virtual/jre-1.7" 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" else # Remove dependency on git and svn just for generating a # revision - the tarball should already have REVISION.XML sed -i -e 's:, *init-git-revision-xml::g' \ -e '/<exec[ \t].*"svn"[ \t].*/,+5{d;n;}' \ -e 's:${svn.info.result}:1:' \ build.xml || die "sed failed" # Fix for josm bug #10325 epatch "${FILESDIR}/${P}-dist-optimized-fix.patch" 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" }
