Fix bug 421325: Fixed by version bump

Fix bug 427668: Thanks Christoph Brill
Fix bug 469374: Added lua USE flag
Fix bug 397877: Fixed by version bump
Fix bug 490788: Fixed by version bump

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key D1BBFDA0)

4 files changed, 63 insertions, 21 deletions

diff --git a/sci-geosciences/osm2pgsql/ChangeLog b/sci-geosciences/osm2pgsql/ChangeLog
index 035e2b1da812..ba03592b7997 100644
--- a/sci-geosciences/osm2pgsql/ChangeLog
+++ b/sci-geosciences/osm2pgsql/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sci-geosciences/osm2pgsql
-# 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 $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/osm2pgsql/ChangeLog,v 1.12 2014/01/29 00:06:26 titanofold Exp $
+
+*osm2pgsql-0.84.0 (29 Jan 2014)
+
+  29 Jan 2014; Aaron W. Swenson <titanofold@gentoo.org>
+  +osm2pgsql-0.84.0.ebuild, osm2pgsql-99999999.ebuild, metadata.xml:
+  Fix bug 421325: Fixed by version bump
+  Fix bug 427668: Thanks Christoph Brill
+  Fix bug 469374: Added lua USE flag
+  Fix bug 397877: Fixed by version bump
+  Fix bug 490788: Fixed by version bump
 
   12 Apr 2013; Sven Wegener <swegener@gentoo.org> osm2pgsql-99999999.ebuild,
   metadata.xml:
diff --git a/sci-geosciences/osm2pgsql/metadata.xml b/sci-geosciences/osm2pgsql/metadata.xml
index 1f82a662a66b..abf111457c92 100644
--- a/sci-geosciences/osm2pgsql/metadata.xml
+++ b/sci-geosciences/osm2pgsql/metadata.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-geosciences</herd>
-<longdescription lang="en">
-osm2pgsql is a utility program that converts OpenStreetMap (.OSM) data into a format that can be loaded into PostgreSQL. It is often used to render OSM data visually using Mapnik, as Mapnik can query PostgreSQL for map data, but does not work directly with OSM files. For more information on using osm2pgsql to render OpenStreetMap data with Mapnik, see the Mapnik page.
-
-osm2pgsql is a lossy conversion utility. It only adds features that have certain tags, as defined in the config file, and it converts nodes and ways to linestrings and polygons. This means that you can't tell which linestring is connected to which, but for rendering a map that's not important (c.f. routing).
-
-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>
+    <herd>sci-geosciences</herd>
+    <herd>postgresql</herd>
+    <longdescription lang="en">
+        Converts OSM planet.osm data to a PostgreSQL / PostGIS database
+        suitable for specific applications like rendering into map tiles by
+        Mapnik or geocoding with Nominatim.
+    </longdescription>
+    <use>
+        <flag name="pbf">
+            Add support for importing the new "Protocolbuffer Binary Format"
+        </flag>
+    </use>
 </pkgmetadata>
diff --git a/sci-geosciences/osm2pgsql/osm2pgsql-0.84.0.ebuild b/sci-geosciences/osm2pgsql/osm2pgsql-0.84.0.ebuild
new file mode 100644
index 000000000000..f629946319b4
--- /dev/null
+++ b/sci-geosciences/osm2pgsql/osm2pgsql-0.84.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/osm2pgsql/osm2pgsql-0.84.0.ebuild,v 1.1 2014/01/29 00:06:26 titanofold Exp $
+
+EAPI=5
+
+inherit autotools
+
+DESCRIPTION="Converts OSM data to SQL and insert into PostgreSQL db"
+HOMEPAGE="http://wiki.openstreetmap.org/wiki/Osm2pgsql"
+SRC_URI="https://github.com/openstreetmap/${PN}/archive/${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+lua +pbf"
+
+DEPEND="
+	app-arch/bzip2
+	dev-db/postgresql-base
+	dev-libs/libxml2:2
+	sci-libs/geos
+	sci-libs/proj
+	sys-libs/zlib
+	lua? ( dev-lang/lua )
+	pbf? ( dev-libs/protobuf-c )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	eautoreconf
+}
diff --git a/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild b/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild
index 65b0cfed4c01..f9b9d3bfde3e 100644
--- a/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild
+++ b/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild
@@ -1,32 +1,31 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 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.8 2013/04/12 07:47:02 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild,v 1.9 2014/01/29 00:06:26 titanofold Exp $
 
-EAPI=4
+EAPI=5
 
 inherit autotools git-2
 
 EGIT_REPO_URI="git://github.com/openstreetmap/osm2pgsql.git"
 EGIT_BOOTSTRAP="eautoreconf"
 
-DESCRIPTION="Converts OSM data to SQL and insert into PostgreSQL db"
+DESCRIPTION="Converts OSM planet.osm data to a PostgreSQL/PostGIS database"
 HOMEPAGE="http://wiki.openstreetmap.org/wiki/Osm2pgsql"
 SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="+pbf"
+IUSE="+lua +pbf"
 
 DEPEND="
 	app-arch/bzip2
+	dev-db/postgresql-base
 	dev-libs/libxml2:2
 	sci-libs/geos
 	sci-libs/proj
 	sys-libs/zlib
-	dev-db/postgresql-base
+	lua? ( dev-lang/lua )
 	pbf? ( dev-libs/protobuf-c )
 "
 RDEPEND="${DEPEND}"
-
-DOCS=( README 900913.sql )