gentoo auto-resync : 10:10:2022 - 01:33:06

5 files changed, 0 insertions, 538 deletions

diff --git a/sci-libs/gdal/files/gdal-2.2.3-soname.patch b/sci-libs/gdal/files/gdal-2.2.3-soname.patch
deleted file mode 100644
index 1fee41daeafc..000000000000
--- a/sci-libs/gdal/files/gdal-2.2.3-soname.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-Set SONAME and unbreak compilation on Darwin
-
-Author: Fabian Groffen <grobian@gentoo.org>
-Author: Dennis Schridde <devurandom@gmx.net>
-
---- a/GDALmake.opt.in
-+++ b/GDALmake.opt.in
-@@ -97,6 +97,14 @@
- GDAL_SLIB	=	$(GDAL_ROOT)/libgdal.$(SO_EXT)
- GDAL_SLIB_LINK	=	-L$(GDAL_ROOT) -lgdal
- 
-+# for building without libtool
-+GDAL_SLIB_SO_VER =	$(GDAL_VERSION_MAJOR).$(LIBGDAL_CURRENT).$(LIBGDAL_REVISION)
-+ifeq ("$(shell uname -s)", "Darwin")
-+GDAL_SLIB_SONAME =	-install_name $(INST_LIB)/libgdal.$(GDAL_VERSION_MAJOR).$(SO_EXT)
-+else
-+GDAL_SLIB_SONAME =	-Wl,-soname,libgdal.$(SO_EXT).$(GDAL_VERSION_MAJOR)
-+endif
-+
- # Mac OS X Framework definition
- MACOSX_FRAMEWORK = @MACOSX_FRAMEWORK@
- 
---- a/GNUmakefile
-+++ b/GNUmakefile
-@@ -208,7 +208,7 @@ else
- 
- ifeq ($(HAVE_LD_SHARED),yes)
- 
--GDAL_SLIB_B	=	$(notdir $(GDAL_SLIB))
-+GDAL_SLIB_B	=	libgdal
- 
- install-lib:
- 
-@@ -216,14 +216,14 @@ install-lib:
- ifeq ($(MACOSX_FRAMEWORK),yes)
- 	$(INSTALL_LIB) $(GDAL_SLIB) $(DESTDIR)$(INST_LIB)/GDAL
- else
--	rm -f $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B)
--	rm -f $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VERSION_MAJOR)
--	rm -f $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VER)
--	$(INSTALL_LIB) $(GDAL_SLIB) $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VER)
-+	rm -f $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B).$(SO_EXT)
-+	rm -f $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VERSION_MAJOR).$(SO_EXT)
-+	rm -f $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VER).$(SO_EXT)
-+	$(INSTALL_LIB) $(GDAL_SLIB) $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VER).$(SO_EXT)
- 	(cd $(DESTDIR)$(INST_LIB) ; \
--	 ln -s $(GDAL_SLIB_B).$(GDAL_VER) $(GDAL_SLIB_B).$(GDAL_VERSION_MAJOR))
-+	 ln -s $(GDAL_SLIB_B).$(GDAL_VER).$(SO_EXT) $(GDAL_SLIB_B).$(GDAL_VERSION_MAJOR).$(SO_EXT))
- 	(cd $(DESTDIR)$(INST_LIB) ; \
--	 ln -s $(GDAL_SLIB_B).$(GDAL_VERSION_MAJOR) $(GDAL_SLIB_B))
-+	 ln -s $(GDAL_SLIB_B).$(GDAL_VERSION_MAJOR).$(SO_EXT) $(GDAL_SLIB_B).$(SO_EXT))
- 	$(INSTALL_DIR) $(DESTDIR)$(INST_LIB)/gdalplugins
- endif
- 
diff --git a/sci-libs/gdal/files/gdal-2.3.0-curl.patch b/sci-libs/gdal/files/gdal-2.3.0-curl.patch
deleted file mode 100644
index 46bc6de71672..000000000000
--- a/sci-libs/gdal/files/gdal-2.3.0-curl.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-https://bugs.gentoo.org/659840
---- a/port/cpl_vsil_curl.cpp
-+++ b/port/cpl_vsil_curl.cpp
-@@ -8617,8 +8617,10 @@
-         if( poFSHandler )
-             poFSHandler->ClearCache();
-     }
--
-+#if !defined(HAVE_CURL) || defined(CPL_MULTIPROC_STUB)
-+#else
-     VSICurlStreamingClearCache();
-+#endif
- }
- 
- #endif /* HAVE_CURL */
diff --git a/sci-libs/gdal/files/gdal-3.3.0-libdir.patch b/sci-libs/gdal/files/gdal-3.3.0-libdir.patch
deleted file mode 100644
index cd75a39f3196..000000000000
--- a/sci-libs/gdal/files/gdal-3.3.0-libdir.patch
+++ /dev/null
@@ -1,392 +0,0 @@
-[Dropped a few hunks for this to apply for now. Needs some rework to send upstream.]
-
-https://github.com/OSGeo/gdal/pull/3560
-https://bugs.gentoo.org/696106
---- a/configure.ac
-+++ b/configure.ac
-@@ -1121,11 +1121,11 @@ if test "$with_libz" = "external" -o "$with_libz" = "" -o "$with_libz" = "yes" ;
- 
- elif test "$with_libz" != "no" -a "$with_libz" != "internal" ; then
- 
--  LIBS="-L$with_libz -L$with_libz/lib $LIBS"
-+  LIBS="-L$with_libz -L$with_libz/${libdir} $LIBS"
- 
--  AC_CHECK_LIB(z,deflateInit_,LIBZ_SETTING=external,LIBZ_SETTING=internal,-L$with_libz -L$with_libz/lib -lz)
-+  AC_CHECK_LIB(z,deflateInit_,LIBZ_SETTING=external,LIBZ_SETTING=internal,-L$with_libz -L$with_libz/${libdir} -lz)
-   if test "$LIBZ_SETTING" = "external" ; then
--    AC_CHECK_LIB(z,inflateCopy,LIBZ_SETTING=external,LIBZ_SETTING=internal,-L$with_libz -L$with_libz/lib -lz)
-+    AC_CHECK_LIB(z,inflateCopy,LIBZ_SETTING=external,LIBZ_SETTING=internal,-L$with_libz -L$with_libz/${libdir} -lz)
-      if test "$LIBZ_SETTING" = "external" ; then
-         AC_MSG_RESULT([using libz library from $with_libz])
-     else
-@@ -1166,7 +1166,7 @@ AC_ARG_WITH(libdeflate,
- if test "$with_libdeflate" != "no" ; then
- 
-   if test "$with_libdeflate" != "" -a "$with_libdeflate" != "yes"; then
--    AC_CHECK_LIB(deflate, libdeflate_zlib_decompress, [libdeflate_lib=yes], [libdeflate_lib=no],-L$with_libdeflate/lib)
-+    AC_CHECK_LIB(deflate, libdeflate_zlib_decompress, [libdeflate_lib=yes], [libdeflate_lib=no],-L$with_libdeflate/${libdir})
-   else
-     AC_CHECK_LIB(deflate, libdeflate_zlib_decompress, [libdeflate_lib=yes], [libdeflate_lib=no])
-   fi
-@@ -1197,7 +1197,7 @@ fi
- if test "$LIBDEFLATE_SETTING" = "yes" ; then
-   if test "$with_libdeflate" != "" -a "$with_libdeflate" != "yes"; then
-     EXTRA_INCLUDES="-I$with_libdeflate/include $EXTRA_INCLUDES"
--    LIBS="-L$with_libdeflate/lib -ldeflate $LIBS"
-+    LIBS="-L$with_libdeflate/${libdir} -ldeflate $LIBS"
-   else
-     LIBS="-ldeflate $LIBS"
-   fi
-@@ -1290,7 +1290,7 @@ else
-     LIBS="-L$with_libtiff -ltiff $LIBS"
-     EXTRA_INCLUDES="-I$with_libtiff $EXTRA_INCLUDES"
-   else
--    LIBS="-L$with_libtiff/lib -ltiff $LIBS"
-+    LIBS="-L$with_libtiff/${libdir} -ltiff $LIBS"
-     EXTRA_INCLUDES="-I$with_libtiff/include $EXTRA_INCLUDES"
-   fi
- 
-@@ -1414,52 +1414,22 @@ else
-     fi
-   else
-     ORIG_LIBS="$LIBS"
--    LIBS="-L$with_proj/lib -lproj $with_proj_extra_lib_for_test $ORIG_LIBS"
-+    LIBS="-L$with_proj/${libdir} -lproj $with_proj_extra_lib_for_test $ORIG_LIBS"
-     AC_LANG_PUSH([C++])
-     AC_CHECK_LIB(proj,proj_create_from_wkt,PROJ_FOUND=yes,PROJ_FOUND=no,)
-     AC_LANG_POP([C++])
-     if test "$PROJ_FOUND" = "no"; then
--        LIBS="-L$with_proj/lib -lproj $with_proj_extra_lib_for_test $ORIG_LIBS"
-+        LIBS="-L$with_proj/${libdir} -lproj $with_proj_extra_lib_for_test $ORIG_LIBS"
-         unset ac_cv_lib_proj_proj_create_from_wkt
-         AC_LANG_PUSH([C++])
-         AC_CHECK_LIB(proj,proj_create_from_wkt,PROJ_FOUND=yes,PROJ_FOUND=no,)
-         AC_LANG_POP([C++])
-     fi
-     if test "$PROJ_FOUND" = "no"; then
--        LIBS="-L$with_proj/lib64 -lproj $with_proj_extra_lib_for_test $ORIG_LIBS"
--        unset ac_cv_lib_proj_proj_create_from_wkt
--        AC_LANG_PUSH([C++])
--        AC_CHECK_LIB(proj,proj_create_from_wkt,PROJ_FOUND=yes,PROJ_FOUND=no,)
--        AC_LANG_POP([C++])
--    fi
--    if test "$PROJ_FOUND" = "no"; then
--        LIBS="-L$with_proj/lib -lproj $with_proj_extra_lib_for_test $ORIG_LIBS"
-+        LIBS="-L$with_proj/${libdir} -lproj $with_proj_extra_lib_for_test $ORIG_LIBS"
-         AC_LANG_PUSH([C++])
-         AC_CHECK_LIB(proj,internal_proj_create_from_wkt,PROJ_FOUND=yes,PROJ_FOUND=no,)
-         AC_LANG_POP([C++])
--        if test "$PROJ_FOUND" = "no"; then
--            LIBS="-L$with_proj/lib -lproj $with_proj_extra_lib_for_test $ORIG_LIBS"
--            unset ac_cv_lib_proj_internal_proj_create_from_wkt
--            AC_LANG_PUSH([C++])
--            AC_CHECK_LIB(proj,internal_proj_create_from_wkt,PROJ_FOUND=yes,PROJ_FOUND=no,)
--            AC_LANG_POP([C++])
--        fi
--        if test "$PROJ_FOUND" = "yes"; then
--            PROJ_INCLUDE="-DPROJ_RENAME_SYMBOLS"
--        fi
--    fi
--    if test "$PROJ_FOUND" = "no"; then
--        LIBS="-L$with_proj/lib -linternalproj $with_proj_extra_lib_for_test $ORIG_LIBS"
--        AC_LANG_PUSH([C++])
--        AC_CHECK_LIB(internalproj,internal_proj_create_from_wkt,PROJ_FOUND=yes,PROJ_FOUND=no,)
--        AC_LANG_POP([C++])
--        if test "$PROJ_FOUND" = "no"; then
--            LIBS="-L$with_proj/lib -linternalproj $with_proj_extra_lib_for_test $ORIG_LIBS"
--            unset ac_cv_lib_internal_proj_internal_proj_create_from_wkt
--            AC_LANG_PUSH([C++])
--            AC_CHECK_LIB(internalproj,internal_proj_create_from_wkt,PROJ_FOUND=yes,PROJ_FOUND=no,)
--            AC_LANG_POP([C++])
--        fi
-         if test "$PROJ_FOUND" = "yes"; then
-             PROJ_INCLUDE="-DPROJ_RENAME_SYMBOLS"
-         fi
-@@ -1523,7 +1493,7 @@ elif test "$with_spatialite" = "dlopen"; then
-       SPATIALITE_SONAME="spatialite.so"
-   fi
- else
--    AC_CHECK_LIB(spatialite,spatialite_init,SPATIALITE_INIT_FOUND=yes,SPATIALITE_INIT_FOUND=no,-L$with_spatialite/lib -lspatialite)
-+    AC_CHECK_LIB(spatialite,spatialite_init,SPATIALITE_INIT_FOUND=yes,SPATIALITE_INIT_FOUND=no,-L$with_spatialite/${libdir} -lspatialite)
- 
-     if test -f "$with_spatialite/include/spatialite.h" -a \
-         "$SPATIALITE_INIT_FOUND" = "yes"; then
-@@ -1531,7 +1501,7 @@ else
-         if test "$HAVE_SQLITE3" = "yes"; then
-             SPATIALITE_INC="-I$with_spatialite/include"
-             HAVE_SPATIALITE=yes
--            SPATIALITE_LIBS="-L$with_spatialite/lib -lspatialite"
-+            SPATIALITE_LIBS="-L$with_spatialite/${libdir} -lspatialite"
-             LIBS="$SQLITE3_LDFLAGS $LIBS $SPATIALITE_LIBS"
-             AC_MSG_RESULT(spatialite enabled)
-         else
-@@ -1593,10 +1563,10 @@ if test "$with_zstd" = "" -o "$with_zstd" = "yes" ; then
-   fi
- elif test "$with_zstd" != "" -a "$with_zstd" != "no"; then
- 
--  AC_CHECK_LIB(zstd,ZSTD_decompressStream,ZSTD_SETTING=yes,ZSTD_SETTING=no,-L$with_zstd/lib)
-+  AC_CHECK_LIB(zstd,ZSTD_decompressStream,ZSTD_SETTING=yes,ZSTD_SETTING=no,-L$with_zstd/${libdir})
- 
-   if test "$ZSTD_SETTING" = "yes" -a -f "$with_zstd/include/zstd.h" ; then
--    LIBS="-L$with_zstd/lib -lzstd $LIBS"
-+    LIBS="-L$with_zstd/${libdir} -lzstd $LIBS"
-     EXTRA_INCLUDES="-I$with_zstd/include $EXTRA_INCLUDES"
-   else
-     AC_MSG_ERROR([libzstd not found])
-@@ -1919,20 +1889,20 @@ fi
- # TODO: separate libs for rasters and vectors
- if test "$with_grass" != "yes" -a "$with_grass" != "no" ; then
- 
--  AC_CHECK_LIB(grass_gis,G_is_initialized,GRASS_SETTING=grass70+,GRASS_SETTING=no,-L$with_grass/lib -lgrass_datetime)
-+  AC_CHECK_LIB(grass_gis,G_is_initialized,GRASS_SETTING=grass70+,GRASS_SETTING=no,-L$with_grass/${libdir} -lgrass_datetime)
-   if test "$GRASS_SETTING" = "no" ; then
--    AC_CHECK_LIB(grass_gis,G_asprintf,GRASS_SETTING=grass57+,GRASS_SETTING=no,-L$with_grass/lib -lgrass_datetime)
-+    AC_CHECK_LIB(grass_gis,G_asprintf,GRASS_SETTING=grass57+,GRASS_SETTING=no,-L$with_grass/${libdir} -lgrass_datetime)
-   fi
- 
-   if test "$GRASS_SETTING" != "no" ; then
-     if test "$GRASS_SETTING" = "grass70+" ; then
-       G_RASTLIBS="-lgrass_raster -lgrass_imagery"
-       G_VECTLIBS="-lgrass_vector -lgrass_dig2 -lgrass_dgl -lgrass_rtree -lgrass_linkm -lgrass_dbmiclient -lgrass_dbmibase"
--      LIBS="-L$with_grass/lib $G_VECTLIBS $G_RASTLIBS -lgrass_gproj -lgrass_gmath -lgrass_gis -lgrass_datetime $LIBS"
-+      LIBS="-L$with_grass/${libdir} $G_VECTLIBS $G_RASTLIBS -lgrass_gproj -lgrass_gmath -lgrass_gis -lgrass_datetime $LIBS"
-     else
-       G_RASTLIBS="-lgrass_I"
-       G_VECTLIBS="-lgrass_vect -lgrass_dig2 -lgrass_dgl -lgrass_rtree -lgrass_linkm -lgrass_dbmiclient -lgrass_dbmibase"
--      LIBS="-L$with_grass/lib $G_VECTLIBS $G_RASTLIBS -lgrass_gproj -lgrass_vask -lgrass_gmath -lgrass_gis -lgrass_datetime $LIBS"
-+      LIBS="-L$with_grass/${libdir} $G_VECTLIBS $G_RASTLIBS -lgrass_gproj -lgrass_vask -lgrass_gmath -lgrass_gis -lgrass_datetime $LIBS"
-     fi
-     GRASS_INCLUDE="-I$with_grass/include"
-     GRASS_GISBASE="$with_grass"
-@@ -1956,10 +1926,10 @@ elif test "$with_libgrass" = "yes" -o "$with_libgrass" = "" ; then
- 
- else
- 
--  AC_CHECK_LIB(grass5,G_gisinit_2,GRASS_SETTING=libgrass,GRASS_SETTING=no,-L$with_libgrass/lib)
-+  AC_CHECK_LIB(grass5,G_gisinit_2,GRASS_SETTING=libgrass,GRASS_SETTING=no,-L$with_libgrass/${libdir})
- 
-   if test "$GRASS_SETTING" = "libgrass" ; then
--    LIBS="-L$with_libgrass -L$with_libgrass/lib -lgrass5 $LIBS"
-+    LIBS="-L$with_libgrass -L$with_libgrass/${libdir} -lgrass5 $LIBS"
-     GRASS_INCLUDE="-I$with_libgrass -I$with_libgrass/include $EXTRA_INCLUDES"
-   else
-     AC_MSG_ERROR([--with-libgrass=$with_grass requested, but libgrass5 not found!])
-@@ -2006,7 +1976,7 @@ dnl Fedora has cfitsio headers in /usr/include/cfitsio
- else
- 
-   FITS_SETTING=external
--  LIBS="-L$with_cfitsio -L$with_cfitsio/lib -lcfitsio $LIBS"
-+  LIBS="-L$with_cfitsio -L$with_cfitsio/${libdir} -lcfitsio $LIBS"
-   EXTRA_INCLUDES="-I$with_cfitsio -I$with_cfitsio/include $EXTRA_INCLUDES"
- 
-   echo "using libcfitsio from $with_cfitsio."
-@@ -2055,7 +2025,7 @@ elif test "$with_pcraster" = "internal" ; then
- else
- 
-   PCRASTER_SETTING=external
--  LIBS="-L$with_pcraster/lib -lcsf $LIBS"
-+  LIBS="-L$with_pcraster/${libdir} -lcsf $LIBS"
-   EXTRA_INCLUDES="-I$with_pcraster/include $EXTRA_INCLUDES"
- 
-   echo "using libcsf from $with_pcraster."
-@@ -2106,7 +2076,7 @@ elif test "$with_png" = "internal" ; then
- else
- 
-   PNG_SETTING=external
--  LIBS="-L$with_png -L$with_png/lib -lpng $LIBS"
-+  LIBS="-L$with_png -L$with_png/${libdir} -lpng $LIBS"
-   EXTRA_INCLUDES="-I$with_png -I$with_png/include $EXTRA_INCLUDES"
- 
-   echo "using libpng from $with_png."
-@@ -2141,7 +2111,7 @@ else
- 
-   DDS_SETTING=yes
-   CRUNCHDIR="$with_dds"
--  LIBS="-L$with_dds/lib/ -lcrunch $LIBS"
-+  LIBS="-L$with_dds/${libdir}/ -lcrunch $LIBS"
-   echo "using libcrunch from $with_dds."
- 
- fi
-@@ -2179,7 +2149,7 @@ elif test "$with_gta" = "yes" -o "$with_gta" = "" ; then
- else
- 
-   GTA_SETTING=yes
--  LIBS="-L$with_gta -L$with_gta/lib -lgta $LIBS"
-+  LIBS="-L$with_gta -L$with_gta/${libdir} -lgta $LIBS"
-   EXTRA_INCLUDES="-I$with_gta -I$with_gta/include $EXTRA_INCLUDES"
- 
-   echo "using libgta from $with_gta."
-@@ -2292,10 +2262,10 @@ else
- 
-   dnl We now require libgeotiff 1.5.0
-   dnl first check if $with_geotiff/lib has the library:
--  AC_CHECK_LIB(geotiff,GTIFAttachPROJContext,GEOTIFF_SETTING=external,GEOTIFF_SETTING=not_found,-L$with_geotiff/lib)
-+  AC_CHECK_LIB(geotiff,GTIFAttachPROJContext,GEOTIFF_SETTING=external,GEOTIFF_SETTING=not_found,-L$with_geotiff/${libdir})
- 
-   if test $GEOTIFF_SETTING = "external" ; then
--    LIBS="-L$with_geotiff/lib -lgeotiff $LIBS"
-+    LIBS="-L$with_geotiff/${libdir} -lgeotiff $LIBS"
-     if test  -d $with_geotiff/include ; then
-       EXTRA_INCLUDES="-I$with_geotiff/include $EXTRA_INCLUDES"
-     fi
-@@ -2518,7 +2488,7 @@ elif test "$with_gif" = "internal" ; then
- else
- 
-   GIF_SETTING=external
--  LIBS="-L$with_gif -L$with_gif/lib -lgif $LIBS"
-+  LIBS="-L$with_gif -L$with_gif/${libdir} -lgif $LIBS"
-   EXTRA_INCLUDES="-I$with_gif -I$with_gif/include $EXTRA_INCLUDES"
- 
-   echo "using libgif from $with_gif."
-@@ -2584,10 +2554,10 @@ elif test "$with_ogdi" = "yes" -o "$with_ogdi" = "" ; then
- 
- else
- 
--  AC_CHECK_LIB(ogdi,cln_GetLayerCapabilities,HAVE_OGDI=yes,HAVE_OGDI=no,-L$with_ogdi -L$with_ogdi/lib -logdi)
-+  AC_CHECK_LIB(ogdi,cln_GetLayerCapabilities,HAVE_OGDI=yes,HAVE_OGDI=no,-L$with_ogdi -L$with_ogdi/${libdir} -logdi)
-   if test "$HAVE_OGDI" = "yes" ; then
-     if test -f "$with_ogdi/ecs.h" -o -f "$with_ogdi/include/ecs.h"; then
--        LIBS="-L$with_ogdi -L$with_ogdi/lib -logdi $LIBS"
-+        LIBS="-L$with_ogdi -L$with_ogdi/${libdir} -logdi $LIBS"
-         OGDI_INCLUDE="-I$with_ogdi -I$with_ogdi/include"
- 
-         echo "using libogdi from $with_ogdi."
-@@ -2597,10 +2567,10 @@ else
-      fi
-   else
-     dnl For backward compatibility. Retry with ogdi31 as a name
--    AC_CHECK_LIB(ogdi31,cln_GetLayerCapabilities,HAVE_OGDI=yes,HAVE_OGDI=no,-L$with_ogdi -L$with_ogdi/lib -logdi31)
-+    AC_CHECK_LIB(ogdi31,cln_GetLayerCapabilities,HAVE_OGDI=yes,HAVE_OGDI=no,-L$with_ogdi -L$with_ogdi/${libdir} -logdi31)
-     if test "$HAVE_OGDI" = "yes" ; then
-       if test -f "$with_ogdi/ecs.h" -o -f "$with_ogdi/include/ecs.h"; then
--        LIBS="-L$with_ogdi -L$with_ogdi/lib -logdi31 $LIBS"
-+        LIBS="-L$with_ogdi -L$with_ogdi/${libdir} -logdi31 $LIBS"
-         OGDI_INCLUDE="-I$with_ogdi -I$with_ogdi/include"
- 
-         echo "using libogdi31 from $with_ogdi."
-@@ -2718,10 +2688,10 @@ elif test "$with_sosi" = "yes" ; then
-     rm -f testfyba
- else
- 
--  AC_MSG_CHECKING([for libfyba.a, libfygm.a and libfyut.a in $with_sosi/lib])
--  if test -r $with_sosi/lib/libfyba.a -a -r $with_sosi/lib/libfygm.a -a -r $with_sosi/lib/libfyut.a ; then
-+  AC_MSG_CHECKING([for libfyba.a, libfygm.a and libfyut.a in $with_sosi/${libdir}])
-+  if test -r $with_sosi/${libdir}/libfyba.a -a -r $with_sosi/${libdir}/libfygm.a -a -r $with_sosi/${libdir}/libfyut.a ; then
-     AC_MSG_RESULT([found.])
--    SOSI_LIB="$with_sosi/lib/libfyba.a $with_sosi/lib/libfygm.a $with_sosi/lib/libfyut.a"
-+    SOSI_LIB="$with_sosi/${libdir}/libfyba.a $with_sosi/${libdir}/libfygm.a $with_sosi/${libdir}/libfyut.a"
-     SOSI_ENABLED=yes
-   else
-     AC_MSG_ERROR([not found.])
-@@ -2782,14 +2752,14 @@ else
-   AC_ARG_WITH(boost-lib-path,
-           [  --with-boost-lib-path=ARG   Path to boost libraries for mongocxx client],,,)
- 
--  AC_MSG_CHECKING([for libmongoclient.so in in $with_mongocxx/lib])
-+  AC_MSG_CHECKING([for libmongoclient.so in in $with_mongocxx/${libdir}])
-   MONGODB_ENABLED=yes
--  if test -r $with_mongocxx/lib/libmongoclient.so; then
-+  if test -r $with_mongocxx/${libdir}/libmongoclient.so; then
-     AC_MSG_RESULT([found.])
--    MONGODB_LIB="-L$with_mongocxx/lib -lmongoclient"
--  elif test -r $with_mongocxx/lib/libmongoclient.dylib; then
-+    MONGODB_LIB="-L$with_mongocxx/${libdir} -lmongoclient"
-+  elif test -r $with_mongocxx/${libdir}/libmongoclient.dylib; then
-     AC_MSG_RESULT([found.])
--    MONGODB_LIB="-L$with_mongocxx/lib -lmongoclient"
-+    MONGODB_LIB="-L$with_mongocxx/${libdir} -lmongoclient"
-   else
-     AC_MSG_ERROR([not found.])
-   fi
-@@ -4770,8 +4740,8 @@ if test "$with_libjson_c" = "external" -o "$with_libjson_c" = "" -o "$with_libjs
- elif test "$with_libjson_c" = "internal" ; then
-   LIBJSONC_SETTING=internal
- elif test "$with_libjson_c" != "no"; then
--  LIBS="-L$with_libjson_c/lib $LIBS"
--  AC_CHECK_LIB(json-c,json_object_set_serializer,LIBJSONC_SETTING=external,LIBJSONC_SETTING=internal,-L$with_libjson_c/lib)
-+  LIBS="-L$with_libjson_c/${libdir} $LIBS"
-+  AC_CHECK_LIB(json-c,json_object_set_serializer,LIBJSONC_SETTING=external,LIBJSONC_SETTING=internal,-L$with_libjson_c/${libdir})
- else
-   AC_MSG_ERROR([libjson-c (internal or external) is required])
- fi
---- a/frmts/grass/pkg/configure.in
-+++ b/frmts/grass/pkg/configure.in
-@@ -99,7 +99,7 @@ else
-   if $GDAL_CONFIG --autoload > /dev/null 2>&1 ; then
-     AUTOLOAD_DIR=`$GDAL_CONFIG --autoload`
-   else
--    AUTOLOAD_DIR=`$GDAL_CONFIG --prefix`/lib/gdalplugins
-+    AUTOLOAD_DIR=`$GDAL_CONFIG --prefix`/${libdir}/gdalplugins
-   fi
- fi
- 
-@@ -123,11 +123,11 @@ fi
- 
- if test "$with_grass" != "yes" ; then
- 
--  AC_CHECK_LIB(grass_gis,G_read_compressed,GRASS_SETTING=grass72+,GRASS_SETTING=no,-L$with_grass/lib -lgrass_datetime)
-+  AC_CHECK_LIB(grass_gis,G_read_compressed,GRASS_SETTING=grass72+,GRASS_SETTING=no,-L$with_grass/${libdir} -lgrass_datetime)
-   if test "$GRASS_SETTING" = "no" ; then
--    AC_CHECK_LIB(grass_gis,G_is_initialized,GRASS_SETTING=grass70+,GRASS_SETTING=no,-L$with_grass/lib -lgrass_datetime)
-+    AC_CHECK_LIB(grass_gis,G_is_initialized,GRASS_SETTING=grass70+,GRASS_SETTING=no,-L$with_grass/${libdir} -lgrass_datetime)
-     if test "$GRASS_SETTING" = "no" ; then
--      AC_CHECK_LIB(grass_gis,G_asprintf,GRASS_SETTING=grass57+,GRASS_SETTING=no,-L$with_grass/lib -lgrass_datetime)
-+      AC_CHECK_LIB(grass_gis,G_asprintf,GRASS_SETTING=grass57+,GRASS_SETTING=no,-L$with_grass/${libdir} -lgrass_datetime)
-     fi
-   fi
- 
-@@ -135,15 +135,15 @@ if test "$with_grass" != "yes" ; then
-     if test "$GRASS_SETTING" = "grass72+" ; then
-       G_RASTLIBS="-lgrass_raster -lgrass_imagery"
-       G_VECTLIBS="-lgrass_vector -lgrass_dig2 -lgrass_dgl -lgrass_rtree -lgrass_linkm -lgrass_dbmiclient -lgrass_dbmibase"
--      LIBS="-L$with_grass/lib $G_VECTLIBS $G_RASTLIBS -lgrass_gproj -lgrass_gmath -lgrass_gis -lgrass_datetime -lgrass_btree2 -lgrass_ccmath $LIBS"
-+      LIBS="-L$with_grass/${libdir} $G_VECTLIBS $G_RASTLIBS -lgrass_gproj -lgrass_gmath -lgrass_gis -lgrass_datetime -lgrass_btree2 -lgrass_ccmath $LIBS"
-     elif test "$GRASS_SETTING" = "grass70+" ; then
-       G_RASTLIBS="-lgrass_raster -lgrass_imagery"
-       G_VECTLIBS="-lgrass_vector -lgrass_dig2 -lgrass_dgl -lgrass_rtree -lgrass_linkm -lgrass_dbmiclient -lgrass_dbmibase"
--      LIBS="-L$with_grass/lib $G_VECTLIBS $G_RASTLIBS -lgrass_gproj -lgrass_gmath -lgrass_gis -lgrass_datetime $LIBS"
-+      LIBS="-L$with_grass/${libdir} $G_VECTLIBS $G_RASTLIBS -lgrass_gproj -lgrass_gmath -lgrass_gis -lgrass_datetime $LIBS"
-     else
-       G_RASTLIBS="-lgrass_I"
-       G_VECTLIBS="-lgrass_vect -lgrass_dig2 -lgrass_dgl -lgrass_rtree -lgrass_linkm -lgrass_dbmiclient -lgrass_dbmibase"
--      LIBS="-L$with_grass/lib $G_VECTLIBS $G_RASTLIBS -lgrass_gproj -lgrass_vask -lgrass_gmath -lgrass_gis -lgrass_datetime $LIBS"
-+      LIBS="-L$with_grass/${libdir} $G_VECTLIBS $G_RASTLIBS -lgrass_gproj -lgrass_vask -lgrass_gmath -lgrass_gis -lgrass_datetime $LIBS"
-     fi
-     GRASS_INCLUDE="-I$with_grass/include"
-     GRASS_GISBASE="$with_grass"
---- a/m4/ax_lib_expat.m4
-+++ b/m4/ax_lib_expat.m4
-@@ -119,9 +119,9 @@ AC_DEFUN([AX_LIB_EXPAT],
-                     expat_lib_flags="-lexpat"
-                 fi
-             else
--                AC_CHECK_LIB(expat,XML_ParserCreate,run_expat_test="yes",run_expat_test="no",-L$expat_prefix/lib)
-+                AC_CHECK_LIB(expat,XML_ParserCreate,run_expat_test="yes",run_expat_test="no",-L$expat_prefix/${libdir})
-                 if test "$run_expat_test" = "yes"; then
--                    expat_lib_flags="-L$expat_prefix/lib -lexpat"
-+                    expat_lib_flags="-L$expat_prefix/${libdir} -lexpat"
-                 fi
-             fi
-         fi
---- a/m4/ax_lib_libkml.m4
-+++ b/m4/ax_lib_libkml.m4
-@@ -172,7 +172,7 @@ kmldom::KmlFactory* factory = kmldom::KmlFactory::GetFactory();
-             if test "$libkml_prefix" = "/usr"; then
-                 libkml_lib_flags="-lkmldom -lkmlbase -lkmlengine -lkmlconvenience -lminizip -luriparser"
-             else
--                libkml_lib_flags="-L$libkml_prefix/lib -lkmldom -lkmlbase -lkmlengine -lkmlconvenience -lminizip -luriparser"
-+                libkml_lib_flags="-L$libkml_prefix/${libdir} -lkmldom -lkmlbase -lkmlengine -lkmlconvenience -lminizip -luriparser"
-             fi
-             run_libkml_test="yes"
-         elif test "$libkml_requested" = "yes"; then
---- a/m4/ax_lib_xerces.m4
-+++ b/m4/ax_lib_xerces.m4
-@@ -100,7 +100,7 @@ AC_DEFUN([AX_LIB_XERCES],
-         if test "$xerces_prefix" = "/usr"; then
-             xerces_lib_flags="-lxerces-c -lpthread"
-         else
--            xerces_lib_flags="-L$xerces_prefix/lib -lxerces-c -lpthread"
-+            xerces_lib_flags="-L$xerces_prefix/${libdir} -lxerces-c -lpthread"
-         fi
-         run_xerces_test="yes"
-     elif test "$xerces_requested" = "yes"; then
diff --git a/sci-libs/gdal/files/gdal-3.4.1-poppler-22.01.0-c++17.patch b/sci-libs/gdal/files/gdal-3.4.1-poppler-22.01.0-c++17.patch
deleted file mode 100644
index dac3bd3776d9..000000000000
--- a/sci-libs/gdal/files/gdal-3.4.1-poppler-22.01.0-c++17.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-https://bugs.gentoo.org/830883
-https://github.com/OSGeo/gdal/commit/3f528f2b5f9244698c89d31b74155765538ef362
-
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Sat, 8 Jan 2022 14:25:09 +0100
-Subject: [PATCH] frmts/pdf/GNUmakefile: force c++17 with Poppler > 21 (fixes
- #5071)
-
---- a/frmts/pdf/GNUmakefile
-+++ b/frmts/pdf/GNUmakefile
-@@ -11,6 +11,12 @@ LD_SHARED = $(LD) -bundle
- endif
- 
- ifeq ($(HAVE_POPPLER),yes)
-+# Poppler 2022.1 requires c++17
-+ifeq ($(shell test $(POPPLER_MAJOR_VERSION) -gt 21; echo $$?),0)
-+CXX := $(subst -std=c++11,,${CXX})
-+CXX := $(subst -std=c++14,,${CXX})
-+CXX := ${CXX} -std=c++17
-+endif
- CPPFLAGS +=  -DHAVE_POPPLER -DPOPPLER_MAJOR_VERSION=$(POPPLER_MAJOR_VERSION) -DPOPPLER_MINOR_VERSION=$(POPPLER_MINOR_VERSION)
- endif
- 
diff --git a/sci-libs/gdal/files/gdal-3.4.1-poppler-22.03.0.patch b/sci-libs/gdal/files/gdal-3.4.1-poppler-22.03.0.patch
deleted file mode 100644
index 94640e046a1b..000000000000
--- a/sci-libs/gdal/files/gdal-3.4.1-poppler-22.03.0.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 17e98757e78969a199d1d6318f53d088da192191 Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Fri, 18 Feb 2022 22:47:01 +0100
-Subject: [PATCH] PDF: fix build against Poppler > 22.2
-
----
- frmts/pdf/pdfdataset.cpp | 17 +++++++++++------
- 1 file changed, 11 insertions(+), 6 deletions(-)
-
-diff --git a/frmts/pdf/pdfdataset.cpp b/frmts/pdf/pdfdataset.cpp
-index 22238bd74822..08f8e31c86a7 100644
---- a/frmts/pdf/pdfdataset.cpp
-+++ b/frmts/pdf/pdfdataset.cpp
-@@ -4241,8 +4241,6 @@ PDFDataset *PDFDataset::Open( GDALOpenInfo * poOpenInfo )
- #ifdef HAVE_POPPLER
-   if(bUseLib.test(PDFLIB_POPPLER))
-   {
--    GooString* poUserPwd = nullptr;
--
-     static bool globalParamsCreatedByGDAL = false;
-     {
-         CPLMutexHolderD(&hGlobalParamsMutex);
-@@ -4310,9 +4308,6 @@ PDFDataset *PDFDataset::Open( GDALOpenInfo * poOpenInfo )
-     while( true )
-     {
-         VSIFSeekL(fp, 0, SEEK_SET);
--        if (pszUserPwd)
--            poUserPwd = new GooString(pszUserPwd);
--
-         g_nPopplerErrors = 0;
-         if( globalParamsCreatedByGDAL )
-             registerErrorCallback();
-@@ -4322,10 +4317,20 @@ PDFDataset *PDFDataset::Open( GDALOpenInfo * poOpenInfo )
-         oObj.getObj()->initNull();
-         auto poStream = new VSIPDFFileStream(fp, pszFilename, oObj.getObj());
- #endif
-+#if POPPLER_MAJOR_VERSION > 22 || (POPPLER_MAJOR_VERSION == 22 && POPPLER_MINOR_VERSION > 2)
-+        std::optional<GooString> osUserPwd;
-+        if (pszUserPwd)
-+            osUserPwd = std::optional<GooString>(pszUserPwd);
-+        poDocPoppler = new PDFDoc(poStream, std::optional<GooString>(), osUserPwd);
-+#else
-+        GooString* poUserPwd = nullptr;
-+        if (pszUserPwd)
-+            poUserPwd = new GooString(pszUserPwd);
-         poDocPoppler = new PDFDoc(poStream, nullptr, poUserPwd);
-+        delete poUserPwd;
-+#endif
-         if( globalParamsCreatedByGDAL )
-             registerErrorCallback();
--        delete poUserPwd;
-         if( g_nPopplerErrors >= MAX_POPPLER_ERRORS )
-         {
-             PDFFreeDoc(poDocPoppler);