* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/mapnik/files/, sci-geosciences/mapnik/, profiles/
@ 2020-10-26 7:39 Michał Górny
0 siblings, 0 replies; only message in thread
From: Michał Górny @ 2020-10-26 7:39 UTC (permalink / raw
To: gentoo-commits
commit: 07e7afc6c6a93548605794e0516ba29d061a532e
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 26 07:28:00 2020 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Oct 26 07:38:55 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07e7afc6
sci-geosciences/mapnik: Remove last-rited pkg
Closes: https://bugs.gentoo.org/735556
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
profiles/package.mask | 1 -
sci-geosciences/mapnik/Manifest | 2 -
.../files/mapnik-2.2.0-configure-only-once.patch | 20 ----
.../files/mapnik-2.2.0-dont-run-ldconfig.patch | 11 --
.../mapnik/files/mapnik-3.0.18-icu-61.patch | 54 ----------
.../mapnik/files/mapnik-3.0.18-scons.patch | 39 -------
.../mapnik-3.0.9-harbuzz_sharper-upstream.patch | 25 -----
.../files/mapnik-3.0.9-unicode-upstream.patch | 11 --
sci-geosciences/mapnik/mapnik-3.0.18.ebuild | 118 ---------------------
sci-geosciences/mapnik/mapnik-3.0.9-r1.ebuild | 106 ------------------
sci-geosciences/mapnik/metadata.xml | 19 ----
11 files changed, 406 deletions(-)
diff --git a/profiles/package.mask b/profiles/package.mask
index 565e3dce965..34df9b0b31e 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -266,7 +266,6 @@ games-sports/vdrift
games-strategy/endless-sky
games-strategy/glob2
net-vpn/freelan
-sci-geosciences/mapnik
# Michał Górny <mgorny@gentoo.org> (2020-09-25)
# PyPy3.7 alpha. Known to break a few packages. Masked until it
diff --git a/sci-geosciences/mapnik/Manifest b/sci-geosciences/mapnik/Manifest
deleted file mode 100644
index 814739a065b..00000000000
--- a/sci-geosciences/mapnik/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST mapnik-3.0.18.tar.bz2 10103474 BLAKE2B de914ffe31940b74114cdf07a9ff13f36c7210d27b84cecd16fda7c429f0c4be7ffb9e677cf1bc8d156298b5f10ed2a41adcbf4f7727bbf85d2f0099950f5c4f SHA512 7af04b9437c83cddedf2b43f7da0622e44178b4ecce80c0349bacf551bf747698d9ec9e4d6eee68c0265feeae5833281215a759de5a1394abbdfdd39eef39661
-DIST mapnik-3.0.9.tar.gz 13434729 BLAKE2B 49cf90089b34cfc706f85950d090609d5f9a5a6e9cfb56f6e1f1a6279f864b35f3f8d456caa2365787261affc4acb85ad93621d6471efed85f560c808dc0535a SHA512 ad45ecbb2661e860b7057e0a235542a390ae5790f401ef2c04f1517b6487e83cdb8e307072681847cb72a3abc242e0114bc15d48f504dec1f92df970dd1556e1
diff --git a/sci-geosciences/mapnik/files/mapnik-2.2.0-configure-only-once.patch b/sci-geosciences/mapnik/files/mapnik-2.2.0-configure-only-once.patch
deleted file mode 100644
index 89541cb85ed..00000000000
--- a/sci-geosciences/mapnik/files/mapnik-2.2.0-configure-only-once.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/SConstruct
-+++ b/SConstruct
-@@ -503,16 +503,7 @@ for opt in pickle_store:
- #print 'missing opt', opt
- preconfigured = False
-
--# if custom arguments are supplied make sure to accept them
--if opts.args:
-- # since we have custom arguments update environment with all opts to
-- # make sure to absorb the custom ones
-- opts.Update(env)
-- # now since we've got custom arguments we'll disregard any
-- # pickled environment and force another configuration
-- preconfigured = False
--
--elif preconfigured:
-+if preconfigured:
- if not HELP_REQUESTED:
- color_print(4,'Using previous successful configuration...')
- color_print(4,'Re-configure by running "python scons/scons.py configure".')
diff --git a/sci-geosciences/mapnik/files/mapnik-2.2.0-dont-run-ldconfig.patch b/sci-geosciences/mapnik/files/mapnik-2.2.0-dont-run-ldconfig.patch
deleted file mode 100644
index c92c0e9a02a..00000000000
--- a/sci-geosciences/mapnik/files/mapnik-2.2.0-dont-run-ldconfig.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/build.py
-+++ b/src/build.py
-@@ -38,7 +38,7 @@ def call(cmd, silent=True):
- print stderr
-
- def ldconfig(*args,**kwargs):
-- call('ldconfig')
-+ pass
-
- if env['LINKING'] == 'static':
- lib_env.Append(CXXFLAGS="-fPIC")
diff --git a/sci-geosciences/mapnik/files/mapnik-3.0.18-icu-61.patch b/sci-geosciences/mapnik/files/mapnik-3.0.18-icu-61.patch
deleted file mode 100644
index 1330fe6c0fb..00000000000
--- a/sci-geosciences/mapnik/files/mapnik-3.0.18-icu-61.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 1ddfe6c315487a802f2ea38119255a203a25913c Mon Sep 17 00:00:00 2001
-From: Raul Marin <git@rmr.ninja>
-Date: Tue, 3 Apr 2018 13:18:03 +0200
-Subject: [PATCH] Qualify ICU types explicitly
-
-ICU 61 has dropped the global `using namespace icu;`
-http://site.icu-project.org/download/61#TOC-Migration-Issues
----
- include/mapnik/text/scrptrun.hpp | 2 +-
- src/text/text_layout.cpp | 4 +++-
- 2 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/include/mapnik/text/scrptrun.hpp b/include/mapnik/text/scrptrun.hpp
-index 2161c510d9..c219a2a0d3 100644
---- a/include/mapnik/text/scrptrun.hpp
-+++ b/include/mapnik/text/scrptrun.hpp
-@@ -37,7 +37,7 @@ struct ParenStackEntry
- UScriptCode scriptCode = USCRIPT_INVALID_CODE;
- };
-
--class ScriptRun : public UObject {
-+class ScriptRun : public icu::UObject {
- public:
- ScriptRun();
-
-diff --git a/src/text/text_layout.cpp b/src/text/text_layout.cpp
-index 663cbe11aa..ecf02ab8e3 100644
---- a/src/text/text_layout.cpp
-+++ b/src/text/text_layout.cpp
-@@ -207,6 +207,7 @@ void text_layout::layout()
- // At the end everything that is left over is added as the final line.
- void text_layout::break_line_icu(std::pair<unsigned, unsigned> && line_limits)
- {
-+ using BreakIterator = icu::BreakIterator;
- text_line line(line_limits.first, line_limits.second);
- shape_text(line);
-
-@@ -228,7 +229,7 @@ void text_layout::break_line_icu(std::pair<unsigned, unsigned> && line_limits)
- }
-
- mapnik::value_unicode_string const& text = itemizer_.text();
-- Locale locale; // TODO: Is the default constructor correct?
-+ icu::Locale locale; // TODO: Is the default constructor correct?
- UErrorCode status = U_ZERO_ERROR;
- std::unique_ptr<BreakIterator> breakitr(BreakIterator::createLineInstance(locale, status));
-
-@@ -336,6 +337,7 @@ inline int adjust_last_break_position (int pos, bool repeat_wrap_char)
-
- void text_layout::break_line(std::pair<unsigned, unsigned> && line_limits)
- {
-+ using BreakIterator = icu::BreakIterator;
- text_line line(line_limits.first, line_limits.second);
- shape_text(line);
- double scaled_wrap_width = wrap_width_ * scale_factor_;
diff --git a/sci-geosciences/mapnik/files/mapnik-3.0.18-scons.patch b/sci-geosciences/mapnik/files/mapnik-3.0.18-scons.patch
deleted file mode 100644
index 2414bf95fed..00000000000
--- a/sci-geosciences/mapnik/files/mapnik-3.0.18-scons.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- 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/files/mapnik-3.0.9-harbuzz_sharper-upstream.patch b/sci-geosciences/mapnik/files/mapnik-3.0.9-harbuzz_sharper-upstream.patch
deleted file mode 100644
index cb81f526568..00000000000
--- a/sci-geosciences/mapnik/files/mapnik-3.0.9-harbuzz_sharper-upstream.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- 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
deleted file mode 100644
index 0233eb4e3fd..00000000000
--- a/sci-geosciences/mapnik/files/mapnik-3.0.9-unicode-upstream.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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.18.ebuild b/sci-geosciences/mapnik/mapnik-3.0.18.ebuild
deleted file mode 100644
index 91778820d45..00000000000
--- a/sci-geosciences/mapnik/mapnik-3.0.18.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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"
- "${FILESDIR}/${PN}-3.0.18-icu-61.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
deleted file mode 100644
index 2e1d27bf19d..00000000000
--- a/sci-geosciences/mapnik/mapnik-3.0.9-r1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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}/${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 ""
-}
diff --git a/sci-geosciences/mapnik/metadata.xml b/sci-geosciences/mapnik/metadata.xml
deleted file mode 100644
index 7f8d2fd981b..00000000000
--- a/sci-geosciences/mapnik/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>sci-geosciences@gentoo.org</email>
- <name>Gentoo Geosciences Project</name>
- </maintainer>
- <longdescription>Mapnik is a toolkit for developing both web and desktop
- mapping applications. The core libraries are written in C++, with
- optional Python bindings.
- </longdescription>
- <use>
- <flag name="gdal">Enable <pkg>sci-libs/gdal</pkg> library support</flag>
- <flag name="osmfonts">Enable openstreetmaps font styles</flag>
- </use>
- <upstream>
- <remote-id type="github">downloads/mapnik</remote-id>
- </upstream>
-</pkgmetadata>
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2020-10-26 7:39 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-10-26 7:39 [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/mapnik/files/, sci-geosciences/mapnik/, profiles/ Michał Górny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox