gentoo resync : 02.11.2017

4 files changed, 146 insertions, 0 deletions

diff --git a/sci-geosciences/mapnik/Manifest b/sci-geosciences/mapnik/Manifest
index 9f9ae4037a00..9ec235d93bc1 100644
--- a/sci-geosciences/mapnik/Manifest
+++ b/sci-geosciences/mapnik/Manifest
@@ -1,7 +1,10 @@
 AUX mapnik-2.2.0-configure-only-once.patch 737 SHA256 9fc7263d0c786c2934f389c6feaa69761cfcb3d0d4f607600aef0b654391a2c3 SHA512 30f044c8501536599d625646dc8930d3cdcd14fc1ef6c3ee64c8226fe03a6d0f3cbc5d175f6aff7bc7dc0575206dcd23288828cb6edad264aed3b2b4d9e7874b WHIRLPOOL 5a9a58d6cd8629308ebfccd9d59078605101498e16edb80fd69727fe162578a0d05bdfc79c3f25c69fef6512b740449f14e07da8fcb8e4ffb3b32c418fb4464d
 AUX mapnik-2.2.0-dont-run-ldconfig.patch 243 SHA256 2bc4356b28f99165d77644c6e911cf4d879dd60971c8c1e772ad6efd3d76432a SHA512 dd42f09654de246ff6be4cf68fc2b08bb5ec2ae6515e722e89337081ff4b89c8b269fa70d3393f3c6156a539d7a9b1d1f516e9d6ff7f35639669fcfcd20a26ff WHIRLPOOL f5def668aeafa1254fb9066cc1124820af3f91eae93513130d5ce2499b38f305ab55be46c119b77abc0127ebe7a76fa733ddbe607c48a63e760a719d96751846
 AUX mapnik-2.2.0-scons.patch 795 SHA256 2ba0ae66aa6556030a34ad53c3fe5395e7afb503a4d6b4bf2749422d20131f35 SHA512 288efab2528af07d0800278743e762e3ca5a040eae2694c09b1108826e5aa29b8a3c150b0be06ee7e5862f961a34ddcc20528c8b4c99bd962797f553017a319f WHIRLPOOL 2307ffdaed337869b6e78a76fd34b44509b3bd83cb3f092088541a1061e3e80c914c4665479eb01efeb9fdd8f16a7fca4749b6a90599253d1d565e8c0acdded5
+AUX mapnik-3.0.9-harbuzz_sharper-upstream.patch 746 SHA256 02d3b21beeefea8de1f1f86889f45cd664356529fe53ad9265f4d3c22a0156f8 SHA512 08815cf001db531cec2660d53f8afdc83df0bb9e59cb792487a05fb5dff64aa66fa79e8283b7b2b8aca031e90205ab0dcd0097d8129953fed33432e93e34a2e2 WHIRLPOOL 6743f9a584b0fb6b0b8f83fd8dcd1971534a64d7c97ffa8ecd750f1f7b388981bddea6e08754939556169cdf552e7b063dcd17a5e22b92dcb8bb9d9b46a9c8fa
+AUX mapnik-3.0.9-unicode-upstream.patch 264 SHA256 e1b01a80eccbf64a8b962c0a9cbd48abb473c25f942ccd96cf30bafd2c3523bb SHA512 1f1f58477f5d54408320190b369a3039c70147f6d4c8498a318969661c258a6c7b5e2f26c111e8d543409512c7a98ddb31ece12ac75b5256a06105177e303c9d WHIRLPOOL ecabbd9092230259c41b55b94edb631f46d254fa77bb03f284ecc11327a6dc5a431b250b9982698fd76f822d4b7fabf8b0ef7edd85ae51af97f8a6f25ee515ab
 DIST mapnik-3.0.9.tar.gz 13434729 SHA256 f0242606096e2c4ca2cd0caac1ff0fd5f8054a38b5f288ba38b0e397b5b311b2 SHA512 ad45ecbb2661e860b7057e0a235542a390ae5790f401ef2c04f1517b6487e83cdb8e307072681847cb72a3abc242e0114bc15d48f504dec1f92df970dd1556e1 WHIRLPOOL 792c69891ab09f38c4061c0c1622ec1d62df86dbec88a6eb6de0a6f7c745bc8dff0bc47c01397d222b48063848fa6c8406166f2c4f1e0a85dbdc94492b151805
