From f625b9919a60a30f1bd860f7d1b2eac183ced593 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 8 Aug 2018 20:11:47 +0100 Subject: gentoo resync : 08.08.2018 --- sci-geosciences/mapnik/Manifest | 9 +- .../mapnik/files/mapnik-2.2.0-scons.patch | 11 -- .../mapnik/files/mapnik-3.0.18-scons.patch | 39 +++++++ sci-geosciences/mapnik/mapnik-3.0.18.ebuild | 117 +++++++++++++++++++++ sci-geosciences/mapnik/mapnik-3.0.9-r1.ebuild | 5 +- sci-geosciences/mapnik/mapnik-3.0.9.ebuild | 104 ------------------ sci-geosciences/mapnik/metadata.xml | 1 + 7 files changed, 164 insertions(+), 122 deletions(-) delete mode 100644 sci-geosciences/mapnik/files/mapnik-2.2.0-scons.patch create mode 100644 sci-geosciences/mapnik/files/mapnik-3.0.18-scons.patch create mode 100644 sci-geosciences/mapnik/mapnik-3.0.18.ebuild delete mode 100644 sci-geosciences/mapnik/mapnik-3.0.9.ebuild (limited to 'sci-geosciences/mapnik') diff --git a/sci-geosciences/mapnik/Manifest b/sci-geosciences/mapnik/Manifest index 57fc54549cdb..08bcdec05bb4 100644 --- a/sci-geosciences/mapnik/Manifest +++ b/sci-geosciences/mapnik/Manifest @@ -1,9 +1,10 @@ AUX mapnik-2.2.0-configure-only-once.patch 737 BLAKE2B 66233c05272cf12c62c04bd87b5c3ab74894ed2887e6d33f5fe82217344a341ade76c3c9df138baa31629a75bc7c65083baf0470e705fbbd48ae830e36402b0c SHA512 30f044c8501536599d625646dc8930d3cdcd14fc1ef6c3ee64c8226fe03a6d0f3cbc5d175f6aff7bc7dc0575206dcd23288828cb6edad264aed3b2b4d9e7874b AUX mapnik-2.2.0-dont-run-ldconfig.patch 243 BLAKE2B 8dffa522b7f8cc7a080ebeb3175c953a7a8f457d5c9288a7857aebc1f76cc8b032c11bd46678e2bd50f59ee0e19e7f7172766658640b4a06530ad0163f600e33 SHA512 dd42f09654de246ff6be4cf68fc2b08bb5ec2ae6515e722e89337081ff4b89c8b269fa70d3393f3c6156a539d7a9b1d1f516e9d6ff7f35639669fcfcd20a26ff -AUX mapnik-2.2.0-scons.patch 795 BLAKE2B 236a803049779b01b25c16a2ea180a95fb0fd07a13b28f6c9cc4d3a4c024247e69755ad69b3f64dd9aeff2f68dff4e343ab092c84c525b81fc1c8fc3566f0886 SHA512 288efab2528af07d0800278743e762e3ca5a040eae2694c09b1108826e5aa29b8a3c150b0be06ee7e5862f961a34ddcc20528c8b4c99bd962797f553017a319f +AUX mapnik-3.0.18-scons.patch 1939 BLAKE2B ece0bf49df2959a33af5f58842a59fe59a2e232f41a6e9542e747f24ebcc99d550370cc742e28ba50f10272ac5f2d31cb4c503559fd55ae4323d9ecdcbab1571 SHA512 e17363609928d6654a9949f944dc8d1745336028019f65d7fd12190c8c88de65cc40dae272dab71626ab9fb69009ebc26f0ae2e569dd9d5e8fd84aa2de0370ac AUX mapnik-3.0.9-harbuzz_sharper-upstream.patch 746 BLAKE2B 73ad3bcb237e30447336657b541bd794e9e7786b23961d6a7ee94c1c5c7646e9337ea5a8002a68e15a9a9cae05a21f06e5517a07f4dbd65815a06f88c3a76d12 SHA512 08815cf001db531cec2660d53f8afdc83df0bb9e59cb792487a05fb5dff64aa66fa79e8283b7b2b8aca031e90205ab0dcd0097d8129953fed33432e93e34a2e2 AUX mapnik-3.0.9-unicode-upstream.patch 264 BLAKE2B 9b2b8a062a861c58bfbe3681d7edc1d115ae85955dd1c1b73e37b9d1f1e690a97037144d957b318cc0921071525eaae4b3a94403842bdebf503d0f8bd195a3e6 SHA512 1f1f58477f5d54408320190b369a3039c70147f6d4c8498a318969661c258a6c7b5e2f26c111e8d543409512c7a98ddb31ece12ac75b5256a06105177e303c9d +DIST mapnik-3.0.18.tar.bz2 10103474 BLAKE2B de914ffe31940b74114cdf07a9ff13f36c7210d27b84cecd16fda7c429f0c4be7ffb9e677cf1bc8d156298b5f10ed2a41adcbf4f7727bbf85d2f0099950f5c4f SHA512 7af04b9437c83cddedf2b43f7da0622e44178b4ecce80c0349bacf551bf747698d9ec9e4d6eee68c0265feeae5833281215a759de5a1394abbdfdd39eef39661 DIST mapnik-3.0.9.tar.gz 13434729 BLAKE2B 49cf90089b34cfc706f85950d090609d5f9a5a6e9cfb56f6e1f1a6279f864b35f3f8d456caa2365787261affc4acb85ad93621d6471efed85f560c808dc0535a SHA512 ad45ecbb2661e860b7057e0a235542a390ae5790f401ef2c04f1517b6487e83cdb8e307072681847cb72a3abc242e0114bc15d48f504dec1f92df970dd1556e1 -EBUILD mapnik-3.0.9-r1.ebuild 2615 BLAKE2B 8318f5d6182aac97264aa1a9499538e2063debc6f493ce5270ad70c9c05b4d978ee7c5f494b5534bcf3253e162a7e885235011339ee52ad7d7b09f092004fba8 SHA512 94cb8ff699da38ea8749ea49e41ea43ddcbfc2b81377880fe68be6c6e572ac472edb955c76d3ec4ed4626a4998da59bb84f9b9675cafab932134c6d9bc9b0793 -EBUILD mapnik-3.0.9.ebuild 2375 BLAKE2B da5851e20e9a5f4f3b0395ca6abced74613e061ebe1dd4ceaefe4c9b04476530743b787eb6be9bd814529ab05a1e265fbdc26e9bcb2e51d8272bff4b828583d4 SHA512 c2990ff5b334a88482cb561e0ef74f404093b66eef635f5f2badc9f657ea50f6828ac9ea6a86cc91b3c08c7e619658e89ffb3942650db16dfcc4ff93c0d3173c -MISC metadata.xml 683 BLAKE2B c61252c70d3814876f28f6c156572cedb646e6695c430a1a5083495d53e2ebc3933d9e499a4142ec460334d200172b054bb0c7bbd25adcd5701584b037bff3e7 SHA512 a60caeed695db6aeeee83083f57269db6d6c7a7e649be8848ef560e9043ba8b710441f166498d6d0bfffd80ab10190865a3b5097fb766b0b92c5480f62aab962 +EBUILD mapnik-3.0.18.ebuild 2768 BLAKE2B fa9fb68ad23c4b17d1163492f375735f26925137327f9b1dc6eefdc9d078e67a6f31331d21a3fcd3f90ff75242bc30429ded2c7f46df7aa08c545cecf43d3efe SHA512 0c27792c584dd10f845bff899318b685cdb7fffb08e3d0335628cf37d9a365b2e53fc65023bc0c229d018e6ae50d27dfeeaabf483f2a7a864013e8a09d948823 +EBUILD mapnik-3.0.9-r1.ebuild 2578 BLAKE2B d2c508da64f319b9043ff290f34b3fb99b0bd10f04aa3084108572eeb449ae9ea33131292e06a72807f363b4dc812b560c141e29cb622ffa92ca83e4140a1dac SHA512 8143ee3916c8d4fe4eb54c42dc11e3a5553016a3442b80a5131922a68d9ef47477f91b8c76e3f7a49c418e6b4ffbb78751d64fecef7f191bfb2505e8c6fe7d0a +MISC metadata.xml 754 BLAKE2B f28f0847b5c78c667dc69f9d7e0ca75b196926ad8b6f98cbc1c529470943b0ecc64bd05fdc1ed3ef289dc60bf54d4f594800fcea44ef20d5e3dd5ba4ad1cfeb7 SHA512 84138433b879b8d48422f7f9d587966b69a28d89effac6cfbf7bd925010c3d118f4296c08de787dbf6649af549acf4fd671a4702acc9d203c3829caca30fc5d1 diff --git a/sci-geosciences/mapnik/files/mapnik-2.2.0-scons.patch b/sci-geosciences/mapnik/files/mapnik-2.2.0-scons.patch deleted file mode 100644 index 0ddcd0f9e0dd..000000000000 --- a/sci-geosciences/mapnik/files/mapnik-2.2.0-scons.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/SConstruct -+++ b/SConstruct -@@ -291,7 +291,7 @@ opts.AddVariables( - ('LINK_PRIORITY','Priority list in which to sort library and include paths (default order is internal, other, frameworks, user, then system - see source of `sort_paths` function for more detail)',','.join(DEFAULT_LINK_PRIORITY)), - - # Install Variables -- ('PREFIX', 'The install path "prefix"', '/usr/local'), -+ ('PREFIX', 'The install path "prefix"', '/usr'), - ('LIBDIR_SCHEMA', 'The library sub-directory appended to the "prefix", sometimes lib64 on 64bit linux systems', LIBDIR_SCHEMA_DEFAULT), - ('PYTHON_PREFIX','Custom install path "prefix" for python bindings (default of no prefix)',''), - ('DESTDIR', 'The root directory to install into. Useful mainly for binary package building', '/'), diff --git a/sci-geosciences/mapnik/files/mapnik-3.0.18-scons.patch b/sci-geosciences/mapnik/files/mapnik-3.0.18-scons.patch new file mode 100644 index 000000000000..2414bf95fedd --- /dev/null +++ b/sci-geosciences/mapnik/files/mapnik-3.0.18-scons.patch @@ -0,0 +1,39 @@ +--- a/SConstruct ++++ b/SConstruct +@@ -317,7 +317,7 @@ + ('LINK_PRIORITY','Priority list in which to sort library and include paths (default order is internal, other, frameworks, user, then system - see source of `sort_paths` function for more detail)',','.join(DEFAULT_LINK_PRIORITY)), + + # Install Variables +- ('PREFIX', 'The install path "prefix"', '/usr/local'), ++ ('PREFIX', 'The install path "prefix"', '/usr'), + ('LIBDIR_SCHEMA', 'The library sub-directory appended to the "prefix", sometimes lib64 on 64bit linux systems', LIBDIR_SCHEMA_DEFAULT), + ('DESTDIR', 'The root directory to install into. Useful mainly for binary package building', '/'), + ('PATH', 'A custom path (or multiple paths divided by ":") to append to the $PATH env to prioritize usage of command line programs (if multiple are present on the system)', ''), +@@ -1222,6 +1222,8 @@ + + color_print(4,'Configuring build environment...') + ++ OPTIONAL_LIBSHEADERS = [] ++ + if not env['FAST']: + SetCacheMode('force') + +@@ -1410,7 +1412,8 @@ + # https://github.com/mapnik/mapnik/issues/913 + if env.get('XMLPARSER') and env['XMLPARSER'] == 'libxml2': + if env.get('XML2_LIBS') or env.get('XML2_INCLUDES'): +- OPTIONAL_LIBSHEADERS.insert(0,['libxml2','libxml/parser.h',True,'C']) ++ # code doesn't actually use HAVE_XMML2 but set just to have a fifth value ++ OPTIONAL_LIBSHEADERS.append(['libxml2','libxml/parser.h',True,'C','-DHAVE_XML2']) + if env.get('XML2_INCLUDES'): + inc_path = env['XML2_INCLUDES'] + env.AppendUnique(CPPPATH = fix_path(inc_path)) +@@ -1428,8 +1431,6 @@ + else: + env['SKIPPED_DEPS'].extend(['dlfcn']) + +- OPTIONAL_LIBSHEADERS = [] +- + if env['JPEG']: + OPTIONAL_LIBSHEADERS.append(['jpeg', ['stdio.h', 'jpeglib.h'], False,'C','-DHAVE_JPEG']) + inc_path = env['%s_INCLUDES' % 'JPEG'] diff --git a/sci-geosciences/mapnik/mapnik-3.0.18.ebuild b/sci-geosciences/mapnik/mapnik-3.0.18.ebuild new file mode 100644 index 000000000000..8c0db9a6c0be --- /dev/null +++ b/sci-geosciences/mapnik/mapnik-3.0.18.ebuild @@ -0,0 +1,117 @@ +# Copyright 1999-2018 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/releases/download/v${PV}/mapnik-v${PV}.tar.bz2 -> ${P}.tar.bz2" +S="${WORKDIR}/mapnik-v${PV}" + +LICENSE="LGPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="cairo debug doc gdal osmfonts 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 + ) + osmfonts? ( + media-fonts/dejavu + media-fonts/noto + media-fonts/noto-cjk + media-fonts/unifont + ) + 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}-3.0.18-scons.patch" +) + +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 PYTHONCMD="$(which python2.7)" + 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)" + "FREETYPE_INCLUDES=/usr/include/freetype2" + "FREETYPE_LIBS=/usr/$(get_libdir)" + "XML2_INCLUDES=/usr/include/libxml2" + "XML2_LIBS=/usr/$(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 "" +} diff --git a/sci-geosciences/mapnik/mapnik-3.0.9-r1.ebuild b/sci-geosciences/mapnik/mapnik-3.0.9-r1.ebuild index 9ed3676d7c4b..2e09556336c8 100644 --- a/sci-geosciences/mapnik/mapnik-3.0.9-r1.ebuild +++ b/sci-geosciences/mapnik/mapnik-3.0.9-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~x86" IUSE="cairo debug doc gdal postgres sqlite" RDEPEND=" - >=dev-libs/boost-1.48[threads] + >=dev-libs/boost-1.48:=[threads] dev-libs/icu:= sys-libs/zlib media-libs/freetype @@ -40,7 +40,6 @@ 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 ) diff --git a/sci-geosciences/mapnik/mapnik-3.0.9.ebuild b/sci-geosciences/mapnik/mapnik-3.0.9.ebuild deleted file mode 100644 index ae28bff85588..000000000000 --- a/sci-geosciences/mapnik/mapnik-3.0.9.ebuild +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright 1999-2016 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 ~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" -) - -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)" - "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 "" -} diff --git a/sci-geosciences/mapnik/metadata.xml b/sci-geosciences/mapnik/metadata.xml index bbbaaa7e4d1d..7f8d2fd981b3 100644 --- a/sci-geosciences/mapnik/metadata.xml +++ b/sci-geosciences/mapnik/metadata.xml @@ -11,6 +11,7 @@ Enable sci-libs/gdal library support + Enable openstreetmaps font styles downloads/mapnik -- cgit v1.2.3