Move live ebuild from subversion to git, bug #464820 by rubik's cube and Jeroen Roovers.

(Portage version: 2.2.0_alpha166/cvs/Linux x86_64, signed Manifest commit with key 0x64D4CF24)

3 files changed, 17 insertions, 13 deletions

diff --git a/sci-geosciences/osm2pgsql/ChangeLog b/sci-geosciences/osm2pgsql/ChangeLog
index 38999cc23e0c..035e2b1da812 100644
--- a/sci-geosciences/osm2pgsql/ChangeLog
+++ b/sci-geosciences/osm2pgsql/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-geosciences/osm2pgsql
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/osm2pgsql/ChangeLog,v 1.10 2012/05/24 16:26:09 scarabeus Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/osm2pgsql/ChangeLog,v 1.11 2013/04/12 07:47:02 swegener Exp $
+
+  12 Apr 2013; Sven Wegener <swegener@gentoo.org> osm2pgsql-99999999.ebuild,
+  metadata.xml:
+  Move live ebuild from subversion to git, bug #464820 by rubik's cube and
+  Jeroen Roovers.
 
   24 May 2012; Tomáš Chvátal <scarabeus@gentoo.org> osm2pgsql-99999999.ebuild:
   Fix dodoc crash.
diff --git a/sci-geosciences/osm2pgsql/metadata.xml b/sci-geosciences/osm2pgsql/metadata.xml
index 9686b0080029..1f82a662a66b 100644
--- a/sci-geosciences/osm2pgsql/metadata.xml
+++ b/sci-geosciences/osm2pgsql/metadata.xml
@@ -9,4 +9,7 @@ osm2pgsql is a lossy conversion utility. It only adds features that have certain
 
 osm2pgsql has two main modes of running - normal (is this what it's called?) and slim mode. The first uses RAM for intermediate storage, the second uses a temporary database on-disk. As of early 2009, you must use slim-mode for planet imports on 32-bit systems, since there are too many nodes to store in RAM otherwise. This limitation doesn't apply to 64-bit systems
 </longdescription>
+<use>
+<flag name="pbf">Add support for importing the new "Protocolbuffer Binary Format"</flag>
+</use>
 </pkgmetadata>
diff --git a/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild b/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild
index 9cfc7c2814ea..65b0cfed4c01 100644
--- a/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild
+++ b/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 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.7 2012/05/24 16:26:09 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild,v 1.8 2013/04/12 07:47:02 swegener Exp $
 
 EAPI=4
 
-inherit autotools subversion
+inherit autotools git-2
 
-ESVN_REPO_URI="http://svn.openstreetmap.org/applications/utils/export/${PN}/"
-ESVN_PROJECT="${PN}"
+EGIT_REPO_URI="git://github.com/openstreetmap/osm2pgsql.git"
+EGIT_BOOTSTRAP="eautoreconf"
 
 DESCRIPTION="Converts OSM data to SQL and insert into PostgreSQL db"
 HOMEPAGE="http://wiki.openstreetmap.org/wiki/Osm2pgsql"
@@ -16,7 +16,7 @@ SRC_URI=""
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE=""
+IUSE="+pbf"
 
 DEPEND="
 	app-arch/bzip2
@@ -25,12 +25,8 @@ DEPEND="
 	sci-libs/proj
 	sys-libs/zlib
 	dev-db/postgresql-base
+	pbf? ( dev-libs/protobuf-c )
 "
 RDEPEND="${DEPEND}"
 
 DOCS=( README 900913.sql )
-
-src_prepare() {
-	esvn_clean
-	eautoreconf
-}