Version bump to latest. Drop older that do not work. Most probably still needs more java love.

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

4 files changed, 31 insertions, 45 deletions

diff --git a/sci-geosciences/osmosis/ChangeLog b/sci-geosciences/osmosis/ChangeLog
index 9f401c9666ca..a3adbd279257 100644
--- a/sci-geosciences/osmosis/ChangeLog
+++ b/sci-geosciences/osmosis/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-geosciences/osmosis
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/osmosis/ChangeLog,v 1.3 2009/03/14 13:00:38 hanno Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/osmosis/ChangeLog,v 1.4 2011/06/01 12:00:44 scarabeus Exp $
+
+*osmosis-0.39 (01 Jun 2011)
+
+  01 Jun 2011; Tomáš Chvátal <scarabeus@gentoo.org> -osmosis-0.29.ebuild,
+  -osmosis-0.30.ebuild, +osmosis-0.39.ebuild:
+  Version bump to latest. Drop older that do not work. Most probably still
+  needs more java love.
 
 *osmosis-0.30 (14 Mar 2009)
 
diff --git a/sci-geosciences/osmosis/Manifest b/sci-geosciences/osmosis/Manifest
index c7c040e4804f..f8c80441d034 100644
--- a/sci-geosciences/osmosis/Manifest
+++ b/sci-geosciences/osmosis/Manifest
@@ -1,16 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST osmosis-0.29.tar.gz 2947422 RMD160 fded4c997bd2bc008ffda3367076fd8c85fa2f99 SHA1 5823ad1809d01f08d006388c943ba4ba99ca0883 SHA256 3619c72bc72c3a0e8d84d3cec7e31a3c418e871484ba1d310c980f6a486f2217
-DIST osmosis-0.30.tar.gz 3711955 RMD160 5e9b06f455b920c75900a5e6dd1d3eb1588380b0 SHA1 ea169086b37aeac6bdee762a3c8187b430551596 SHA256 40985cf8b809b38bd95fefc63a483e1f6f13f881e253c2f47290fce0fffb6158
-EBUILD osmosis-0.29.ebuild 851 RMD160 c9be3ceb2c5b88ae63f3db9620bfd443dd261006 SHA1 776c2a44fc3d58b59828630468b70793e8ea61e5 SHA256 2437fd04d003623459008972fc896db831ced085ab08b0a3dcaacc9dcf8f6441
-EBUILD osmosis-0.30.ebuild 851 RMD160 625cebf781f523c645641368685db4dc39cec25a SHA1 39aabc367806d967140ea035a6d30f1415965165 SHA256 9379f625f8f4f8dbe61beedd952d2a96a31f694b8a387b98040e941d4f63996c
-MISC ChangeLog 579 RMD160 45a81f099487aa03e92039cef96407bb63cd51e8 SHA1 2c5211bf77f3937a49133eefc5bc3c1a4ec30e24 SHA256 56100a03472014d49f11f38ef2b5781fe69882a318502225055edfee04dfd98f
+DIST osmosis-0.39.tgz 7408247 RMD160 362920bb2b169de0780ed33c787b16761ac4c95d SHA1 6f7182061285ef949186850329d93be5d5610a15 SHA256 8143bbe58b9ac2f7fa55a9e69d1fc407d1b786c31579b739b2b611268aad4fd3
+EBUILD osmosis-0.39.ebuild 994 RMD160 825fcf9ae060c2debb16cdbffc7626d0d4565976 SHA1 f57caf2aade690fe9deaff43de3f35e3ca883f65 SHA256 587d28e09576aa16858a1690258b0522490a2e3b7b54b2b1ab21c9b04d2ba13d
+MISC ChangeLog 835 RMD160 05b24f41f1cf611c4a5c291965fc6bccc3142af9 SHA1 03605d121ba4599af8034e914466b09a0e8e1ea0 SHA256 3b04aaa0ddafae9ad3b85e86653b54c0ee53ca23c50af51afe741fdd1a216bc0
 MISC metadata.xml 237 RMD160 20944f06e761a57587043f3ec7ec969a5ab9bdcc SHA1 33b0366a9efeb0caad5712fb7e628147dff924be SHA256 29eb01e164be9510d6a51d6477c169df641127a2a2df064c9d99c90c067ac3d7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.10 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAkm7qn0ACgkQr2QksT29OyA6NgCgmn1YREratcXMA2Ex0srjTNEv
-G/YAnj0K4bf833B4I8YfQCZB9hhLFnpd
-=J5Wk
+iEYEARECAAYFAk3mKeYACgkQHB6c3gNBRYcI1ACgnRzqxNPbw3q3iLgs8oaOdWjv
+D/kAoI1UD8NYJ1JKfyMEQiKDYWi9VK+3
+=hJvP
 -----END PGP SIGNATURE-----
diff --git a/sci-geosciences/osmosis/osmosis-0.30.ebuild b/sci-geosciences/osmosis/osmosis-0.30.ebuild
deleted file mode 100644
index 8efda60fd59a..000000000000
--- a/sci-geosciences/osmosis/osmosis-0.30.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/osmosis/osmosis-0.30.ebuild,v 1.1 2009/03/14 13:00:38 hanno Exp $
-
-WANT_ANT_TASKS="ant-nodeps"
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Commandline tool to process openstreetmap data"
-HOMEPAGE="http://wiki.openstreetmap.org/index.php/Osmosis"
-SRC_URI="http://gweb.bretth.com/${P}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-DEPEND=">=virtual/jdk-1.5"
-RDEPEND=">=virtual/jre-1.5"
-S="${WORKDIR}/${P}"
-
-src_compile() {
-	eant build_binary || die
-}
-
-src_install() {
-	java-pkg_newjar "${PN}.jar" || die "java-pkg_newjar failed"
-	java-pkg_dolauncher "${PN}" --jar "${PN}.jar" || die "java-pkg_dolauncher failed"
-
-	dodoc readme.txt changes.txt doc/*.txt || die "dodoc failed"
-}
diff --git a/sci-geosciences/osmosis/osmosis-0.29.ebuild b/sci-geosciences/osmosis/osmosis-0.39.ebuild
index 91645d8f1292..4814212d3bac 100644
--- a/sci-geosciences/osmosis/osmosis-0.29.ebuild
+++ b/sci-geosciences/osmosis/osmosis-0.39.ebuild
@@ -1,20 +1,29 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/osmosis/osmosis-0.29.ebuild,v 1.2 2008/11/16 12:41:58 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/osmosis/osmosis-0.39.ebuild,v 1.1 2011/06/01 12:00:44 scarabeus Exp $
+
+EAPI=4
 
 WANT_ANT_TASKS="ant-nodeps"
 inherit java-pkg-2 java-ant-2
 
 DESCRIPTION="Commandline tool to process openstreetmap data"
 HOMEPAGE="http://wiki.openstreetmap.org/index.php/Osmosis"
-SRC_URI="http://gweb.bretth.com/${P}.tar.gz"
+SRC_URI="http://bretth.dev.openstreetmap.org/osmosis-build/${P}.tgz"
+
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="mysql postgres"
+
 DEPEND=">=virtual/jdk-1.5"
-RDEPEND=">=virtual/jre-1.5"
-S="${WORKDIR}/${P}"
+RDEPEND="
+	>=virtual/jre-1.5
+	dev-java/classworlds
+	dev-java/jpf
+	mysql? ( dev-java/jdbc-mysql )
+	postgres? ( dev-java/jdbc-postgresql )
+"
 
 src_compile() {
 	eant build_binary || die