gentoo resync : 25.10.2021

4 files changed, 20 insertions, 2 deletions

diff --git a/sci-geosciences/mapserver/Manifest b/sci-geosciences/mapserver/Manifest
index 7b1ee38cf5f4..08c25a25c80d 100644
--- a/sci-geosciences/mapserver/Manifest
+++ b/sci-geosciences/mapserver/Manifest
@@ -1,6 +1,7 @@
 AUX mapserver-7.6.2-proj8.patch 544 BLAKE2B 607130bce382bfb4198d8ef4f45048d1091d842cab29730f85149e7250b9659ebe93ac47b79e2addddbfc480d11c5a30d5f07b91479dedcfc9678d7a69404fb1 SHA512 5b2e2a33027c23e812fbd4c358320980886fd16ea1a127bf8945dff396a1038b79f1a139f304c16469117794d227bf7ce0863caaca85a3be518f3807fcb8ce0d
+AUX mapserver-oracle21.patch 636 BLAKE2B 4e102514dab3e51343b3021c74f2bb49cdd5406f4d2f800fa1a01c0825a8dbc78ee2064ba006612a430c7295cd81e98efd2ca3b603958d9a67d0fb2a28b700b2 SHA512 84e4f9128bbda24ae7488fbb5637879a37da098976f33c6c53e37e2950532e4d9fb1e3bf3b327e320fd82f0eb6acfd5528e009fc28ae945e1ab4d92aed314c86
 DIST mapserver-7.6.2.tar.gz 2715806 BLAKE2B 230e4f52c526d72ac7f46cfe4ef8e547d7ae74c01d75637ad301d4e69b90d301f02ecb8fe7d838c9ee15c022ed7980aa2f9236e08a6daedafb65a2499a9473e5 SHA512 842c2cf891df6c8dc630fac5419caa31701d732a748264f7d5b6cceaf192fa420f1863fdd18cc791a417dcdc800fed5c3e5c43ac688142f32a1a6edda4c9f791
 DIST mapserver-7.6.4.tar.gz 2718735 BLAKE2B 4d9fc6d215a55af32e0cc125f6119e0e477ddc5a5b2dbea6df1cc7e1ffaf6319f3a855329749aa07f1bca88e79a71c67cb2e8bd62e30bd60e44ecc1b8283d4ce SHA512 ccca87b650df3c1784ba82ca4a58960585d72fb4004fcea43c0dcabf03b9617ba51870bc63dbb2238a7eeb8d4337b6ff152587150912a74eeaf4a3e3d2d584ce
-EBUILD mapserver-7.6.2-r1.ebuild 7139 BLAKE2B f3c1edf9684fe5ed5facdaddf7686be91900afcd5733b7c213f30b8abff1cf61937e009d1be4ad45fe2451d82e80be191f33ad610f403242fd586ca04cf0e7e6 SHA512 981ce99b170ebce3d1598e3ffe6cc3e1a6fae5cf4e0c938923506c6338afeb1bc2b47e45774bca8046986075087fed25cd72a384fdc6facff7b1157b638d02de
-EBUILD mapserver-7.6.4.ebuild 7094 BLAKE2B da923b5b442dbcdeb178d0cd11b90fbca9979e419ed678a6e292dbcc40063f888ae66fe57e01fb03ecc4d5c0727a5ab4a4f556096cf0be9ca713e530fef94422 SHA512 e951a58133f85b14fec7fbba72fea7c8e6882371b413a6fd2d12b107c8db7cf380f401bb1c25b72415147dac77be22e0778d7106235c830e802540c97b8246ad
+EBUILD mapserver-7.6.2-r1.ebuild 7175 BLAKE2B 3184bad696c9d1449303c4b67e8619b8c93279ea7e8f542b816aa6598d2a40ac2937cf6b051292068ecf15a4356d07d68e4540549f82096c23c2c681a89bae2d SHA512 f9501e6dcc58d720aadc1588e27806219ab7b46eaf6f69af40f45a3460f7b17a4467d81b17fef50895a903a79828abdc9b4d96cd9b6e30a08663f159c67ddf50
+EBUILD mapserver-7.6.4.ebuild 7146 BLAKE2B 27a990a1cc1fab13d17eb30958f2ad36d80a978d32dd9eb51c0e4d83a12522a035e95d21227f6ce2a08a8c33798aec385c9f413783d5f7f8b219870c086d6457 SHA512 c53929f5abb435a47d93007955d0baeed044ccef31032d5f7d498e8e9a5f34d00c959d4f8f20f8e1047a8e27b5b2eb38ab68e18352048e4065c476fd21a02eee
 MISC metadata.xml 497 BLAKE2B b0517aa597d42116849e9f7ecdbf2cb2b479f5c57c7f0fe413dab870555abe82ac5dc07c624cabf769bfd2332300f2860e40cfd1ed375bafa109a347b670232b SHA512 3d58797fb05f9c45359e9ac2302a2432e9b61d300f1c01b27ef562da860311e777b7675b0f162eb2c490cdea0440c9f7b9a3323a89feef01589385ec30a5b64d
