[patch] ebuild patch converting 3.0.18 to 3.0.23

mapnik-3.0.18_to_3.0.23.ebuild.patch (text/plain), 2.88 KB, created by Chris Mayo on 2020-10-02 18:33:58 UTC

--- mapnik-3.0.18.ebuild
+++ mapnik-3.0.23.ebuild
@@ -1,19 +1,24 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit eutils scons-utils toolchain-funcs
+PYTHON_COMPAT=( python3_7 )
+
+inherit python-any-r1 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}"
+HOMEPAGE="https://mapnik.org/"
+SRC_URI="
+	https://github.com/mapnik/mapnik/releases/download/v${PV}/mapnik-v${PV}.tar.bz2 -> ${P}.tar.bz2
+	test? ( https://github.com/mapnik/test-data/archive/v${PV}.tar.gz -> ${PN}-test-data-${PV}.tar.gz )"
 
 LICENSE="LGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="cairo debug doc gdal osmfonts postgres sqlite"
+IUSE="cairo debug doc gdal osmfonts postgres sqlite test"
+
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-libs/boost-1.48:=[threads]
@@ -47,14 +52,19 @@
 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"
 )
 
+S="${WORKDIR}/mapnik-v${PV}"
+
 src_prepare() {
 	default
+	
+	if use test; then
+		rmdir ${S}/test/data/  || die
+		mv "${WORKDIR}"/test-data-${PV}/ ${S}/test/data/ || die
+	fi
 
-	# do not version epidoc data
+	# do not version epydoc data
 	sed -i \
 		-e 's:-`mapnik-config --version`::g' \
 		utils/epydoc_config/build_epydoc.sh || die
@@ -66,7 +76,6 @@
 }
 
 src_configure() {
-#	local PYTHONCMD="$(which python2.7)"
 	local PLUGINS=shape,csv,raster,geojson
 	use gdal && PLUGINS+=,gdal,ogr
 	use postgres && PLUGINS+=,postgis
@@ -86,33 +95,25 @@
 		"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_DEFINES=-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1"
 		"CUSTOM_LDFLAGS=${LDFLAGS}"
 		"CUSTOM_LDFLAGS+=-L${ED}/usr/$(get_libdir)"
 	)
-	escons "${MYSCONS[@]}" configure
+	"${EPYTHON}" scons/scons.py "${MYSCONS[@]}" configure
 }
 
 src_compile() {
-	escons "${MYSCONS[@]}"
+	"${EPYTHON}" scons/scons.py "${MYSCONS[@]}"
 }
 
 src_install() {
-	escons "${MYSCONS[@]}" DESTDIR="${D}" install
+	"${EPYTHON}" scons/scons.py "${MYSCONS[@]}" 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 ""
-}