Version bump to latest. Drop older.

(Portage version: 2.2.0_alpha38/cvs/Linux x86_64)

6 files changed, 12 insertions, 83 deletions

diff --git a/sci-geosciences/josm/ChangeLog b/sci-geosciences/josm/ChangeLog
index df8c544a5505..aa9496ce21df 100644
--- a/sci-geosciences/josm/ChangeLog
+++ b/sci-geosciences/josm/ChangeLog
@@ -1,6 +1,13 @@
 # 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.36 2011/03/31 12:28:34 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/josm/ChangeLog,v 1.37 2011/06/08 11:40:49 scarabeus Exp $
+
+*josm-4064 (08 Jun 2011)
+
+  08 Jun 2011; Tomáš Chvátal <scarabeus@gentoo.org> -josm-3695.ebuild,
+  -josm-3701.ebuild, -josm-3966.ebuild, +josm-4064.ebuild, -files/josm-r1,
+  -files/josm.png:
+  Version bump to latest. Drop older.
 
 *josm-3966 (31 Mar 2011)
 
diff --git a/sci-geosciences/josm/files/josm-r1 b/sci-geosciences/josm/files/josm-r1
deleted file mode 100755
index 48c34d8bb46d..000000000000
--- a/sci-geosciences/josm/files/josm-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-if [ -z "$http_proxy" ]; then
-	java -jar /usr/share/josm/lib/josm.jar
-else
-	proxy_port=`echo $http_proxy|sed -e 's/.*://g'`
-	proxy_host=`echo $http_proxy|sed -e 's!\(.*://\)\?\(.*\):.*!\2!g'`
-	java -Dhttp.proxyHost=$proxy_host -Dhttp.proxyPort=$proxy_port -jar /usr/share/josm/lib/josm.jar
-fi
diff --git a/sci-geosciences/josm/files/josm.png b/sci-geosciences/josm/files/josm.png
deleted file mode 100644
index aebba7625ec0..000000000000
--- a/sci-geosciences/josm/files/josm.png
+++ /dev/null
diff --git a/sci-geosciences/josm/josm-3695.ebuild b/sci-geosciences/josm/josm-3695.ebuild
deleted file mode 100644
index 6871ee98ee58..000000000000
--- a/sci-geosciences/josm/josm-3695.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/josm/josm-3695.ebuild,v 1.1 2010/12/06 01:38:08 hanno Exp $
-
-EAPI="3"
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Java-based editor for the OpenStreetMap project"
-HOMEPAGE="http://josm.openstreetmap.de/"
-SRC_URI="http://josm.fabian-fingerle.de/${P}.tar.xz"
-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"
-}
diff --git a/sci-geosciences/josm/josm-3701.ebuild b/sci-geosciences/josm/josm-3701.ebuild
deleted file mode 100644
index e5c563889197..000000000000
--- a/sci-geosciences/josm/josm-3701.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/josm/josm-3701.ebuild,v 1.1 2010/12/25 15:53:05 hanno Exp $
-
-EAPI="3"
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Java-based editor for the OpenStreetMap project"
-HOMEPAGE="http://josm.openstreetmap.de/"
-SRC_URI="http://josm.fabian-fingerle.de/${P}.tar.xz"
-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"
-}
diff --git a/sci-geosciences/josm/josm-3966.ebuild b/sci-geosciences/josm/josm-4064.ebuild
index 4af64158f7a6..e75b2028950f 100644
--- a/sci-geosciences/josm/josm-3966.ebuild
+++ b/sci-geosciences/josm/josm-4064.ebuild
@@ -1,8 +1,10 @@
 # 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-3966.ebuild,v 1.1 2011/03/31 12:28:34 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/josm/josm-4064.ebuild,v 1.1 2011/06/08 11:40:49 scarabeus Exp $
 
-EAPI="3"
+EAPI=4
+
+JAVA_ANT_ENCODING=UTF-8
 
 inherit eutils java-pkg-2 java-ant-2
 
@@ -22,7 +24,6 @@ S="${WORKDIR}/${PN}"
 IUSE=""
 
 src_compile() {
-	JAVA_ANT_ENCODING=UTF-8
 	eant dist
 }