+EBUILD mapnik-3.0.9-r1.ebuild 2627 SHA256 58e3f5148cde070dedc663c20fd107ef305abfdb63a11082adba45d112d17a30 SHA512 020a1036823cd73801f82b4675b0601d791a9a2fabc57f7c893f3dba08e3fd80112c625c3566e384e173c0d64fbd62275dd30fade5ecb195230b20705209ec37 WHIRLPOOL 1153984785df902d49d0d5e792dc5139a0c9d64d3123174be7495002bed996121dc72d146b1e049684ca410267ea28b9eb14c37249eb705986e8efa715dac28e
 EBUILD mapnik-3.0.9.ebuild 2387 SHA256 59702587ccc636dda0a4f316bae69228ece9f706bdeb8b6480053683f6c6d041 SHA512 64572189d753b330507950f59dc07b7a37234c7b2ed9b2c1043b7dea4af6feff34ed502b0015069dcf799316a5c33679f84778a5bd174217deca79d2c7ea5b5a WHIRLPOOL 7ede4a3f17e2152d0d3789fec2bbf12f5b353edce5333993ef1dff104752aec59dc63acd13d19daa55811e0d2d6702f366bd26f8a9a706fa1d261b816695602a
 MISC ChangeLog 4823 SHA256 e2fdeabf74fafe89b76b11e2d952a843c72d8aa74c2ab9687d39299a59a316d1 SHA512 9e779e9c327de0c6a490fd01a823a830599267ecbafe7bd298622cf65653db5086f58cd6e75d0a0104270448f6ff45e5006a64e9072616f32bfe30e9ba41398a WHIRLPOOL 68a38897c37498725631aca0699b6e9e50cc4a8a74a7aa025d30febe2063f5f8cf1b36656b1feda8f13e15c7cf0498328011826fa7028736ba835fc7dc473623
 MISC ChangeLog-2015 9879 SHA256 dafff4c38850c8b3fbb876b3bfbe879e83288c95428a947babd50b7aaf68963a SHA512 10cc6d765dab6f2f8c3c6e3e35075acf2079e09fd41389ada49502a2e9a81fb341149432570b776c04fdae8570e5529ecadcf073158a8ccd34250f8ff696c0b1 WHIRLPOOL 5e44755560add4fd9f0b7055ae81e0a41e831b435d0c4890db574bd0ab2803fc81e37c7153116d03c4b64a673a8cc630973b8985485c1141f2788ae4a5b777dc
