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

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xD1BBFDA0

5 files changed, 78 insertions, 24 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/Manifest b/sci-geosciences/osm2pgsql/Manifest
index 9c7a84c0d939..eedd931f495d 100644
--- a/sci-geosciences/osm2pgsql/Manifest
+++ b/sci-geosciences/osm2pgsql/Manifest
@@ -1,5 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+DIST 0.84.0.tar.gz 1037670 SHA256 cc0a2c4c677833c4c2c0c00a35ed25ad8ee4e378ad0ab834f151aaee5e7f6f85 SHA512 f706c57ecc63382db7f031f5c16ce94949340aa96bf45c85e71e8c5fcafda0756e91673369fa46e1217733dd8aa12a24cf1260362995d1c9dce258242704f42d WHIRLPOOL 49c1be45844693262108d31e23249e41eda2da7319e93b0c9739d8c5d61c035e7e75ea5182e04e3ddc3063cc248865751da8a55651e2c94e1d8a0797eeb68f4e
 DIST osm2pgsql-20100413svn.tar.bz2 15993739 SHA256 853888cc49451aa0a6026dd49db8f5c2e34856e809f963a12e59a11130912396
+EBUILD osm2pgsql-0.84.0.ebuild 746 SHA256 c48114fb4d5c7a0aebd4016841d96e9d727188b6c3500b73a51427f444d216aa SHA512 437cc8447ca758a4144659f56b09331c1dcdbf5ab0d2fb241342e24386f556e05f986f1729171009a409abdd8c20cdeef547d7360b8b399b4a3fd56591136023 WHIRLPOOL 64368780e9cbe3074f846a2858179848e6176511aef6802665dfe576ffedc4b5bfdc023a1885758fb36102509c3b26f10dbbc988baa53bf1b3d74327f91eab81
 EBUILD osm2pgsql-20100413.ebuild 716 SHA256 e677ec42c74888e3a21072a4f40b81a2f57d8ce6ad427e084504f26e764957ac SHA512 278f8a529928426f894ac4353f84a7d4a040115e0445b9b462f1452215d24b77a3397259b7fce3eff2138f2e65cbdfa3c57f11858bf5c9c3abf28e6d5b6e0fca WHIRLPOOL 6f75d2372a8483b5ef050997873bf99141f836364130803f2446c0ed5107ae11047ee2277bf664ea56e8c5d78e11db8abacc92311f09446baeb160ed3a1c8f41
-EBUILD osm2pgsql-99999999.ebuild 741 SHA256 f3773e84f327820a8e19a0eb0af2003226b25d3cb9ef84debfc357aa327431ec SHA512 6dd169379dd4b9d316ae5a133c684b2198bb9b2aa82ea689ca0004de649577b0506f8aa6335e3f77d399016bf6f179beb0bf51a00aa2e7020c106088f982a522 WHIRLPOOL 960a73b7c7468aade749270a3a05149f958f40c5aacee831a004fac1c86243e2cf8e4ffe4487dc9d970684c9af6002c9cf0a37927e8773867e0663c408cf363e
-MISC ChangeLog 1991 SHA256 877f6cbdb22adcaa8c02a6d775fa3cc43a18faa2e184a0bf95cc130cc9255223 SHA512 eb6743080ade805df222006cc47b5cd9c8ec6b5795675ab000c8ee38cb3a0ef8ca7f3d8568bf6966fb987d8870b121cca7bd64f349b40e0f6ec450b81b77b504 WHIRLPOOL e220f45e35dcc3ecc5ad0fddd28ad4e294589d27143d69df191fa2b70c7d69d4bf1007bfa17c2ed2adb63cea4fe739ba5d81d76caf70b6ac87fb442aba504e5e
-MISC metadata.xml 1368 SHA256 f861c7679020970dfae0a8451d391dd4692704a70956baaee0e65fe6d9880005 SHA512 85cfbaea1c77c69bde879fab233f79a29896593542df86fdde0b83611e9b4bf7b2652330b77f93c81d4767619dd4109bb5d32f045888d86b89fc7594537eae43 WHIRLPOOL de0337fd417baec8b50e0337950788e3ee1ef221715011f85a28967dba0c78915dd149542a6296d986b9aeda2c012a7856150d67be403219813e061e604421b3
+EBUILD osm2pgsql-99999999.ebuild 750 SHA256 dd94e3fb518926850365eca7a9712826da3a9fce614b0a1d68e5a4ede2f577f0 SHA512 091bccaaf9396cdcb7c5833fda90bef92768d30b50c906ce58839fb6cc314a237bb3fe336429634263f33c73eef949b19542c5425476586b64c0ebc75e45fe51 WHIRLPOOL db6c0beb69e787ea61ede25cabd38c605d97ba89c999ef1352e5fedd7a79875455660d2617262d61f6d2a9d4253934c27a53f09c301ad64302c15b925083873e
+MISC ChangeLog 2350 SHA256 5737cdba67ae26439290d00f058a9e85eeaaa48d62a98266e731699d9cc334e2 SHA512 bcd363e2c1a7be1178b595e7fbd2d2d1014c751df337162ddede1ac654209818211585ee67a77fb08423237f1d86bcc1ccd623d518fa5220230e8adf20344780 WHIRLPOOL 22ba9808d71ca20462a197a77c84707d37696c06951294a5f13155dfc463fd3d24b7e4baa2ba05392b0cbf0e02644654f4b493384421c2e3e9ed57d5af2d865a
+MISC metadata.xml 587 SHA256 df04284bc105352816e089fc2483c11d10ded49b95e96d6d5b20ffa1a22810e4 SHA512 cf9d4fcd6f45fbc0c1d1de5d81ad3e0447a54a464246d1f9d3ced8d21f964beaf64a4902679e444523c262e7b7da9c6601e72fd9caad13866765e15aa8721d23 WHIRLPOOL d42cd23ee9474e2a684c99d2b96dd2c983d2f817200fe5148a5efee009c6274f99130f82b6f3ec6b2854d86824d13bc35a34353c582c1fec274e52e5275db333
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iF4EAREIAAYFAlLoRgsACgkQVxOqA9G7/aB/RwD8C7HGHMx0vG2MbRnF2NxfDcKX
+HNeN9KfzOsjEiZalNCgA/RuuupuW/tkKYmPf+S6mnhnpSoMADzs87N2kRNxxZBSZ
+=hbEt
+-----END PGP SIGNATURE-----
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 )