| 1 |
commit: 8f7695744c503cfb459afef7ac3d0c952276d80b |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Mar 2 21:02:30 2017 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Mar 2 21:13:14 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f769574 |
| 7 |
|
| 8 |
sci-geosciences/osm2pgsql: 0.92.0 version bump, sync live ebuild |
| 9 |
|
| 10 |
USE=lua also needs to trigger a build switch. |
| 11 |
Add dev-db/postgis to RDEPEND. |
| 12 |
Live: Switch to git-r3.eclass. EAPI 6. |
| 13 |
Last bumps seem to not have been made from more correct live ebuild. |
| 14 |
|
| 15 |
Gentoo-bug: 608590 |
| 16 |
|
| 17 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
| 18 |
|
| 19 |
sci-geosciences/osm2pgsql/Manifest | 1 + |
| 20 |
sci-geosciences/osm2pgsql/osm2pgsql-0.92.0.ebuild | 42 ++++++++++++++++++++++ |
| 21 |
.../osm2pgsql/osm2pgsql-99999999.ebuild | 23 +++++++++--- |
| 22 |
3 files changed, 62 insertions(+), 4 deletions(-) |
| 23 |
|
| 24 |
diff --git a/sci-geosciences/osm2pgsql/Manifest b/sci-geosciences/osm2pgsql/Manifest |
| 25 |
index 46fd6e0df5e..887d349b534 100644 |
| 26 |
--- a/sci-geosciences/osm2pgsql/Manifest |
| 27 |
+++ b/sci-geosciences/osm2pgsql/Manifest |
| 28 |
@@ -4,3 +4,4 @@ DIST osm2pgsql-0.87.0.tar.gz 2139841 SHA256 6f5538d098e17a578a384f70f61b335f10ed |
| 29 |
DIST osm2pgsql-0.87.1.tar.gz 2139623 SHA256 49cdfb36ab1abbc568bd5d8593a671d76205ed47efba5a23d84ab1b975b4b62e SHA512 2efa1e350c24cc6a5aac69e9df60172bfbe99a5fc10d4fea8f1af28afaf4c0176e51dd357c89e2d68a264b283457e798746da47515684f2aeee3a26abe6d1171 WHIRLPOOL d00be1f2613c7fa779ece1ce2b16b68d423a365569d4355848fd5fcaa72cbcc49b11b9c083fd28533c92b42c0f59ab3a9538a4cc5253cb74c50ee271aacd948a |
| 30 |
DIST osm2pgsql-0.88.1.tar.gz 2140606 SHA256 08ec33c833768dec9856f537bbf4416ad45837ee0851eeeab0081c7bbed3449e SHA512 fe98afdeab9fa966bacc1b5886dc10494f2d58e0c8d26be1c732e782b583c1285689506c412d16b70cdd5b3e4146204f52201283ef54a0746fcf99f76cbe1fd5 WHIRLPOOL b20e84c2187a99555619e098035805e6916a7b9f96f27cc5e94f68f80d09e3ec3c773f1058a5b41b5fa8c834f7a78d39a7b4fb7a4b9901629bfd98007c392025 |
| 31 |
DIST osm2pgsql-0.90.0.tar.gz 1326711 SHA256 cebf53c54ab2cd8b2fec351327f3849778ffd0c1c1fa811b8d5e7dae88ef4fd8 SHA512 ef523bb1e5600884143a8303af318792d0a7412515455230eeaa18875b453ea52b8b76a217416c1f30bf53245cc51e15d4d30b84067624d1b5692e3f3bff4ed8 WHIRLPOOL 093e5a3cdb0e2697be59d123a0476ae49299dc76ffe349ebeb801ebda0fddbd201ae2ac1231ed0cf65a087f383e7dad4cd099d34569d62c23cf8d1993411b7d7 |
| 32 |
+DIST osm2pgsql-0.92.0.tar.gz 1364481 SHA256 b741cfdf6489fd5def721f75a9558b8cda53165dda7ca9548fcc5b43e163ee77 SHA512 fc2afd6c06f8a44ce3c75e3a731d48cefa17b406c296208519f598531cb3d9561fcfd09c69bc20753ba7e9440087f3f5d38bfe117ab222d8b10987a8d3165ae8 WHIRLPOOL 4fd5d1c645e173f018618edb9fd49da692637fb59a9ccac13ddbef74003fd776af669f23fa2346bb33be2c7d89e121cc206892d18bd2c123debef032827ee45f |
| 33 |
|
| 34 |
diff --git a/sci-geosciences/osm2pgsql/osm2pgsql-0.92.0.ebuild b/sci-geosciences/osm2pgsql/osm2pgsql-0.92.0.ebuild |
| 35 |
new file mode 100644 |
| 36 |
index 00000000000..d39268a3f4f |
| 37 |
--- /dev/null |
| 38 |
+++ b/sci-geosciences/osm2pgsql/osm2pgsql-0.92.0.ebuild |
| 39 |
@@ -0,0 +1,42 @@ |
| 40 |
+# Copyright 1999-2017 Gentoo Foundation |
| 41 |
+# Distributed under the terms of the GNU General Public License v2 |
| 42 |
+ |
| 43 |
+EAPI=6 |
| 44 |
+ |
| 45 |
+inherit cmake-utils |
| 46 |
+ |
| 47 |
+DESCRIPTION="Converts OSM data to SQL and insert into PostgreSQL db" |
| 48 |
+HOMEPAGE="http://wiki.openstreetmap.org/wiki/Osm2pgsql https://github.com/openstreetmap/osm2pgsql" |
| 49 |
+SRC_URI="https://github.com/openstreetmap/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" |
| 50 |
+ |
| 51 |
+LICENSE="GPL-2" |
| 52 |
+SLOT="0" |
| 53 |
+KEYWORDS="~amd64 ~x86" |
| 54 |
+IUSE="+lua" |
| 55 |
+ |
| 56 |
+COMMON_DEPEND=" |
| 57 |
+ app-arch/bzip2 |
| 58 |
+ dev-db/postgresql:= |
| 59 |
+ dev-libs/expat |
| 60 |
+ <sci-libs/geos-3.6.0 |
| 61 |
+ sci-libs/proj |
| 62 |
+ sys-libs/zlib |
| 63 |
+ lua? ( dev-lang/lua:= ) |
| 64 |
+" |
| 65 |
+DEPEND="${COMMON_DEPEND} |
| 66 |
+ dev-libs/boost |
| 67 |
+" |
| 68 |
+RDEPEND="${COMMON_DEPEND} |
| 69 |
+ dev-db/postgis |
| 70 |
+" |
| 71 |
+ |
| 72 |
+# Tries to connect to local postgres server and other shenanigans |
| 73 |
+RESTRICT="test" |
| 74 |
+ |
| 75 |
+src_configure() { |
| 76 |
+ local mycmakeargs=( |
| 77 |
+ -DWITH_LUA=$(usex lua) |
| 78 |
+ -DBUILD_TESTS=OFF |
| 79 |
+ ) |
| 80 |
+ cmake-utils_src_configure |
| 81 |
+} |
| 82 |
|
| 83 |
diff --git a/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild b/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild |
| 84 |
index 6f506c1d1ac..d8473b14ec2 100644 |
| 85 |
--- a/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild |
| 86 |
+++ b/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild |
| 87 |
@@ -1,9 +1,9 @@ |
| 88 |
# Copyright 1999-2017 Gentoo Foundation |
| 89 |
# Distributed under the terms of the GNU General Public License v2 |
| 90 |
|
| 91 |
-EAPI=5 |
| 92 |
+EAPI=6 |
| 93 |
|
| 94 |
-inherit cmake-utils git-2 |
| 95 |
+inherit cmake-utils git-r3 |
| 96 |
|
| 97 |
EGIT_REPO_URI="git://github.com/openstreetmap/osm2pgsql.git" |
| 98 |
|
| 99 |
@@ -20,10 +20,25 @@ DEPEND=" |
| 100 |
app-arch/bzip2 |
| 101 |
dev-db/postgresql:= |
| 102 |
dev-libs/expat |
| 103 |
- dev-libs/boost |
| 104 |
<sci-libs/geos-3.6.0 |
| 105 |
sci-libs/proj |
| 106 |
sys-libs/zlib |
| 107 |
lua? ( dev-lang/lua:= ) |
| 108 |
" |
| 109 |
-RDEPEND="${DEPEND}" |
| 110 |
+DEPEND="${COMMON_DEPEND} |
| 111 |
+ dev-libs/boost |
| 112 |
+" |
| 113 |
+RDEPEND="${COMMON_DEPEND} |
| 114 |
+ dev-db/postgis |
| 115 |
+" |
| 116 |
+ |
| 117 |
+# Tries to connect to local postgres server and other shenanigans |
| 118 |
+RESTRICT="test" |
| 119 |
+ |
| 120 |
+src_configure() { |
| 121 |
+ local mycmakeargs=( |
| 122 |
+ -DWITH_LUA=$(usex lua) |
| 123 |
+ -DBUILD_TESTS=OFF |
| 124 |
+ ) |
| 125 |
+ cmake-utils_src_configure |
| 126 |
+} |
Archives