gentoo resync : 12.03.2021

3 files changed, 40 insertions, 20 deletions

diff --git a/sci-geosciences/mapserver/Manifest b/sci-geosciences/mapserver/Manifest
index 07f5cad82d0f..d1c912102969 100644
--- a/sci-geosciences/mapserver/Manifest
+++ b/sci-geosciences/mapserver/Manifest
@@ -1,3 +1,4 @@
+AUX mapserver-7.6.2-proj8.patch 544 BLAKE2B 607130bce382bfb4198d8ef4f45048d1091d842cab29730f85149e7250b9659ebe93ac47b79e2addddbfc480d11c5a30d5f07b91479dedcfc9678d7a69404fb1 SHA512 5b2e2a33027c23e812fbd4c358320980886fd16ea1a127bf8945dff396a1038b79f1a139f304c16469117794d227bf7ce0863caaca85a3be518f3807fcb8ce0d
 DIST mapserver-7.6.2.tar.gz 2715806 BLAKE2B 230e4f52c526d72ac7f46cfe4ef8e547d7ae74c01d75637ad301d4e69b90d301f02ecb8fe7d838c9ee15c022ed7980aa2f9236e08a6daedafb65a2499a9473e5 SHA512 842c2cf891df6c8dc630fac5419caa31701d732a748264f7d5b6cceaf192fa420f1863fdd18cc791a417dcdc800fed5c3e5c43ac688142f32a1a6edda4c9f791
-EBUILD mapserver-7.6.2.ebuild 7301 BLAKE2B d20e59b7f0841ecbf3727188109a55ccea38e6160cfb97d23bcd1946e8ff119a53c0d0d84e287097e21c1d3030e37ee0b515fc8a375e8a2695b82f9a9916a2a5 SHA512 570eef7f8b4e1bb4713fa87d779337141182b114bb064689528fc1837d013d3fa96f4d39ae8335777177f58650ccd01de04fff611f37ece58197b4c30af5f066
+EBUILD mapserver-7.6.2-r1.ebuild 7112 BLAKE2B 40fa1ca799cf844b29320b78e5ec776dac0b414c9332c08cbcc404b9c925c8851c9abd903456646d637cf58ead3cdf729f2c56fdb0c5525d5bcbab5dda77bd3e SHA512 0acc19957a1cb900b915045507edb652ff57168eb150a1314e44fab41ef6da04b0d29f150aead83ec3e4e87b19d6b64951fa13749ae039a39978acd4258b2e3b
 MISC metadata.xml 496 BLAKE2B 5903d53c86d30548162025cfed484a3405ea3a9bd611d475177a355a374b7a4bbf73d439a1c1457176d3f7f58355da06d842327407437c89cab426473be22bab SHA512 2dc21e4e1a785b4dff3de94bc3c621dfd4c3dfe092761681b4ffc536532f7f87b6a9fbbd0dc82895132ebd3cdb0f5750e6fe77b681c49d5996d9233096478a8e
diff --git a/sci-geosciences/mapserver/files/mapserver-7.6.2-proj8.patch b/sci-geosciences/mapserver/files/mapserver-7.6.2-proj8.patch
new file mode 100644
index 000000000000..24a5066c01c9
--- /dev/null
+++ b/sci-geosciences/mapserver/files/mapserver-7.6.2-proj8.patch
@@ -0,0 +1,19 @@
+https://github.com/MapServer/MapServer/issues/6249
+
+From e56a020789c024f985c61e49d66f3eb92d350232 Mon Sep 17 00:00:00 2001
+From: Even Rouault <even.rouault@spatialys.com>
+Date: Mon, 8 Mar 2021 15:19:50 +0100
+Subject: [PATCH] FindProj.cmake: allow finding PROJ 8 that has no longer
+ proj_api.h (fixes #6249)
+
+--- a/cmake/FindProj.cmake
++++ b/cmake/FindProj.cmake
+@@ -6,7 +6,7 @@
+ #    PROJ_LIBRARY
+ 
+ 
+-FIND_PATH(PROJ_INCLUDE_DIR proj_api.h)
++FIND_PATH(PROJ_INCLUDE_DIR NAMES proj.h proj_api.h)
+ 
+ FIND_LIBRARY(PROJ_LIBRARY NAMES proj proj_i)
+ 
diff --git a/sci-geosciences/mapserver/mapserver-7.6.2.ebuild b/sci-geosciences/mapserver/mapserver-7.6.2-r1.ebuild
index 1c0f539edc56..b6827ae663d0 100644
--- a/sci-geosciences/mapserver/mapserver-7.6.2.ebuild
+++ b/sci-geosciences/mapserver/mapserver-7.6.2-r1.ebuild
@@ -1,23 +1,20 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# NOTE: We have to stick with EAPI 6 for now because of the
-# depend.apache eclass.
-EAPI=6
+EAPI=7
 
 # Variables for the miscellaneous bindings we provide
 PHP_EXT_OPTIONAL_USE="php"
 PHP_EXT_NAME="php_mapscriptng"
 PHP_EXT_SKIP_PHPIZE="yes"
 
-USE_PHP="php7-2 php7-3 php7-4"
+USE_PHP="php7-3 php7-4"
 PYTHON_COMPAT=( python3_{7,8,9} )
 
 WEBAPP_MANUAL_SLOT=yes
 WEBAPP_OPTIONAL=yes
 
-# NOTE: Similarly, we cannot go cmake-utils -> cmake until we're on EAPI 7
-inherit cmake-utils depend.apache eapi7-ver perl-functions php-ext-source-r3 python-r1 webapp
+inherit cmake depend.apache perl-functions php-ext-source-r3 python-r1 webapp
 
 DESCRIPTION="Development environment for building spatially enabled webapps"
 HOMEPAGE="https://mapserver.org/"
@@ -77,9 +74,8 @@ RDEPEND="
 	)
 	python? ( ${PYTHON_DEPS} )
 "
