Version bump to latest. Drop older.

Package-Manager: portage-2.2.0_alpha38/cvs/Linux x86_64

7 files changed, 19 insertions, 106 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/Manifest b/sci-geosciences/josm/Manifest
index db367ca255f8..1d3262370a0d 100644
--- a/sci-geosciences/josm/Manifest
+++ b/sci-geosciences/josm/Manifest
@@ -1,30 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
-AUX josm-r1 304 RMD160 a54bbdbbc2cd1b8ca4deeb11604be22df4194444 SHA1 0bd5757ed573a2c274d76c0b4ba4b770134a0734 SHA256 c407df927e62c4e2afbff998e105dfe4084ab07484a4b28a00f196e7dafee3cf
-AUX josm.png 1737 RMD160 81fc37d55d4b6b14f9a35c3ed89da3ecd7d538f2 SHA1 cd51f118224555727279536bb42a634afcef6626 SHA256 fed9c1ef73900e6a3cac162a4006ab8cd972ba29938a857e8af604779109c39f
-DIST josm-3695.tar.xz 5956376 RMD160 d0dd62bed8018651e487618ac66e69022165965e SHA1 578fe12c9e153a55770c69709cd0e9a7d414e450 SHA256 7beda3509b0a142ac9fab635020704008f789837d4983a4b4579790810cc94dd
-DIST josm-3701.tar.xz 5955876 RMD160 b865f3e3bc3e74b2cc8727dc8f89c4c03ffd95d6 SHA1 9ee61819d154b4c9fccb8790f25246c4f5975670 SHA256 c5584eb3a5df2796c1125fb6c2834fe39345fcda150cb3d753bd5818d24a0462
-DIST josm-3966.tar.xz 6211124 RMD160 01ae06077923aa93fa55fcd2b0791800ab532cbd SHA1 73321e4e707346c250f42f0b777e87d7150ddd6a SHA256 15dcb163c23bc31302f4897126c354db9ac34e0f1ade23a91726b519e13f212d
-EBUILD josm-3695.ebuild 923 RMD160 f9d848cfb450cd91fbe57da5d0289db470ea668a SHA1 756bc439aa829a617df6c0fa3e057c77d5348ef2 SHA256 2fc92abbb0276936190e342957ffa81c2f1084c2d8fcfe5dea3f35fa2e986616
-EBUILD josm-3701.ebuild 923 RMD160 d7af7ab2b3221299b9d5d57c69a2663d69338ae1 SHA1 a180d89b5c3361de50a1963f18688c5e9635e32f SHA256 08177571a875c8014e1a2aaf7907173214d69575a66f04dd3c6da82e06cef25d
-EBUILD josm-3966.ebuild 923 RMD160 0b3c0df5c7e1698c3d7e418d02ccd4cbf92eabdb SHA1 24d8a79a52e1a78e281a6f6c6702595a06c50c0b SHA256 976a44cbd49da096a85aa78798d3a47d8439cc064319e5643d31478f1588ff6f
-MISC ChangeLog 4646 RMD160 0dd4367003cda9bd45671f935f672a533adb6840 SHA1 3e3bccdfcbb3aaf155fb0ad780947271bc77ddf5 SHA256 7dbca890c561c65b33c863cb947a599aed2e88c1d257c832bc6e15090e1aa576
+DIST josm-4064.tar.xz 6372756 RMD160 2ecfb7e805fea4be06bd67ffb96bb161490b7634 SHA1 6179eddce9fa7e1be8bb783e303a6288a1bbaa35 SHA256 64e8a1db85c968d0af272e400745e63205cae1fde3000435c4428f2023c12783
+EBUILD josm-4064.ebuild 925 RMD160 74dfb1866cd7addec8083e8e9313ccd222c0cbdb SHA1 066cc022bc91c61b762a4defe0d92fd9d34933f8 SHA256 df60a320d6bb2eb13ce7b5de7927983a49453865e7dfcdf10b69ea8172e17d5f
+MISC ChangeLog 4883 RMD160 5f8276ef42337398b9db16e401f50986632cde00 SHA1 5caa680b0bd6f896ae3fdefb45a8565ee85145df SHA256 b227952559807e1cc8ba15f612945f8ad319d719aba554d951a72d8ab546a750
 MISC metadata.xml 237 RMD160 20944f06e761a57587043f3ec7ec969a5ab9bdcc SHA1 33b0366a9efeb0caad5712fb7e628147dff924be SHA256 29eb01e164be9510d6a51d6477c169df641127a2a2df064c9d99c90c067ac3d7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCAAGBQJNlIGJAAoJEKWIAHK7tR5CEscP/2+5rVO2tPL4QnTEbftXI2Zq
-vfO5VSj/NTVTZnBy2kRZxP4SHKOsva3f4EXQVPy6J+TLP85N/DL4SOPyRrcc7KNT
-WSS+24fqAgD/IuCkZj6Sylxnqn7fa8UQgJEMASVeNIPbiU8jOUsvFHUwpvn4KJhu
-Ta3trYIk1IGgx2PrD5wt1BCuvCU0frlF1gIsFMqcytcZepF/dIfE5zfEASbMsolz
-Pa5thAKs5Cni+UufjRih90tLb+lzDIrlMOs39Jp/f7h3vtkYYpd4PZe9w81AuoIO
-bIS2763maAZ7NGijd85SEZ/54TIioJ9ICKTwXI/LxuAO7buw7kZOk1zNBC4ynoaP
-S0UXmmbD/DnhskGivg0AkHw0XHO1wKnEf9nRrzBvXnCiawROYI+L/pjX+PWrRvQy
-TCUz/v6OAsrBXTYfIYr2Pr826yWyZpFiXO+K4Ajs3bZAdpzIYuEnx0jXG+tltyXD
-6zCH65O7ggxWWkR96fFZOSFro8AllyrA/FvLWNZncIK/tsIaNGhS3uBK4vFilHp0
-v3+PtRAcR7takLfh1kh3h9Q6VMHAWCAHLsYF6oX899c2G5CLWtIJ1pYRnIcdcZU5
-HerFznEbBh72CAILj0Nze4EwLMflshfwPZw53/v7bIWOu/Jft/J/JS2b6rl+/Zz/
-S8tuEyMT1hmTq0MhMZAY
-=vuWP
+iEYEARECAAYFAk3vX7sACgkQHB6c3gNBRYeC0QCgro8o9Av3DA8wE98qyTAVQgJB
+eiAAoJ3t5OWEUMFcKv2pS/jN2/mRmkJz
+=TDY9
 -----END PGP SIGNATURE-----
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
 }