Version bump. Remove ebuild with old api version. Add live ebuild.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

5 files changed, 102 insertions, 38 deletions

diff --git a/sci-geosciences/osm2pgsql/ChangeLog b/sci-geosciences/osm2pgsql/ChangeLog
index bcd3f745740c..6380a38b2e4a 100644
--- a/sci-geosciences/osm2pgsql/ChangeLog
+++ b/sci-geosciences/osm2pgsql/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sci-geosciences/osm2pgsql
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/osm2pgsql/ChangeLog,v 1.1 2009/07/08 12:55:19 tupone Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/osm2pgsql/ChangeLog,v 1.2 2010/04/27 09:22:19 scarabeus Exp $
+
+*osm2pgsql-99999999 (27 Apr 2010)
+*osm2pgsql-20100413 (27 Apr 2010)
+
+  27 Apr 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -osm2pgsql-20090707.ebuild, +osm2pgsql-20100413.ebuild,
+  +osm2pgsql-99999999.ebuild:
+  Version bump. Remove ebuild with old api version. Add live ebuild.
 
 *osm2pgsql-20090707 (08 Jul 2009)
 
diff --git a/sci-geosciences/osm2pgsql/Manifest b/sci-geosciences/osm2pgsql/Manifest
index f60fcf586e14..8bc648ddeece 100644
--- a/sci-geosciences/osm2pgsql/Manifest
+++ b/sci-geosciences/osm2pgsql/Manifest
@@ -1,4 +1,15 @@
-DIST osm2pgsql-20090707.tar.bz2 162960 RMD160 9e0245437ad086f6664e3d5b3caeae0020917e03 SHA1 cf135e329c818c63ef0cc3892e00eb7042937e76 SHA256 1997ffe10b05ef5571041d7a3cc69789c41278a71c595b643a7be2d3a7a0850a
-EBUILD osm2pgsql-20090707.ebuild 776 RMD160 bba0d2a783400b778b8d78676e4a0ee72a9e7e1f SHA1 8372942fbb87e04db4d6c73e658e8588e1ccc922 SHA256 f4dcea06517efd943478556f10c869ef3c87e3b343051bf8a6c338b68367b6b0
-MISC ChangeLog 399 RMD160 346e77becafba4a24a2cf3d757ecde50374d91e2 SHA1 22e441143010784e658bbd8dbd25da713454aff0 SHA256 f56cffac525822a676a8990d32e9731c3b5773133de2dcc4d1ee3bde1c280a95
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST osm2pgsql-20100413svn.tar.bz2 15993739 RMD160 ce7fd76105f7bb2b6e19407952744a7a5a5038a9 SHA1 17459b84b6b3db0fbb3f8ad3ff909db3ef8727a9 SHA256 853888cc49451aa0a6026dd49db8f5c2e34856e809f963a12e59a11130912396
+EBUILD osm2pgsql-20100413.ebuild 801 RMD160 3a13cff23c7b5c403342e1402b2532eb8029846d SHA1 80e7592fcd0c691132ebaec8e3e9cf714d48e459 SHA256 a9979941e23c2d6bae27cae50bc3f0344ca782b7df735e96340569f8c5eb0c02
+EBUILD osm2pgsql-99999999.ebuild 876 RMD160 7cec9bd0268cc82c8b7fc4133b18287639ed5000 SHA1 1a487c952e74b9c719aab323531ee11c7ca818b7 SHA256 9966f633226fd97c00920fe887fbb4f69c813d81b515105e285e86f8fa6d5e3c
+MISC ChangeLog 684 RMD160 dc6e8632f985e5c775986df9f716bb0eb9176805 SHA1 23e8b6826825d919fb15c44116cc3733fe35e4a3 SHA256 1f8fd1dd1b2aef910120ca8434e6ef09de438e1db793005dadf510fc8091f861
 MISC metadata.xml 1354 RMD160 1856096e4faf1887389d58648ec5310edc2dbb6c SHA1 4358fe9bf0ed05454ce4fc248ba6d292a5260f80 SHA256 d6194d50628a7a576b7abe1f2c30bc24b7963b422a7463d7e09d2eba85c69d17
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAkvWrNMACgkQHB6c3gNBRYderACfa571MzljZ2/3dYhdxPRNb4XS
+tsQAnAhPshKoyyuP//v7UqFYCWFDZr8q
+=ozKk
+-----END PGP SIGNATURE-----
diff --git a/sci-geosciences/osm2pgsql/osm2pgsql-20090707.ebuild b/sci-geosciences/osm2pgsql/osm2pgsql-20090707.ebuild
deleted file mode 100644
index b0596aa4fa74..000000000000
--- a/sci-geosciences/osm2pgsql/osm2pgsql-20090707.ebuild
+++ /dev/null
@@ -1,33 +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/osm2pgsql/osm2pgsql-20090707.ebuild,v 1.1 2009/07/08 12:55:19 tupone Exp $
-EAPI=2
-
-inherit eutils
-
-DESCRIPTION="converts OpenStreetMap data into a format for PostgreSQL"
-HOMEPAGE="http://wiki.openstreetmap.org/wiki/Osm2pgsql"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-RDEPEND="dev-libs/libxml2
-	sci-libs/proj
-	sci-libs/geos
-	dev-db/postgis"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch debian/patches/01_style_location
-}
-
-src_install() {
-	dodoc README.txt
-	dobin mapnik-osm-updater.sh osm2pgsql
-	doman debian/osm2pgsql.1
-	insinto /usr/share/${PN}
-	doins default.style
-}
diff --git a/sci-geosciences/osm2pgsql/osm2pgsql-20100413.ebuild b/sci-geosciences/osm2pgsql/osm2pgsql-20100413.ebuild
new file mode 100644
index 000000000000..1863374bcdf6
--- /dev/null
+++ b/sci-geosciences/osm2pgsql/osm2pgsql-20100413.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/osm2pgsql/osm2pgsql-20100413.ebuild,v 1.1 2010/04/27 09:22:19 scarabeus Exp $
+
+EAPI="3"
+
+inherit eutils autotools
+
+DESCRIPTION="Converts OSM data to SQL and insert into PostgreSQL db"
+HOMEPAGE="http://wiki.openstreetmap.org/wiki/Osm2pgsql"
+SRC_URI="http://gentoo.ccss.cz/${P}svn.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	app-arch/bzip2
+	dev-db/postgis
+	dev-libs/libxml2
+	sci-libs/geos
+	sci-libs/proj
+	sys-libs/zlib
+	virtual/postgresql-base
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	eautoreconf
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "install failed"
+
+	dodoc README.txt || die "dodoc failed"
+}
diff --git a/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild b/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild
new file mode 100644
index 000000000000..207a59a577ed
--- /dev/null
+++ b/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild,v 1.1 2010/04/27 09:22:19 scarabeus Exp $
+
+EAPI="3"
+
+inherit eutils autotools subversion
+
+ESVN_REPO_URI="http://svn.openstreetmap.org/applications/utils/export/${PN}/"
+ESVN_PROJECT="${PN}"
+
+DESCRIPTION="Converts OSM data to SQL and insert into PostgreSQL db"
+HOMEPAGE="http://wiki.openstreetmap.org/wiki/Osm2pgsql"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+DEPEND="
+	app-arch/bzip2
+	dev-db/postgis
+	dev-libs/libxml2
+	sci-libs/geos
+	sci-libs/proj
+	sys-libs/zlib
+	virtual/postgresql-base
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	esvn_clean
+	eautoreconf
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "install failed"
+
+	dodoc README.txt || die "dodoc failed"
+}