-
-DEPEND="
-	${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig
 	perl? ( >=dev-lang/swig-4.0 )
 	php? ( >=dev-lang/swig-4.0 )
@@ -89,6 +85,10 @@ DEPEND="
 	)
 "
 
+PATCHES=(
+	"${FILESDIR}"/${P}-proj8.patch
+)
+
 want_apache2 apache
 
 pkg_setup() {
@@ -97,7 +97,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	use php && php-ext-source-r3_src_prepare
 	use python && python_copy_sources
@@ -163,7 +163,7 @@ src_configure() {
 	use perl && mycmakeargs+=( "-DCUSTOM_PERL_SITE_ARCH_DIR=$(perl_get_raw_vendorlib)" )
 
 	# Configure the standard build first
-	cmake-utils_src_configure
+	cmake_src_configure
 
 	# Minimal build for bindings
 	# Note that we use _generate_cmake_args to get a clean config each time, then add
@@ -174,7 +174,7 @@ src_configure() {
 			"-DWITH_PYTHON=ON"
 		)
 
-		python_foreach_impl cmake-utils_src_configure
+		python_foreach_impl cmake_src_configure
 		python_foreach_impl python_optimize
 	fi
 
@@ -193,7 +193,7 @@ src_configure() {
 				"-DPHP_INCLUDES=${PHPPREFIX}"
 			)
 
-			BUILD_DIR="${S}/php${slot}" cmake-utils_src_configure
+			BUILD_DIR="${S}/php${slot}" cmake_src_configure
 
 			# Return to where we left off, in case we add more
 			# to this phase.
@@ -203,10 +203,10 @@ src_configure() {
 }
 
 src_compile() {
-	cmake-utils_src_compile
+	cmake_src_compile
 
 	if use python ; then
-		python_foreach_impl cmake-utils_src_compile
+		python_foreach_impl cmake_src_compile
 	fi
 
 	if use php ; then
@@ -216,7 +216,7 @@ src_compile() {
 			php_init_slot_env "${slot}"
 
 			# Force cmake to build in it
-			BUILD_DIR="${S}/php${slot}" cmake-utils_src_compile
+			BUILD_DIR="${S}/php${slot}" cmake_src_compile
 
 			# Return to where we left off, in case we add more
 			# to this phase.
@@ -230,7 +230,7 @@ src_install() {
 	use apache && webapp_src_preinst
 
 	if use python ; then
-		python_foreach_impl cmake-utils_src_install
+		python_foreach_impl cmake_src_install
 		python_foreach_impl python_optimize
 	fi
 
@@ -241,14 +241,14 @@ src_install() {
 		for slot in $(php_get_slots) ; do
 			php_init_slot_env "${slot}"
 
-			BUILD_DIR="${S}/php${slot}" cmake-utils_src_install
+			BUILD_DIR="${S}/php${slot}" cmake_src_install
 
 			cd "${S}" || die
 		done
 	fi
 
 	# Install this last because this build is the most "fully-featured"
-	cmake-utils_src_install
+	cmake_src_install
 
 	if use apache ; then
 		# We need a mapserver symlink available in cgi-bin