diff --git a/sci-geosciences/mapserver/files/mapserver-oracle21.patch b/sci-geosciences/mapserver/files/mapserver-oracle21.patch
new file mode 100644
index 000000000000..e77da3ee02a9
--- /dev/null
+++ b/sci-geosciences/mapserver/files/mapserver-oracle21.patch
@@ -0,0 +1,12 @@
+diff -Naru a/cmake/FindOracle.cmake b/cmake/FindOracle.cmake
+--- a/cmake/FindOracle.cmake	2021-10-20 17:50:27.817205162 +0200
++++ b/cmake/FindOracle.cmake	2021-10-20 17:52:04.977205742 +0200
+@@ -37,7 +37,7 @@
+     ${ORACLE_HOME}/OCI/include) # Oracle XE on Windows
+ 
+   set(ORACLE_OCI_NAMES clntsh libclntsh oci)
+-  set(ORACLE_NNZ_NAMES nnz10 libnnz10 nnz11 libnnz11 nnz12 libnnz12 nnz18 libnnz18 ociw32 nnz19 libnnz19)
++  set(ORACLE_NNZ_NAMES nnz10 libnnz10 nnz11 libnnz11 nnz12 libnnz12 nnz18 libnnz18 ociw32 nnz19 libnnz19 nnz21 libnnz21)
+   set(ORACLE_OCCI_NAMES libocci occi oraocci10 oraocci11 oraocci12)
+ 
+   set(ORACLE_LIB_DIR 
diff --git a/sci-geosciences/mapserver/mapserver-7.6.2-r1.ebuild b/sci-geosciences/mapserver/mapserver-7.6.2-r1.ebuild
index 090466afc3ca..a9f1ea99c8ad 100644
--- a/sci-geosciences/mapserver/mapserver-7.6.2-r1.ebuild
+++ b/sci-geosciences/mapserver/mapserver-7.6.2-r1.ebuild
@@ -88,6 +88,7 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${P}-proj8.patch
+	"${FILESDIR}"/${PN}-oracle21.patch
 )
 
 want_apache2 apache
diff --git a/sci-geosciences/mapserver/mapserver-7.6.4.ebuild b/sci-geosciences/mapserver/mapserver-7.6.4.ebuild
index 4a23194cd84a..3c1b5cb396a8 100644
--- a/sci-geosciences/mapserver/mapserver-7.6.4.ebuild
+++ b/sci-geosciences/mapserver/mapserver-7.6.4.ebuild
@@ -86,6 +86,10 @@ BDEPEND="
 	)
 "
 
+PATCHES=(
+    "${FILESDIR}"/${PN}-oracle21.patch
+)
+
 want_apache2 apache
 
 pkg_setup() {