4 files changed, 88 insertions, 35 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/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"
+}