diff --git a/sci-geosciences/mapnik/files/mapnik-3.0.9-harbuzz_sharper-upstream.patch b/sci-geosciences/mapnik/files/mapnik-3.0.9-harbuzz_sharper-upstream.patch
new file mode 100644
index 000000000000..cb81f526568c
--- /dev/null
+++ b/sci-geosciences/mapnik/files/mapnik-3.0.9-harbuzz_sharper-upstream.patch
@@ -0,0 +1,25 @@
+--- a/include/mapnik/text/harfbuzz_shaper.hpp	2017-10-31 17:45:30.737250086 +0100
++++ b/include/mapnik/text/harfbuzz_shaper.hpp	2017-10-31 17:46:56.002247847 +0100
+@@ -39,10 +39,11 @@
+ // harfbuzz
+ #include <harfbuzz/hb.h>
+ #include <harfbuzz/hb-ft.h>
+-
++#include <unicode/uvernum.h>
+ // icu
+ #include <unicode/uscript.h>
+ 
++
+ namespace mapnik
+ {
+ 
+@@ -55,7 +56,8 @@
+ static inline const uint16_t * uchar_to_utf16(const UChar* src)
+ {
+    static_assert(sizeof(UChar) == sizeof(uint16_t),"UChar is eq size to uint16_t");
+-#if defined(_MSC_VER)
++#if defined(_MSC_VER) || (U_ICU_VERSION_MAJOR_NUM >= 59)
++   // ^^ http://site.icu-project.org/download/59#TOC-ICU4C-char16_t1
+    return reinterpret_cast<const uint16_t *>(src);
+ #else
+    return src;
diff --git a/sci-geosciences/mapnik/files/mapnik-3.0.9-unicode-upstream.patch b/sci-geosciences/mapnik/files/mapnik-3.0.9-unicode-upstream.patch
new file mode 100644
index 000000000000..0233eb4e3fdd
--- /dev/null
+++ b/sci-geosciences/mapnik/files/mapnik-3.0.9-unicode-upstream.patch
@@ -0,0 +1,11 @@
+--- a/include/mapnik/unicode.hpp	2017-10-31 17:53:23.507237672 +0100
++++ b/include/mapnik/unicode.hpp	2017-10-31 17:53:47.096237053 +0100
+@@ -31,6 +31,8 @@
+ // std
+ #include <cstdint>
+ #include <string>
++// icu
++#include <unicode/unistr.h>
+ 
+ struct UConverter;
+ 
diff --git a/sci-geosciences/mapnik/mapnik-3.0.9-r1.ebuild b/sci-geosciences/mapnik/mapnik-3.0.9-r1.ebuild
new file mode 100644
index 000000000000..bcaadad2a45f
--- /dev/null
+++ b/sci-geosciences/mapnik/mapnik-3.0.9-r1.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils scons-utils toolchain-funcs
+
+DESCRIPTION="A Free Toolkit for developing mapping applications"
+HOMEPAGE="http://www.mapnik.org/"
+SRC_URI="https://github.com/mapnik/mapnik/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="cairo debug doc gdal postgres sqlite"
+
+RDEPEND="
+	>=dev-libs/boost-1.48[threads]
+	dev-libs/icu:=
+	sys-libs/zlib
+	media-libs/freetype
+	media-libs/harfbuzz
+	dev-libs/libxml2
+	media-libs/libpng:0=
+	media-libs/tiff:0=
+	virtual/jpeg:0=
+	media-libs/libwebp
+	sci-libs/proj
+	media-fonts/dejavu
+	x11-libs/agg[truetype]
+	cairo? (
+		x11-libs/cairo
+		dev-cpp/cairomm
+	)
+	postgres? ( >=dev-db/postgresql-8.3:* )
+	gdal? ( sci-libs/gdal )
+	sqlite? ( dev-db/sqlite:3 )"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.2.0-configure-only-once.patch"
+	"${FILESDIR}/${PN}-2.2.0-dont-run-ldconfig.patch"
+	"${FILESDIR}/${PN}-2.2.0-scons.patch"
+	"${FILESDIR}/${P}-harbuzz_sharper-upstream.patch" # upstream patches ported from
+	"${FILESDIR}/${P}-unicode-upstream.patch" # https://github.com/mapnik/mapnik/commit/9e58c890430db6f0b6f1f7a1690877c9d913d92a
+)
+
+src_prepare() {
+	default
+
+	# do not version epidoc data
+	sed -i \
+		-e 's:-`mapnik-config --version`::g' \
+		utils/epydoc_config/build_epydoc.sh || die
+
+	# force user flags, optimization level
+	sed -i -e "s:\-O%s:%s:" \
+		-i -e "s:env\['OPTIMIZATION'\]:'${CXXFLAGS}':" \
+		SConstruct || die
+}
+
+src_configure() {
+	local PLUGINS=shape,csv,raster,geojson
+	use gdal && PLUGINS+=,gdal,ogr
+	use postgres && PLUGINS+=,postgis
+	use sqlite && PLUGINS+=,sqlite
+
+	MYSCONS=(
+		"CC=$(tc-getCC)"
+		"CXX=$(tc-getCXX)"
+		"INPUT_PLUGINS=${PLUGINS}"
+		"PREFIX=/usr"
+		"DESTDIR=${D}"
+		"XMLPARSER=libxml2"
+		"LINKING=shared"
+		"RUNTIME_LINK=shared"
+		"PROJ_INCLUDES=/usr/include"
+		"PROJ_LIBS=/usr/$(get_libdir)"
+		"LIBDIR_SCHEMA=$(get_libdir)"
+		"SYSTEM_FONTS=/usr/share/fonts"
+		CAIRO="$(usex cairo 1 0)"
+		DEBUG="$(usex debug 1 0)"
+		XML_DEBUG="$(usex debug 1 0)"
+		DEMO="$(usex doc 1 0)"
+		SAMPLE_INPUT_PLUGINS="$(usex doc 1 0)"
+		"CUSTOM_LDFLAGS=${LDFLAGS}"
+		"CUSTOM_LDFLAGS+=-L${ED}/usr/$(get_libdir)"
+	)
+	escons "${MYSCONS[@]}" configure
+}
+
+src_compile() {
+	escons "${MYSCONS[@]}"
+}
+
+src_install() {
+	escons "${MYSCONS[@]}" DESTDIR="${D}" install
+
+	dodoc AUTHORS.md README.md CHANGELOG.md
+}
+
+pkg_postinst() {
+	elog ""
+	elog "See the home page or wiki (https://github.com/mapnik/mapnik/wiki) for more info"
+	elog "or the installed examples for the default mapnik ogcserver config."
+	elog ""
+}