gentoo resync : 02.02.2022

author: V3n3RiX <venerix@koprulu.sector> 2022-02-02 01:39:05 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2022-02-02 01:39:05 +0000
commit: fcc5224904648a8e6eb528d7603154160a20022f (patch)
tree: 3bfce096b38a9cea8eed13fc70c1526c456e9abd /sci-libs
parent: 2fd57282f0262ca084e05b0f2c63fbada395d02b (diff)
41 files changed, 564 insertions, 900 deletions
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 0b111a54cd03..bedbe910e93e 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index 714c97de6e54..ca53467d1883 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -1,14 +1,11 @@
 AUX gdal-2.2.3-soname.patch 1959 BLAKE2B f6cdba1af819b3416e18be1e584384b3df6858133773d2606dce96a78c239d23c204b55df62b09b16e5a0ddfee4c9469e7e6aa527088d53710884aa93287d41c SHA512 c7986792549557683125b331e0c1417cfe49ecffd067f5330ffaeb039ec0ec329d5967697210292edad6ccdcc912397cc2f4781808a87cec8de70e78d99f0a26
 AUX gdal-2.3.0-curl.patch 323 BLAKE2B 19a89ac9ffed5716fe2c26234233045022a3bc262d2ec386fdb5bc7a15cafc6472d1264020358223d2505992124177a0ae106cad26b8da671bbd1ece83762ee1 SHA512 5bd2df7712c6487e5968fbef84b4154f20d13ffe88f22886325be3c03fc882e2699e258e11c54eec750225fde1b2001d4dd35ace751a5f3c8ae59a9572241373
-AUX gdal-3.2.1-libdir.patch 20206 BLAKE2B 1b8c737246b25e8ea56855ec8cd41dc8bcc3ee575b02a6f13bd18dc062037e8f63848763fcb9a065c83d26ed510e341ee5ac9315d9b4c78ca3bb3a76f0098539 SHA512 da49eb9b42cd298b870afce6312e46ea81a41ffea7598b4cae579c846301b0179a7236ee6677fa7a2ff3c2da28eeb519d634667de973cf001f3ea8a08d4cebad
-AUX gdal-3.3.0-configure-geos-disable.patch 6509 BLAKE2B 1a22658e0f0bb83dc409c82d9b25dc8d6ae5ee7c5551c500ede654884071c48862c0392ef2b129c40546fed1af9ba7cb756a0fa4e05709481a851be8d87d2df1 SHA512 5da36ea9ced5826ddc748141ad098c2c2151a9ea68c561105eb41530c76cf6a9094a4683310949931cfac58c91511f6219240d7c18f0348e1e0841683c384c55
 AUX gdal-3.3.0-libdir.patch 19617 BLAKE2B c0fd86a2d79155ee17a8ae69ae59876b76d9a4a35c79b896d838edcd497f17bf35ddfd3ab6de8e792a87ae8c012a91b1d2f0351d47e89f7d7fcf88a72647d38a SHA512 ee74ee86b8249abfbbce6e114f3a5f1c79a30a86aeb45761ca8637ebcae0e0df4c4961b292fdd1f49865da6445a8afaf161d80c28849dde6adf72cc3ed092852
-AUX gdal-3.3.2-poppler-21.10.0.patch 1226 BLAKE2B 7475f40216fcf14417c5bb916b5508935e518e4428c8134099109b85af966935a83f807039ac2617f0a437ff1594ded0d403d447ceacdf53e77f74973bf866f1 SHA512 760f6ba7746496b2f72562ff3dad6067f67d1a612ecb713c1b9526dc335f4ecdcd97d406e8e6f395ad10b5a66a1febbe12579a52aab3d4518807999def361de4
 AUX gdal-3.4.1-poppler-22.01.0-c++17.patch 759 BLAKE2B bfb9cfc97fb56a18eda0f0d20e83f8e48ba44bab80fa7253c3883cac0a6a6460345745aaf4e63c750e4c0d8e3866c2978da382ea9889c9ff638b697e6398ad84 SHA512 bc95a835093b9b8bb3ed44d82a9c4b0fb987f1299d572e05f6791df2bd14c279853cfc877e41a012367bb4089b4e81ea359bc44d1ae11e67048063d2a1105a1a
 DIST gdal-3.3.3.tar.gz 19600111 BLAKE2B 2d4558062b35016372d6964884296878fdcef0afa83fb03b10cd902ce101ec52f551d48014d95b391d19b8db13d7ca1d639575b39e9421780f4212bef02dd51f SHA512 c49e4555e598e4182e6419758c31df08d46b8b061480f08be09d61e840057529bd833338eaa8c1ecfe1c6a0cc8cd6a073bf15fa6cdae003e4475485cf3851145
 DIST gdal-3.4.0.tar.gz 20008930 BLAKE2B b4dad7226d2cfee3bdcab9782d2d35355501c1dd830d247099f6a8030311b86e7620e90f7bba675bf49dc47d166ab586fabe45ba02d9d7e9a73829194da6b360 SHA512 e363258172cff9647804be11f28ebec1614ddfbfc6eed72d44700c23aea674267e413099555d25e784d567ea915b5fb9092ff74b98d890dfcb8aae56b0575eb6
 DIST gdal-3.4.1.tar.gz 20022859 BLAKE2B fe6da8b3f098839bc5da9e49932a7a8e172b5dcb79f34eaa5f82a336cab3666223ae6f354c7847d1090e312838cc2e121e357c914cca3375541ee8ed31746edc SHA512 dcfd5f5ceac633838db2a92af6f6eb1c9fca55216885f071c7d8df8fc119aa800b2854c6e5ae84cdeea531e7e61296ad4378d798107c19d80d2ba4e1094299bf
 EBUILD gdal-3.3.3.ebuild 7852 BLAKE2B 03a04b87e0099452c748d0400a4c21a9369a04f01948b298a39dd9a938c3b2264e00827b3cf0ca7d7719f35a90974c493fcc5a99efb111789c684249c58dcafd SHA512 28738878e2f1cb78f5ab1a25553e445563a4b17e555bf87808de1ff0d373b6b309ad561d6514e1b9b02f5391bb19c7f0519c31d490d4465f8eccef0f1cbc0945
 EBUILD gdal-3.4.0.ebuild 8033 BLAKE2B cf27f9b230f4fba647892383bd51112a9ba072424a834189569027faea7852476fc2f627837759d99c126d6307deacdf951ddaa2d88dcaf120ef4c8455ef2424 SHA512 9633034b855d9b640de491fc1e9c7d64eb149114787dcebfa76fec083b2772ba45e59cfb87154f35e4ce6544607fff515decc4bd4ce574c237f2ade914498361
-EBUILD gdal-3.4.1.ebuild 8078 BLAKE2B d50663cd04ba8fd0280806246ea2fa5f412d65b1efd9f1affd822d0028f40805de6a70a2bde4e04123646e7f51a9c95abba4b1860b889335e7fe86971956eef4 SHA512 4efce335625ca1f19c1a95d817ca5be4be7982d429d8d639c022c9c36bdc085dde28169d5d6a47d71d801273fc109c57dc4c6709bd06d3afa902d5a9680a05a0
+EBUILD gdal-3.4.1.ebuild 8076 BLAKE2B 893b3cee4760a9c85c4c059aae78d29920e0333aef8683c7a27fde9a19306b8ad982c79c52d9c2ec95a067cccc9ca927224878cd863e8cf708d3998d4e844895 SHA512 635722e556c9721e131c9bc1431c8766fcfb4304898c241f8c63be3bb1f2e6421bc641c78e43ec2b90617386daa92ad67434e51f3541e32aff73d1482294ab1c
 MISC metadata.xml 1623 BLAKE2B af7c9d5cc3c16ffef6fa9ef5dd5cf54ffcd34229d1e82b90e310f9eeccf5a5b4fa2119112b5427b520ce6e964e368aef7313edb3837940bed4b960ced7714fc3 SHA512 ed206877adac0b8b190e0edfb04f48c435d698fd523a14d54a14638b908c9e9452b1a2d394046093f5aa86cb48c611790f56ae511807855eb80bfcd4cc1d425c
diff --git a/sci-libs/gdal/files/gdal-3.2.1-libdir.patch b/sci-libs/gdal/files/gdal-3.2.1-libdir.patch
deleted file mode 100644
index cc4537bca434..000000000000
--- a/sci-libs/gdal/files/gdal-3.2.1-libdir.patch
+++ /dev/null
@@ -1,408 +0,0 @@
-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."
-@@ -2217,7 +2187,7 @@ elif test "$with_pcidsk" = "" -o "$with_pcidsk" = "yes" -o "$with_pcidsk" = "int
- else
- 
-   PCIDSK_SETTING=external
--  PCIDSK_LIB="-L$with_pcidsk/lib -lpcidsk"
-+  PCIDSK_LIB="-L$with_pcidsk/${libdir} -lpcidsk"
-   PCIDSK_INCLUDE="-I$with_pcidsk/include -I$with_pcidsk/include/pcidsk"
- 
-   echo "using libpcidsk from $with_pcidsk."
-@@ -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
-@@ -2367,7 +2337,7 @@ elif test "$with_jpeg" = "internal" ; then
- else
- 
-   JPEG_SETTING=external
--  LIBS="-L$with_jpeg -L$with_jpeg/lib -ljpeg $LIBS"
-+  LIBS="-L$with_jpeg -L$with_jpeg/${libdir} -ljpeg $LIBS"
-   EXTRA_INCLUDES="-I$with_jpeg -I$with_jpeg/include $EXTRA_INCLUDES"
- 
-   echo "using libjpeg from $with_jpeg."
-@@ -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.3.0-configure-geos-disable.patch b/sci-libs/gdal/files/gdal-3.3.0-configure-geos-disable.patch
deleted file mode 100644
index 1671845707a3..000000000000
--- a/sci-libs/gdal/files/gdal-3.3.0-configure-geos-disable.patch
+++ /dev/null
@@ -1,187 +0,0 @@
-https://github.com/OSGeo/gdal/commit/b414b0a0594b3e9c175a001e8455819463039eb6.patch
-https://github.com/OSGeo/gdal/issues/3782
-
-From b414b0a0594b3e9c175a001e8455819463039eb6 Mon Sep 17 00:00:00 2001
-From: Thomas Bonfort <thomas.bonfort@airbus.com>
-Date: Tue, 4 May 2021 08:13:45 +0200
-Subject: [PATCH] configure: fix explicit disabling of geos/sfcgal
---- a/configure
-+++ b/configure
-@@ -38323,6 +38323,7 @@ fi
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: GEOS support disabled" >&5
- $as_echo "GEOS support disabled" >&6; }
-     GEOS_CONFIG=no
-+    HAVE_GEOS=no
- 
-   elif test x"$with_geos" = x"yes" -o x"$with_geos" = x"" ; then
- 
-@@ -38580,15 +38581,13 @@ $as_echo "$as_me: WARNING: GEOS was found on your system, but the library could
- 
-   else
- 
--    if test $ac_geos_config_auto = "no" ; then
-+    if test x"$with_geos" != x"no" -a x"$with_geos" != x ; then
-       as_fn_error $? "GEOS support explicitly enabled, but geos-config could not be found" "$LINENO" 5
-     fi
- 
-   fi
- 
--HAVE_GEOS_RESULT="no"
- if test "${HAVE_GEOS}" = "yes" ; then
--
-   { $as_echo "$as_me:${as_lineno-$LINENO}: Using C API from GEOS $GEOS_VERSION" >&5
- $as_echo "$as_me: Using C API from GEOS $GEOS_VERSION" >&6;}
- 
-@@ -38602,7 +38601,6 @@ $as_echo "$as_me: Using C API from GEOS $GEOS_VERSION" >&6;}
- 
-   GEOS_LIBS="$STRIPPED_LIBRARY_NAME"
-   LIBS="${GEOS_LIBS} ${LIBS}"
--  HAVE_GEOS_RESULT="yes"
- fi
- 
- 
-@@ -38625,6 +38623,7 @@ fi
- 
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: SFCGAL support disabled" >&5
- $as_echo "SFCGAL support disabled" >&6; }
-+    HAVE_SFCGAL=no
-     SFCGAL_CONFIG=no
- 
-   elif test x"$with_sfcgal" = x"yes" -o x"$with_sfcgal" = x"" ; then
-@@ -38883,15 +38882,13 @@ $as_echo "$as_me: WARNING: SFCGAL was found on your system, but the library coul
- 
-   else
- 
--    if test $ac_sfcgal_config_auto = "no" ; then
-+    if test x"$with_sfcgal" != x"no" -a x"$with_sfcgal" != x ; then
-       as_fn_error $? "SFCGAL support explicitly enabled, but sfcgal-config could not be found" "$LINENO" 5
-     fi
- 
-   fi
- 
--HAVE_SFCGAL_RESULT="no"
- if test "${HAVE_SFCGAL}" = "yes" ; then
--
-   { $as_echo "$as_me:${as_lineno-$LINENO}: Using C API from SFCGAL $SFCGAL_VERSION" >&5
- $as_echo "$as_me: Using C API from SFCGAL $SFCGAL_VERSION" >&6;}
- 
-@@ -38905,7 +38902,6 @@ $as_echo "$as_me: Using C API from SFCGAL $SFCGAL_VERSION" >&6;}
- 
-   SFCGAL_LIBS="$STRIPPED_LIBRARY_NAME"
-   LIBS="${SFCGAL_LIBS} ${LIBS}"
--  HAVE_SFCGAL_RESULT="yes"
- fi
- 
- 
-@@ -44998,7 +44994,7 @@ echo "  FreeXL support:            ${HAVE_FREEXL}"
- echo "  GEORASTER support:         ${HAVE_GEORASTER}"
- 
- 
--echo "  GEOS support:              ${HAVE_GEOS_RESULT}"
-+echo "  GEOS support:              ${HAVE_GEOS}"
- 
- 
- echo "  Google libkml support:     ${HAVE_LIBKML}"
-@@ -45162,7 +45158,7 @@ echo "  RasterLite2 support:       ${HAVE_RASTERLITE2}"
- echo "  RDB support:               ${RDB_SETTING}"
- 
- 
--echo "  SFCGAL support:            ${HAVE_SFCGAL_RESULT}"
-+echo "  SFCGAL support:            ${HAVE_SFCGAL}"
- 
- 
- echo "  SOSI support:              ${SOSI_ENABLED}"
-diff --git a/configure.ac b/configure.ac
-index ffc71b7faf76..1f88370c4045 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -4541,14 +4541,11 @@ dnl Check if geos library is available.
- dnl ---------------------------------------------------------------------------
- 
- GEOS_INIT(3.1.0)
--HAVE_GEOS_RESULT="no"
- if test "${HAVE_GEOS}" = "yes" ; then
--
-   AC_MSG_NOTICE([Using C API from GEOS $GEOS_VERSION])
-   STRIP_SYSTEM_LIBRARY_PATHS("${GEOS_LIBS}")
-   GEOS_LIBS="$STRIPPED_LIBRARY_NAME"
-   LIBS="${GEOS_LIBS} ${LIBS}"
--  HAVE_GEOS_RESULT="yes"
- fi
- 
- dnl ---------------------------------------------------------------------------
-@@ -4556,14 +4553,11 @@ dnl Check if SFCGAL library is available.
- dnl ---------------------------------------------------------------------------
- 
- SFCGAL_INIT(1.2.2)
--HAVE_SFCGAL_RESULT="no"
- if test "${HAVE_SFCGAL}" = "yes" ; then
--
-   AC_MSG_NOTICE([Using C API from SFCGAL $SFCGAL_VERSION])
-   STRIP_SYSTEM_LIBRARY_PATHS("${SFCGAL_LIBS}")
-   SFCGAL_LIBS="$STRIPPED_LIBRARY_NAME"
-   LIBS="${SFCGAL_LIBS} ${LIBS}"
--  HAVE_SFCGAL_RESULT="yes"
- fi
- 
- dnl ---------------------------------------------------------------------------
-@@ -6077,7 +6071,7 @@ LOC_MSG([  EXR support:               ${HAVE_EXR}])
- LOC_MSG([  FGDB support:              ${FGDB_ENABLED}])
- LOC_MSG([  FreeXL support:            ${HAVE_FREEXL}])
- LOC_MSG([  GEORASTER support:         ${HAVE_GEORASTER}])
--LOC_MSG([  GEOS support:              ${HAVE_GEOS_RESULT}])
-+LOC_MSG([  GEOS support:              ${HAVE_GEOS}])
- LOC_MSG([  Google libkml support:     ${HAVE_LIBKML}])
- LOC_MSG([  GRASS support:             ${GRASS_SETTING}])
- LOC_MSG([  GTA support:               ${GTA_SETTING}])
-@@ -6135,7 +6129,7 @@ LOC_MSG([  QHull support:             ${QHULL_SETTING}])
- LOC_MSG([  Rasdaman support:          ${RASDAMAN_ENABLED}])
- LOC_MSG([  RasterLite2 support:       ${HAVE_RASTERLITE2}])
- LOC_MSG([  RDB support:               ${RDB_SETTING}])
--LOC_MSG([  SFCGAL support:            ${HAVE_SFCGAL_RESULT}])
-+LOC_MSG([  SFCGAL support:            ${HAVE_SFCGAL}])
- LOC_MSG([  SOSI support:              ${SOSI_ENABLED}])
- LOC_MSG([  SpatiaLite support:        ${HAVE_SPATIALITE}])
- if test "x$SPATIALITE_SONAME" != "x"; then
-diff --git a/m4/geos.m4 b/m4/geos.m4
-index 1c685039740e..608466c67c69 100644
---- a/m4/geos.m4
-+++ b/m4/geos.m4
-@@ -55,6 +55,7 @@ AC_DEFUN([GEOS_INIT],[
- 
-     AC_MSG_RESULT([GEOS support disabled])
-     GEOS_CONFIG=no
-+    HAVE_GEOS=no
- 
-   elif test x"$with_geos" = x"yes" -o x"$with_geos" = x"" ; then
- 
-@@ -160,7 +161,7 @@ AC_DEFUN([GEOS_INIT],[
- 
-   else
- 
--    if test $ac_geos_config_auto = "no" ; then
-+    if test x"$with_geos" != x"no" -a x"$with_geos" != x ; then
-       AC_MSG_ERROR([GEOS support explicitly enabled, but geos-config could not be found])
-     fi
- 
-diff --git a/m4/sfcgal.m4 b/m4/sfcgal.m4
-index 2384f0f0dc5d..1a8d26460ce7 100644
---- a/m4/sfcgal.m4
-+++ b/m4/sfcgal.m4
-@@ -53,6 +53,7 @@ AC_DEFUN([SFCGAL_INIT],[
-   if test x"$with_sfcgal" = x"no" ; then
- 
-     AC_MSG_RESULT([SFCGAL support disabled])
-+    HAVE_SFCGAL=no
-     SFCGAL_CONFIG=no
- 
-   elif test x"$with_sfcgal" = x"yes" -o x"$with_sfcgal" = x"" ; then
-@@ -159,7 +160,7 @@ AC_DEFUN([SFCGAL_INIT],[
- 
-   else
- 
--    if test $ac_sfcgal_config_auto = "no" ; then
-+    if test x"$with_sfcgal" != x"no" -a x"$with_sfcgal" != x ; then
-       AC_MSG_ERROR([SFCGAL support explicitly enabled, but sfcgal-config could not be found])
-     fi
- 
diff --git a/sci-libs/gdal/files/gdal-3.3.2-poppler-21.10.0.patch b/sci-libs/gdal/files/gdal-3.3.2-poppler-21.10.0.patch
deleted file mode 100644
index a727d21dab64..000000000000
--- a/sci-libs/gdal/files/gdal-3.3.2-poppler-21.10.0.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 9c09870e374ca21d558101af3f4c09a6164fdfc3 Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Sun, 26 Sep 2021 22:49:52 +0200
-Subject: [PATCH] Fix build against Poppler master
-
----
- frmts/pdf/pdfdataset.cpp | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/frmts/pdf/pdfdataset.cpp b/frmts/pdf/pdfdataset.cpp
-index 9c4c28a6572..50a8154c756 100644
---- a/frmts/pdf/pdfdataset.cpp
-+++ b/frmts/pdf/pdfdataset.cpp
-@@ -5012,7 +5012,7 @@ PDFDataset *PDFDataset::Open( GDALOpenInfo * poOpenInfo )
- #ifdef HAVE_POPPLER
-   if (bUseLib.test(PDFLIB_POPPLER))
-   {
--    GooString* poMetadata = poCatalogPoppler->readMetadata();
-+    auto poMetadata = poCatalogPoppler->readMetadata();
-     if (poMetadata)
-     {
- #if (POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 72)
-@@ -5026,7 +5026,9 @@ PDFDataset *PDFDataset::Open( GDALOpenInfo * poOpenInfo )
-             const char * const apszMDList[2] = { pszContent, nullptr };
-             poDS->SetMetadata(const_cast<char**>(apszMDList), "xml:XMP");
-         }
-+#if (POPPLER_MAJOR_VERSION < 21 || (POPPLER_MAJOR_VERSION == 21 && POPPLER_MINOR_VERSION <= 9))
-         delete poMetadata;
-+#endif
-     }
- 
-     /* Read Info object */
diff --git a/sci-libs/gdal/gdal-3.4.1.ebuild b/sci-libs/gdal/gdal-3.4.1.ebuild
index dccda0046d7f..d78b7ddda904 100644
--- a/sci-libs/gdal/gdal-3.4.1.ebuild
+++ b/sci-libs/gdal/gdal-3.4.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://download.osgeo.org/${PN}/${PV}/${P}.tar.gz"
 # subslot is libgdal.so.<SONAME>
 SLOT="0/30"
 LICENSE="BSD Info-ZIP MIT"
-KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="armadillo +aux-xml curl cpu_flags_x86_avx cpu_flags_x86_sse cpu_flags_x86_ssse3 debug doc fits geos gif gml hdf5 heif java jpeg jpeg2k lzma mdb mysql netcdf odbc ogdi opencl oracle pdf perl png postgres python spatialite sqlite threads webp xls zstd"
 
 REQUIRED_USE="
diff --git a/sci-libs/hipBLAS/Manifest b/sci-libs/hipBLAS/Manifest
new file mode 100644
index 000000000000..188e2b76fa0d
--- /dev/null
+++ b/sci-libs/hipBLAS/Manifest
@@ -0,0 +1,3 @@
+DIST hipBLAS-4.3.0.tar.gz 428016 BLAKE2B 5a86f7a59aaed9cd6219779546135080f4c583a010f47b902f25545046c50451cd48e570b58c9c3721d735f3ab54295d5eddc61fecc01236e960e37fc87761c8 SHA512 128ee56d6db3d19c83b20fbc315eae8de6ee52aae6c2c5727351bab76c14d9131318cd49a6bcc724f5ec73485783058618bca4dddf96b05cd2f3a772c04f469f
+EBUILD hipBLAS-4.3.0.ebuild 1228 BLAKE2B 355932b9971cf1fae37396989f40657877ab6b01ce4d57ad9fc18017fb01d495ade4c4c444eba6d5567529eeebe534a0930220a828dc6c81aa34c83eb0c2df0e SHA512 bd8d554d4bea3860849622b7c0ee29eb8f6d17d75f01957b07cecead00341fecd5bfcaeafb13062e0e7e45c0a2e552c4ae344197896cc7b9bae032c4db04b2e0
+MISC metadata.xml 453 BLAKE2B 4c1e76cbc277e93a92a95cda405973cc72863882ab9a6729a07976e7815119e985688387c14fc5017fd6e85aaa64eaa72b900375c7f7428eb6bbb2569c5ecaa6 SHA512 0e42066a5ac8720d1b561bcf23269013d9cceff52a9ddd6a6e0af58c7d2628c335bb290e0dc6c262a0542e286f54fd07cb487dd908343fac5cfca07410df6e56
diff --git a/sci-libs/hipBLAS/hipBLAS-4.3.0.ebuild b/sci-libs/hipBLAS/hipBLAS-4.3.0.ebuild
new file mode 100644
index 000000000000..b9ec322edf25
--- /dev/null
+++ b/sci-libs/hipBLAS/hipBLAS-4.3.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+DESCRIPTION="ROCm BLAS marshalling library"
+HOMEPAGE="https://github.com/ROCmSoftwarePlatform/hipBLAS"
+SRC_URI="https://github.com/ROCmSoftwarePlatform/hipBLAS/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64"
+SLOT="0/$(ver_cut 1-2)"
+
+RDEPEND="dev-util/hip:${SLOT}
+	sci-libs/rocBLAS:${SLOT}
+	sci-libs/rocSOLVER:${SLOT}"
+DEPEND="${RDPEND}"
+BDEPEND=""
+
+S="${WORKDIR}/hipBLAS-rocm-${PV}"
+
+src_prepare() {
+	sed -e "s:<INSTALL_INTERFACE\:include:<INSTALL_INTERFACE\:include/hipblas/:" -i library/src/CMakeLists.txt || die
+	sed -e "/PREFIX hipblas/d" -i library/src/CMakeLists.txt || die
+	sed -e "/rocm_install_symlink_subdir( hipblas )/d" -i library/src/CMakeLists.txt || die
+	sed -e "s:hipblas/include:include/hipblas:" -i library/src/CMakeLists.txt || die
+
+	eapply_user
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
+		-DCMAKE_SKIP_RPATH=ON
+		-DBUILD_CLIENTS_TESTS=OFF  # currently hipBLAS is a wrapper of rocBLAS which has tests, so no need to perform test here
+		-DBUILD_CLIENTS_BENCHMARKS=OFF
+	)
+
+	cmake_src_configure
+}
diff --git a/sci-libs/hipBLAS/metadata.xml b/sci-libs/hipBLAS/metadata.xml
new file mode 100644
index 000000000000..e74d41fd607c
--- /dev/null
+++ b/sci-libs/hipBLAS/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+  </maintainer>
+  <maintainer type="person">
+    <email>gentoo@holzke.net</email>
+    <name>Wilfried Holzke</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>xgreenlandforwyy@gmail.com</email>
+    <name>Yiyang Wu</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/sci-libs/hipFFT/Manifest b/sci-libs/hipFFT/Manifest
index c3435c9eb91c..53a3b2a4fa30 100644
--- a/sci-libs/hipFFT/Manifest
+++ b/sci-libs/hipFFT/Manifest
@@ -4,4 +4,4 @@ AUX hipFFT-4.3.0-remove-git-dependency.patch 1505 BLAKE2B e98eb5b680ef2b5e45f85a
 DIST hipFFT-rocm-4.3.0.tar.gz 83355 BLAKE2B ee99b4cb685cbb846084d8a7c77982d75cf0d1597f9270260284bb26ae00702a31dd4d5ad9ae1885ab631c390f65c0f584f302be189701ba4f0dd9061b1bba5a SHA512 0d3100b054ff485eae06b13b8c568626b8e3a3286f36012c5a5f9bb4918e03c30c687a2714049bd797f6c3973f1730ad0936f02ad044cde1663c9c5750bbcf40
 DIST rocFFT-4.3.0.tar.gz 840748 BLAKE2B 236a5faa930751d35e501a9a32ecc8b4075448ef21a0ffb0bb7ec04f4ed1cb67b908aa153b5b424e0823d3e306cf375d7c01a77d687220ed79de6d374037e003 SHA512 765d41e4018a04a53e847c03de80eec830d3e8766187fb8cb493624afa2673175347c16e6eeeebd4ad7d88bb866e58f7e572708f22238723c710b98565a0cd3d
 EBUILD hipFFT-4.3.0.ebuild 1885 BLAKE2B fd0653407acbeaaf3276535b64ddbc4ed33bebcf428b5de47561b583077e30da92314cdfa03a9f1ec1d488dbef38cadbb62087cc8181d8567b1df6aa4ae33c8f SHA512 0ebd42f6b2ae1e1719d227b96bc51023e2117751b6bf4e39ed44f46a81967d8fe9946abb4975eb7bcbad656ded7cbf5a1473e3ceb82ddb90b6546c0c2992b7cf
-MISC metadata.xml 726 BLAKE2B 5471621c140d82a51f9226ae8de8600c08651ceb7a6808dd65362db6fc79595e578e7c5cbc628197b0ed37bc803cb7636e545a7b39b3d6791d02a8f804c372a3 SHA512 64ee4d42afdc5a770a7acf808205ada93d3685666158915cee48159dfa20ba0e06c9516c4ab3e1ea5c685631d017ce8f1418f0d8909516704591dcac83eb073c
+MISC metadata.xml 727 BLAKE2B 29e2218926627115b138fc101b5d582d4c6fd29b998bd92d23f8e2a63b33e9882d312bf5ab766d72757a4a2abb1f29357e4d95c663e3525ec536a86b325ff0b9 SHA512 e8d1501ce980d5fba12bdbbc5ef1a17c13c5cfe16cd3ae9f89d151cb8843f4ef581b2c807814e9af542ce94d9924dfade9efd1e1527444b1464132ae2601d208
diff --git a/sci-libs/hipFFT/metadata.xml b/sci-libs/hipFFT/metadata.xml
index 7839d343e80f..0ae466927cad 100644
--- a/sci-libs/hipFFT/metadata.xml
+++ b/sci-libs/hipFFT/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
     <email>sci@gentoo.org</email>
diff --git a/sci-libs/indilib/Manifest b/sci-libs/indilib/Manifest
index e23a91c97192..43d241c40936 100644
--- a/sci-libs/indilib/Manifest
+++ b/sci-libs/indilib/Manifest
@@ -1,5 +1,7 @@
 DIST indilib-1.9.2.tar.gz 2335834 BLAKE2B 47d8bde8e3c783cefb23c8a8f865fa46bb9a6ed4ee08618d198680f3036e9ca9a16178b1ec4dab070d0cb3ec8d638847cedb752a2a5a1d5e2dc5ddbd362c0a86 SHA512 0a1ada5b5880553ddbcf794bac952ddce76d3aa46652c48621e284a04a7d3d9ba7492d8874bf30f7e3f614a904a829109eaee9dae53dd5854d72bb1c98740f44
 DIST indilib-1.9.3.tar.gz 2350168 BLAKE2B 4e61f79a08d32ee829bb420c2f316f9f0168d21d6d2f11905142efd390e989571a3120ea5d123df4af05d0c6c7a4a7323f8c9fc95bc652afef3fd57bc9728c88 SHA512 d0c1b17f75a25e546261cabe644420dca155672d9223eaf48fad7ed5bbc3fcf80784df1ff21c5edded0f80e0c5ef61303892afa597b611dfd3f57a1a113be5f7
+DIST indilib-1.9.4.tar.gz 2370816 BLAKE2B 4df98abfaecdfe226d889e063928d3d5a09f9141b7bbeb2798da8190f874d0137313ff05b9c524a645440298d79655f9627ac611ae3132ee30f902e46d2db34d SHA512 2331d49545cfeb5904529f74b52ba0454c81066cb644e158e159a8f3597269d6d48bb1a608162771108c30f2fdb7e21fc5c1078b152f0e2a640f2e10ad3f9142
 EBUILD indilib-1.9.2.ebuild 1537 BLAKE2B ae5d0101c31c4bd95bb688856b5113cbdfff59d7a494b98f916378c4e0d86c94d729c48386c04857e8806764d7f9684195b134e099b723408ba3d35259266ebf SHA512 df6496a6fad0246217468105f06ee3a4a368810cbcfaa4907481c230ea7bf8182d683d60292522bc61eeefdcdb75a1f3c28611bf331d86e10732db365e0a8468
 EBUILD indilib-1.9.3.ebuild 1538 BLAKE2B 23c116401ae7a896c699456300935eb1661bb290d6789e0de63231cea35a897460f658b41fd9120a2fa6832522c7934c633596a6f60ede1d35d307560a4aa7da SHA512 20d32f54890a0c4a73ded0066b27f2838d139e889de3713593bb3d124bf080a64e58ff725155f4e297287614984048de49d1c1eb2141504509d2d444c639595b
+EBUILD indilib-1.9.4.ebuild 1541 BLAKE2B 2eb032352d2c0de268a872be07553bbc1189b35f6da14eb019aa3b3b501b351b1cbe97ab8e3b72e80039464dd3e0705adb3bd9de037b2eaf1ef7dca4d1955c0f SHA512 f9c8bc335a4289332adbfc83c5aa7a1beb8830895210d470cb0af3d0f67ea07aed8c3fe8674294906d6faac0996c653f5e5937190dbd2a14249ca4e43ac9ed27
 MISC metadata.xml 562 BLAKE2B 675fbd88b6ea5004a89e4d86f397e924317f56ad98743d1d8cd9758f92b516cf70386f4eb59c8869451acd6b312c50a05b37a9ca3cedac87599bd90cd46d6ddd SHA512 ebef1f64112d45534b6ea13ce54b2ee57349d11486b881be277d669e984891fe9d8ca3839aadbbece908f55bd027060739460929bd7e0400cd04e639c7d2186f
diff --git a/sci-libs/indilib/indilib-1.9.4.ebuild b/sci-libs/indilib/indilib-1.9.4.ebuild
new file mode 100644
index 000000000000..b6d000763a3b
--- /dev/null
+++ b/sci-libs/indilib/indilib-1.9.4.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake udev
+
+DESCRIPTION="INDI Astronomical Control Protocol library"
+HOMEPAGE="https://www.indilib.org/"
+SRC_URI="https://github.com/${PN}/${PN/lib/}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P/lib/}"
+
+LICENSE="BSD GPL-2+ LGPL-2+ LGPL-2.1+"
+SLOT="0/1"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="ogg rtlsdr test websocket"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	net-misc/curl
+	sci-libs/cfitsio:=
+	sci-libs/fftw:3.0=
+	sci-libs/gsl:=
+	sci-libs/libnova:=
+	sys-libs/zlib
+	virtual/jpeg:0
+	virtual/libusb:0
+	ogg? (
+		media-libs/libogg
+		media-libs/libtheora
+	)
+	rtlsdr? ( net-wireless/rtl-sdr )
+	websocket? ( dev-libs/boost:= )
+"
+DEPEND="${RDEPEND}
+	kernel_linux? ( sys-kernel/linux-headers )
+	test? ( >=dev-cpp/gtest-1.8.0 )
+	websocket? ( dev-cpp/websocketpp )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DINDI_BUILD_QT5_CLIENT=OFF
+		-DUDEVRULES_INSTALL_DIR="${EPREFIX}$(get_udevdir)"/rules.d
+		$(cmake_use_find_package ogg OggTheora)
+		$(cmake_use_find_package rtlsdr RTLSDR)
+		-DINDI_BUILD_UNITTESTS=$(usex test)
+		-DINDI_BUILD_WEBSOCKET=$(usex websocket)
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	local myctestargs=()
+
+	if use ppc || use ppc64 || use sparc ; then
+		# Broken on big endian for quite some time.
+		# Reported upstream: file needs to be replaced w/ a normal library
+		# for b64.
+		# bug #763126
+		myctestargs+=(
+			-E "(test_base64)"
+		)
+	fi
+
+	BUILD_DIR="${BUILD_DIR}"/test cmake_src_test
+}
diff --git a/sci-libs/miopen/Manifest b/sci-libs/miopen/Manifest
index 06961884f80a..eab02baef5f1 100644
--- a/sci-libs/miopen/Manifest
+++ b/sci-libs/miopen/Manifest
@@ -6,4 +6,4 @@ AUX miopen-4.3.0-no-strip.patch 530 BLAKE2B 7706c0cfb7497a116f1a8a30735615254c90
 AUX miopen-4.3.0-strip-xnack-in-flags.patch 1032 BLAKE2B 6cd0d65676edd394e8b8e06c3ec2a7e7bd16888c81f017f1608db7f658166c6354afc26eb71f70f1a94191ed49a87bc17263ef57b61c74bbace82a51e5dc11ec SHA512 d266707d57b7d05124e808c7ba10d7487a6c07a38285927270eb117422c761e3e382a56401a5f1527177e62fb43fe280e365c823969079842766b345dc0b5747
 DIST MIOpen-4.3.0.tar.gz 59405686 BLAKE2B fe91bd91a74023866883d6d0a2a8071a8fe40c4cff2fb4ef58fc6e343a05ac2a731f73e657f4d183ade4e5b7c1fbbe41f3f032918f6e50cb713073aee8d97dc5 SHA512 a8615b7738acfbc7f68d9417b0746c62630d2b48fb8485fafba4db65a4b277a8230f601d249d7e54f89ba25c14176429ca76ad8365a437b09d836b031b0c4fbb
 EBUILD miopen-4.3.0.ebuild 2207 BLAKE2B 832fd084293d879ed5e71ff61c4c68fc268c38bbae73498355029e7d7e555ed1e216e9177f48fcd3bcdea8ff88a90cbc43c15663f9fcb9ed89fb4e2eada4aa26 SHA512 1a87523a8ee9fd56eee6c7936d28ef8cd6ec491c20a0cfdcba638b820b88f708de5c6add56fee9b08930537c5c7c5eb9c354bf2fc3d8d2f6ce51c599c71fee39
-MISC metadata.xml 452 BLAKE2B a5cb97ebc54cd63cd0f83b12d12d5be16e732e8151bdddfe1cd23655f8f271e7df45441268bc9a0d25c211c49dfcd6ce3901f0684ce43156514e78eab5e80058 SHA512 7e94c60c456503b4fe4f351ac322fae0ee5c3db8a43b43ba1a5aefb23d45495135d8370e82f1f5b8431fc12bef2f94a4f8c9bae2b0a28b25a621ed0684c424b3
+MISC metadata.xml 453 BLAKE2B 4c1e76cbc277e93a92a95cda405973cc72863882ab9a6729a07976e7815119e985688387c14fc5017fd6e85aaa64eaa72b900375c7f7428eb6bbb2569c5ecaa6 SHA512 0e42066a5ac8720d1b561bcf23269013d9cceff52a9ddd6a6e0af58c7d2628c335bb290e0dc6c262a0542e286f54fd07cb487dd908343fac5cfca07410df6e56
diff --git a/sci-libs/miopen/metadata.xml b/sci-libs/miopen/metadata.xml
index da47ad0ef39f..e74d41fd607c 100644
--- a/sci-libs/miopen/metadata.xml
+++ b/sci-libs/miopen/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
     <email>sci@gentoo.org</email>
diff --git a/sci-libs/pastix/Manifest b/sci-libs/pastix/Manifest
index 7bb75c9fa71c..ec4216338ca3 100644
--- a/sci-libs/pastix/Manifest
+++ b/sci-libs/pastix/Manifest
@@ -1,3 +1,4 @@
+AUX pastix-5.2.3-MPI-3.0.patch 5490 BLAKE2B 8e77cbdbf0857909d6e70570fe27cfeb977e7d3380298ad30e42c8194dc79241e16cb378d2a8da065dd142704530289d6508f87800e171bd6865877d802584cf SHA512 bd142ea25596d28d4962154fd24a4d66b4ab0cc2de9e662ad89e56695ca3e078d79848757efa2f02a3e1920c133d0c9d0b697efd5d9aef3008e07b3c91b16289
 AUX pastix-6.0.3-cmake-examples-optional.patch 5248 BLAKE2B eb6e08274d2bbac53c4fe02497880f61a83eb357dc95ec6ea1049322556010a0e5514d8c6d0f273b00b7b46047394edf2108ee14ef0cde65f99ebe1eb2160786 SHA512 00c214c45cf4a1c06ca4dcf3cffde9915de67f2656b0712ca23f6ff2c4aa29845f37fd7940d011fbbba170d3a47b6d74ec6cb165474c2eb30a292374e0d52953
 AUX pastix-6.0.3-cmake-installdirs.patch 13450 BLAKE2B 9c7535b4074496a97d0673fad73e7729f34c71ad992441fa2dbc1d8801b6cf1d74773872b71fad5dec8f21ac26065abf0e7de12cbec2c9a52098be6368dd7b31 SHA512 89de15236d23fb8e7f9d064789e2a6314a615803a41deeb08f22f4ee5aea92263da939ce967310fd93a5cd89051c0f0a0d3df71b0ea4968cefbec3c5cf5185fe
 AUX pastix-6.0.3-cmake-python-optional.patch 1861 BLAKE2B 5097879c1481ce7514903a182007d0d87a9e59a350f72ebba21b5719e893308617416c3661058744f7a83009cb6c7d8949ba6e57966e0a798aa4b1c96aa1f928 SHA512 ecff70d902a4424b4ee996b563e54b7190ee1d3324ef7079fafdef2f23abbc9a18899f827156ed4145a3d977f5b6c980acafb96f479be693b6658f7d21e5cced
@@ -5,6 +6,6 @@ AUX pastix-6.0.3-cmake-spm-project.patch 319 BLAKE2B 11d63d28bb5e843571306321a0c
 AUX pastix-6.0.3-multiple-coeftabMemory.patch 260 BLAKE2B 968d32d2994afca84fcee7bc4b93aa7cf77dda2d66c2617095ee191572fb9c37d631e83954efdb53aba0997b426f85a6529d40a3c8f85f62de684548cc760447 SHA512 2f73d7f2ebbc92b46f13e0bed42ed76fd6831af5706988e5111971adb3ba46d8bca9fd563f40cb8a10fae1a65e180c2f1866b51ab0c4c95ef801c590513301f2
 DIST pastix-6.0.3.tar.gz 1793579 BLAKE2B 9e0ee71c80b2c93c6762c1a824b2e1262fd1a9f406194fb99eeecbfc172cf82f497d23a541b56c44e5487c3c228cab781f47f683ee04c6cdf426da6126750a69 SHA512 5bf8dfa6ed02ee7e236c63e21c80bd45af807b465b21a8c0520b1328e179095f1416f925be9f8b5ec0e8078ca9bc4398bf0d091fdc8e9ea51b9af12a06d9a544
 DIST pastix_5.2.3.tar.bz2 2246903 BLAKE2B b13cb31bbc2aeb122e932b2a934598ec975a55f327483bf1383280976584858426c56982f6980b52f32f04e05c6e6c8de1cf35e378e61a7be9dddb705b1c033a SHA512 69acffac1be8c756886783c2a6307269ab4d14abfc4a77268b3d14995e53b16084c298446812484233d9d52c317490d6ad67788166adf367075e6c8442147b95
-EBUILD pastix-5.2.3.ebuild 3353 BLAKE2B 275c63ffd0d186f827f568bf73fe606fe520109cb364c279cce2da05965fd1f19b4e331d960458fe454f1abfba4879938f9686674ca0922bcdf8e4bcbaff08c4 SHA512 c7521ecd8eb7a080532867dc1913fcbfb06b9395e262e27ed6cdfee35dd439c32d7305d54f60d5fdab78a1dc218be95d3dcd2b8df69ee7e09ad4eaa77af1ab16
+EBUILD pastix-5.2.3.ebuild 3398 BLAKE2B c26e416bd5f61131e5ebd6f88d022133ab29ee58614aeca17821a6436133cdf18260bd19f92da51060306163efc14b3da690c4ea9d4fc7aa37f85ffb8400515f SHA512 0af54a667650a29aa6921567346d00447bf08755e9c02a94dcd7aef4c5be2ad7138bd126b8a095b1063b3199ca92daf231ecb515560343951b38bc88ee424cb1
 EBUILD pastix-6.0.3.ebuild 2387 BLAKE2B f413e120a0ab1efe348ce72939022d3e0af416d0bb8c8676829e9eb72f27a258bfb3eef246fc07adbe173d22ebbc7acbcafe4c0d6c77a76b6ba3ed2ec4e5baed SHA512 00fdcf36c2318638093f9a2b73144e04df7e24a06fdc30aeb499e79eecc6069d6c601ca26bc95215d94949c31678f5f48648cb6cb0e2b78ef8e7e0c27a5ca647
 MISC metadata.xml 1383 BLAKE2B 0a17508eb75ed0066dbbaad286cb00ddd8491aa5b6047f2f32fde75f5e43277233229d4935d94052000c662e729480aaa02cdcbd4572e4b84075f108b1c61800 SHA512 9cc80da6ccb82311e30288696cce006e858121a8d216ba2860a1c0ae833c8e8076d60cd783283d163528976bfd9af11d114fc95a481b36951b5d7caf3c0fad2c
diff --git a/sci-libs/pastix/files/pastix-5.2.3-MPI-3.0.patch b/sci-libs/pastix/files/pastix-5.2.3-MPI-3.0.patch
new file mode 100644
index 000000000000..d86ec5b78416
--- /dev/null
+++ b/sci-libs/pastix/files/pastix-5.2.3-MPI-3.0.patch
@@ -0,0 +1,139 @@
+https://bugs.gentoo.org/692742
+rename MPI 1.0 to 3.0+ functions:
+- MPI_Address -> MPI_Get_address
+- MPI_Type_struct -> MPI_Type_create_struct
+
+--- a/common/src/nompi.h
++++ b/common/src/nompi.h
+@@ -127,9 +127,9 @@
+ #define MPI_Start(request)
+ #define MPI_Startall(count, array_of_requests)
+ #define MPI_Type_contiguous(count, oldtype, newtype)
+-#define MPI_Type_struct(count, array_of_blocklengths, array_of_displacement, \
++#define MPI_Type_create_struct(count, array_of_blocklengths, array_of_displacement, \
+                         oldtype, newtype)
+-#define MPI_Address(location, newtype)
++#define MPI_Get_address(location, newtype)
+ #define MPI_Type_commit(datatype)
+ #define MPI_Type_free(datatype)
+ #define MPI_Request_free(request)
+--- a/sopalin/src/sopalin_sendrecv.c
++++ b/sopalin/src/sopalin_sendrecv.c
+@@ -1300,10 +1300,10 @@
+   thread_data->gtaboffs[packnbr]   = FANIN_INFOTAB(t);
+   thread_data->gtaboffs[packnbr+1] = FANIN_COEFTAB(t);
+ #else /* NO_MPI_TYPE */
+-  CALL_MPI MPI_Address(FANIN_INFOTAB(t),&(thread_data->gtaboffs[packnbr]));
+-  TEST_MPI("MPI_Address");
+-  CALL_MPI MPI_Address(FANIN_COEFTAB(t),&(thread_data->gtaboffs[packnbr+1]));
+-  TEST_MPI("MPI_Address");
++  CALL_MPI MPI_Get_address(FANIN_INFOTAB(t),&(thread_data->gtaboffs[packnbr]));
++  TEST_MPI("MPI_Get_address");
++  CALL_MPI MPI_Get_address(FANIN_COEFTAB(t),&(thread_data->gtaboffs[packnbr+1]));
++  TEST_MPI("MPI_Get_address");
+ #endif /* NO_MPI_TYPE */
+ 
+   /* Add other contribution for the same task */
+@@ -1410,12 +1410,12 @@
+           thread_data->gtaboffs[packnbr]   = FANIN_INFOTAB(t);
+           thread_data->gtaboffs[packnbr+1] = FANIN_COEFTAB(t);
+ #else /* NO_MPI_TYPE */
+-          CALL_MPI MPI_Address(FANIN_INFOTAB(t),
++          CALL_MPI MPI_Get_address(FANIN_INFOTAB(t),
+                                &(thread_data->gtaboffs[packnbr]));
+-          TEST_MPI("MPI_Address");
+-          CALL_MPI MPI_Address(FANIN_COEFTAB(t),
++          TEST_MPI("MPI_Get_address");
++          CALL_MPI MPI_Get_address(FANIN_COEFTAB(t),
+                                &(thread_data->gtaboffs[packnbr+1]));
+-          TEST_MPI("MPI_Address");
++          TEST_MPI("MPI_Get_address");
+ #endif /* NO_MPI_TYPE */
+ 
+           if (queueSize(sendqueue))
+@@ -1508,10 +1508,10 @@
+   TEST_MPI("MPI_Rsend");
+ #  endif
+ #else /* NO_MPI_TYPE */
+-  CALL_MPI MPI_Type_struct(2*(packnbr/2+1), thread_data->gtabsize,
++  CALL_MPI MPI_Type_create_struct(2*(packnbr/2+1), thread_data->gtabsize,
+                            thread_data->gtaboffs,
+                            thread_data->gtabtype, &newtype);
+-  TEST_MPI("MPI_Type_struct");
++  TEST_MPI("MPI_Type_create_struct");
+   CALL_MPI MPI_Type_commit(&newtype);
+   TEST_MPI("MPI_Type_commit");
+ #  ifdef TEST_ISEND
+@@ -1602,15 +1602,15 @@
+               (long)me, (unsigned int)(intptr_t)BTAG_COEFTAB(t));
+ 
+ #ifndef NO_MPI_TYPE
+-  CALL_MPI MPI_Address(BTAG_BTAGTAB(t),&(taboffs[0]));
+-  TEST_MPI("MPI_Address");
+-  CALL_MPI MPI_Address(BTAG_BCOFTAB(t),&(taboffs[1]));
+-  TEST_MPI("MPI_Address");
+-  CALL_MPI MPI_Address((void *)BTAG_COEFTAB(t),&(taboffs[2]));
+-  TEST_MPI("MPI_Address");
++  CALL_MPI MPI_Get_address(BTAG_BTAGTAB(t),&(taboffs[0]));
++  TEST_MPI("MPI_Get_address");
++  CALL_MPI MPI_Get_address(BTAG_BCOFTAB(t),&(taboffs[1]));
++  TEST_MPI("MPI_Get_address");
++  CALL_MPI MPI_Get_address((void *)BTAG_COEFTAB(t),&(taboffs[2]));
++  TEST_MPI("MPI_Get_address");
+ 
+-  CALL_MPI MPI_Type_struct(3,tabsize,taboffs,tabtype,&newtype);
+-  TEST_MPI("MPI_Type_struct");
++  CALL_MPI MPI_Type_create_struct(3,tabsize,taboffs,tabtype,&newtype);
++  TEST_MPI("MPI_Type_create_struct");
+ 
+   CALL_MPI MPI_Type_commit(&newtype);
+   TEST_MPI("MPI_Type_commit");
+--- a/sopalin/src/updo_sendrecv.c
++++ b/sopalin/src/updo_sendrecv.c
+@@ -347,12 +347,12 @@
+   tabtype[0] = COMM_INT;
+   tabtype[1] = COMM_FLOAT;
+ 
+-  CALL_MPI MPI_Address(infotab,&(taboffs[0]));
+-  TEST_MPI("MPI_Address");
+-  CALL_MPI MPI_Address(FANIN_COEFTAB(SOLV_FTGTIND(j)),&(taboffs[1]));
+-  TEST_MPI("MPI_Address");
+-  CALL_MPI MPI_Type_struct(2,tabsize,taboffs,tabtype,&newtype);
+-  TEST_MPI("MPI_Type_struct");
++  CALL_MPI MPI_Get_address(infotab,&(taboffs[0]));
++  TEST_MPI("MPI_Get_address");
++  CALL_MPI MPI_Get_address(FANIN_COEFTAB(SOLV_FTGTIND(j)),&(taboffs[1]));
++  TEST_MPI("MPI_Get_address");
++  CALL_MPI MPI_Type_create_struct(2,tabsize,taboffs,tabtype,&newtype);
++  TEST_MPI("MPI_Type_create_struct");
+   CALL_MPI MPI_Type_commit(&newtype);
+   TEST_MPI("MPI_Type_commit");
+ #  endif /* NO_MPI_TYPE */
+@@ -974,8 +974,8 @@
+ 
+   tabtype[0] = COMM_INT;
+ 
+-  CALL_MPI MPI_Address(infotab,&(taboffs[0]));
+-  TEST_MPI("MPI_Address");
++  CALL_MPI MPI_Get_address(infotab,&(taboffs[0]));
++  TEST_MPI("MPI_Get_address");
+ 
+   /* If schur, send empty data */
+   if ((sopalin_data->sopar->iparm[IPARM_SCHUR] == API_YES &&
+@@ -988,12 +988,12 @@
+     for (iter=1; iter<UPDOWN_SM2XNBR+1; iter++) {
+       tabsize[iter] = size;
+       tabtype[iter] = COMM_FLOAT;
+-      CALL_MPI MPI_Address(gb+((iter-1)*UPDOWN_SM2XSZE),&(taboffs[iter]));
+-      TEST_MPI("MPI_Address");
++      CALL_MPI MPI_Get_address(gb+((iter-1)*UPDOWN_SM2XSZE),&(taboffs[iter]));
++      TEST_MPI("MPI_Get_address");
+     }
+   }
+-  CALL_MPI MPI_Type_struct(UPDOWN_SM2XNBR+1,tabsize,taboffs,tabtype,&newtype);
+-  TEST_MPI("MPI_Type_struct");
++  CALL_MPI MPI_Type_create_struct(UPDOWN_SM2XNBR+1,tabsize,taboffs,tabtype,&newtype);
++  TEST_MPI("MPI_Type_create_struct");
+   CALL_MPI MPI_Type_commit(&newtype);
+   TEST_MPI("MPI_Type_commit");
+ 
diff --git a/sci-libs/pastix/pastix-5.2.3.ebuild b/sci-libs/pastix/pastix-5.2.3.ebuild
index 2b9322818a96..3d6c4757eed5 100644
--- a/sci-libs/pastix/pastix-5.2.3.ebuild
+++ b/sci-libs/pastix/pastix-5.2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,6 +18,7 @@ PID=218
 DESCRIPTION="Parallel solver for very large sparse linear systems"
 HOMEPAGE="https://pastix.gforge.inria.fr"
 SRC_URI="https://gforge.inria.fr/frs/download.php/latestfile/${PID}/${PN}_${PV}.tar.bz2"
+S="${WORKDIR}/${PN}_${PV}/src"
 
 LICENSE="CeCILL-C"
 SLOT="0"
@@ -33,7 +34,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
-S="${WORKDIR}/${PN}_${PV}/src"
+PATCHES=( "${FILESDIR}"/${P}-MPI-3.0.patch )
 
 src_prepare() {
 	default
diff --git a/sci-libs/proj/Manifest b/sci-libs/proj/Manifest
index aa05b893d787..1de5c19345a8 100644
--- a/sci-libs/proj/Manifest
+++ b/sci-libs/proj/Manifest
@@ -1,4 +1,3 @@
-AUX proj-8.1.0-test_factory-include.patch 844 BLAKE2B 612046cbc170c16362ffc4a43f5a3f6ade303e5ce8ce2a45494dc3280fcfee63120f110f30939b0408dfb963e79f1b6f4b6438bdd6d2708cbc6ab7ebd4b2b4d6 SHA512 b7095a0b892e6b31b456f48d640cbd4abd4537676f4ceed1491888a65443a58e3747943e9e8f1889ef6138b52e1273f9896ec71d5f16b84582dd095d1b8d2ef8
 DIST proj-7.2.1.tar.gz 5714666 BLAKE2B 9379ef758b1221b9487f162a27e7afa737e668ad7a13fc7adbd8e1e2c1c4699263d5d3105d03781b423f284205de3c79fc68850b9fba6aa05f1dc553b77b0842 SHA512 59b9b31b0183e620a2f4a25a08620c170773fe4f99e8eca59e9ed6815f43bb379ea21ef71e8f759dbd747855b982657d7503bac3acc542218e0d862105f25324
 DIST proj-8.2.0.tar.gz 5880399 BLAKE2B be8be2f1e6b661600479aefa1cd49dfea70085abd37f66a6768cb6cca31c42fcfa43b6d10aca7ac10a5096aba8b8cc1a2a6c744ae767225c38e31b4c69cf7d40 SHA512 e7bcd959deeeb9130325a7bf63a8a0b8de2c55ba573065ca5ea32cf83c2c2643648760cfbe1c3bd1d2a2e74f65ceae4d9d525a537678386260fc2862b3927f5e
 DIST proj-8.2.1.tar.gz 5882136 BLAKE2B c4d80ee1bb1287e2539c9b5c5a5c6305fe8d2fc83526fd29507802b94351f51b016184c07a5e8c1bbf820252a6dfa5b4d55376e5d5566774e3e5e3154857dfa1 SHA512 c6164771fd492be5aa91d8dd2f2794a19b47431078f148356aa70dee96a4589ec5decbab9d8dd756a7bcb322ad94935750c22e0e7fb16e21c8f59ca474e7137e
diff --git a/sci-libs/proj/files/proj-8.1.0-test_factory-include.patch b/sci-libs/proj/files/proj-8.1.0-test_factory-include.patch
deleted file mode 100644
index c88fe83cb509..000000000000
--- a/sci-libs/proj/files/proj-8.1.0-test_factory-include.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-https://patch-diff.githubusercontent.com/raw/OSGeo/PROJ/pull/2760.patch
-
-From fc983b6e3343ba4d52fd0a889bb6bbf6f143f417 Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Thu, 1 Jul 2021 21:24:26 +0200
-Subject: [PATCH] =?UTF-8?q?test=5Ffactory.cpp:=20fix=20build,=20in=20parti?=
- =?UTF-8?q?cular=20on=20Alpine=20Edge=20(fixes=C2=A0#2759)?=
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
----
- test/unit/test_factory.cpp | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/test/unit/test_factory.cpp b/test/unit/test_factory.cpp
-index 985499150e..a60296d10a 100644
---- a/test/unit/test_factory.cpp
-+++ b/test/unit/test_factory.cpp
-@@ -39,6 +39,8 @@
- #include "proj/metadata.hpp"
- #include "proj/util.hpp"
- 
-+#include <algorithm>
-+
- #include <sqlite3.h>
- 
- #ifdef _MSC_VER
-
diff --git a/sci-libs/rocSOLVER/Manifest b/sci-libs/rocSOLVER/Manifest
new file mode 100644
index 000000000000..d73f88e8e7ad
--- /dev/null
+++ b/sci-libs/rocSOLVER/Manifest
@@ -0,0 +1,5 @@
+AUX rocSOLVER-4.2.0-add-stdint-header.patch 475 BLAKE2B 268a1813d4e26dbaaa2360d0a187ce2a1448da075ae5f98a4a829c979411ab7e0c06f150ddcb445c9b295268a1e9f1770adbe7e68a1c3f84edde3c3477a57610 SHA512 ede56f9579e655ddd098ca9006612537f8ed61dc585274afe6b2b0bdee875431b62e0c6da6bc01e2cabeeb5244a91bb1e00b442bb549c075a286eefd8d9edc09
+AUX rocSOLVER-4.3.0-link-blas.patch 604 BLAKE2B 863c1807d281e219b429a58c9e9e582a346e72be6004fb3f5a818479ae02b4efd896873f7c689084eefc50c331d8734c5dbf2dcb9e9756a54ce092e5ace22da5 SHA512 413692c2a7e40cb3bb169eef078fc4caa0ebaba760f535fb27afafcc49713fae26c9ca5c82793c54d4e07ccafe43a0d7d65b7e76d0207bdd20a5581bd71216d9
+DIST rocSOLVER-4.3.0.tar.gz 454249 BLAKE2B 727ae416d85c5a19983257d2a0b01836013c1d69cddf3334b2c1b808b96b401db938b46b7ecf1e7faf26ff555374d1d3abed74abbe7be47110a36b44019469ee SHA512 2910e1cfad4d17a2877e2ae572d80179b84903c632652571c01bd12856c92c22e073ea1005ed9aac04244b4c502a7e0c18d96445e57658ae8eb5b320bada549b
+EBUILD rocSOLVER-4.3.0.ebuild 1932 BLAKE2B fd43a3ab1cfb130e3c0374c84a73bf3ebfa5cc15a9c71e7bc9bdd4d1d8bc637e73441a33d14a9116177c44750a92e4edb9242434194cc7a4532cd05d498f8891 SHA512 11aa4a4584cf1eb16951b8b2ffb645db7f12bf0bced58a0ce80543fb094a7a5e0feb2c486125f6b9e835e50c5318802c9cde3e2e3ee84a8ee60ead315543f181
+MISC metadata.xml 662 BLAKE2B 6dc116ac630fbd30c5f6c18d716bcd12bc994bfa0b2aea4eacf65e31507c24bb1eeed55942ee8e0b5bed8e361d28950d433c13136771673308dbf96906e270c9 SHA512 cc5cc6401303169dd423234615b748b38a58191b058befe0f40e8b8996fe50b3554b99a14f2f63c3596227aab43558f23c64ddce88172157366cc78d4aeefb56
diff --git a/sci-libs/rocSOLVER/files/rocSOLVER-4.2.0-add-stdint-header.patch b/sci-libs/rocSOLVER/files/rocSOLVER-4.2.0-add-stdint-header.patch
new file mode 100644
index 000000000000..4afff8f467ea
--- /dev/null
+++ b/sci-libs/rocSOLVER/files/rocSOLVER-4.2.0-add-stdint-header.patch
@@ -0,0 +1,12 @@
+fix compilation error rocsolver-extra-types.h:11:9: error: unknown type name 'uint32_t'
+--- a/library/include/rocsolver-extra-types.h
++++ b/library/include/rocsolver-extra-types.h
+@@ -5,6 +5,8 @@
+ #ifndef ROCSOLVER_EXTRAS_H_
+ #define ROCSOLVER_EXTRAS_H_
+ 
++#include "stdint.h"
++
+ /*! \brief Used to specify the logging layer mode using a bitwise combination
+  *of rocblas_layer_mode values.
+  ********************************************************************************/
diff --git a/sci-libs/rocSOLVER/files/rocSOLVER-4.3.0-link-blas.patch b/sci-libs/rocSOLVER/files/rocSOLVER-4.3.0-link-blas.patch
new file mode 100644
index 000000000000..407582831142
--- /dev/null
+++ b/sci-libs/rocSOLVER/files/rocSOLVER-4.3.0-link-blas.patch
@@ -0,0 +1,21 @@
+Should link blas otherwise ld return error adding symbols: DSO missing from command line
+--- orig/clients/benchmarks/CMakeLists.txt
++++ rocSOLVER-rocm-4.3.0/clients/benchmarks/CMakeLists.txt
+@@ -17,6 +17,7 @@ target_include_directories( rocsolver-be
+     )
+ 
+ target_link_libraries( rocsolver-bench PRIVATE
++  blas
+   cblas
+   lapack
+   Threads::Threads
+--- orig/clients/gtest/CMakeLists.txt
++++ rocSOLVER-rocm-4.3.0/clients/gtest/CMakeLists.txt
+@@ -87,6 +87,7 @@ target_include_directories( rocsolver-te
+     )
+ 
+ target_link_libraries( rocsolver-test PRIVATE
++  blas
+   cblas
+   lapack
+   GTest::GTest
diff --git a/sci-libs/rocSOLVER/metadata.xml b/sci-libs/rocSOLVER/metadata.xml
new file mode 100644
index 000000000000..344dd1337031
--- /dev/null
+++ b/sci-libs/rocSOLVER/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+  </maintainer>
+  <maintainer type="person">
+    <email>gentoo@holzke.net</email>
+    <name>Wilfried Holzke</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>xgreenlandforwyy@gmail.com</email>
+    <name>Yiyang Wu</name>
+  </maintainer>
+    <use>
+        <flag name="test">Perform rocsolver-test to compare the result between rocSOLVER and system LAPACK.</flag>
+        <flag name="benchmark">Build and install rocsolver-bench.</flag>
+    </use>
+</pkgmetadata>
diff --git a/sci-libs/rocSOLVER/rocSOLVER-4.3.0.ebuild b/sci-libs/rocSOLVER/rocSOLVER-4.3.0.ebuild
new file mode 100644
index 000000000000..c017b7ad31a0
--- /dev/null
+++ b/sci-libs/rocSOLVER/rocSOLVER-4.3.0.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Implementation of a subset of LAPACK functionality on the ROCm platform"
+HOMEPAGE="https://github.com/ROCmSoftwarePlatform/rocSOLVER"
+SRC_URI="https://github.com/ROCmSoftwarePlatform/rocSOLVER/archive/rocm-${PV}.tar.gz -> rocSOLVER-${PV}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64"
+SLOT="0/$(ver_cut 1-2)"
+
+IUSE="test benchmark"
+
+RDEPEND="dev-util/hip:${SLOT}
+	sci-libs/rocBLAS:${SLOT}
+	benchmark? ( virtual/blas )"
+DEPEND="${RDEPEND}"
+BDEPEND="test? ( dev-cpp/gtest
+	virtual/blas )"
+
+PATCHES=(
+	"${FILESDIR}/rocSOLVER-4.2.0-add-stdint-header.patch"
+	"${FILESDIR}/rocSOLVER-4.3.0-link-blas.patch"
+)
+
+RESTRICT="!test? ( test )"
+
+S=${WORKDIR}/${PN}-rocm-${PV}
+
+src_prepare() {
+	sed -e "s: PREFIX rocsolver:# PREFIX rocsolver:" -i library/src/CMakeLists.txt
+	sed -e "s:\$<INSTALL_INTERFACE\:include>:\$<INSTALL_INTERFACE\:include/rocsolver>:" -i library/src/CMakeLists.txt
+	sed -e "s:rocm_install_symlink_subdir( rocsolver ):#rocm_install_symlink_subdir( rocsolver ):" -i library/src/CMakeLists.txt
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	# Grant access to the device
+	addwrite /dev/kfd
+	addpredict /dev/dri/
+
+	local mycmakeargs=(
+		-Wno-dev
+		-DCMAKE_SKIP_RPATH=ON
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/"
+		-DCMAKE_INSTALL_INCLUDEDIR="${EPREFIX}/usr/include/rocsolver"
+		-DBUILD_CLIENTS_SAMPLES=NO
+		-DBUILD_CLIENTS_TESTS=$(usex test ON OFF)
+		-DBUILD_CLIENTS_BENCHMARKS=$(usex benchmark ON OFF)
+		${AMDGPU_TARGETS+-DAMDGPU_TARGETS="${AMDGPU_TARGETS}"}
+	)
+
+	CXX="hipcc" cmake_src_configure
+}
+
+src_test() {
+	addwrite /dev/kfd
+	addwrite /dev/dri/
+	cd "${BUILD_DIR}/clients/staging" || die
+	LD_LIBRARY_PATH="${BUILD_DIR}/library/src" ./rocsolver-test || die
+}
+
+src_install() {
+	cmake_src_install
+
+	if use benchmark; then
+		cd "${BUILD_DIR}" || die
+		dobin clients/staging/rocsolver-bench
+	fi
+}
diff --git a/sci-libs/rocThrust/Manifest b/sci-libs/rocThrust/Manifest
index 04f35fcdfd10..135c25d12f73 100644
--- a/sci-libs/rocThrust/Manifest
+++ b/sci-libs/rocThrust/Manifest
@@ -3,5 +3,6 @@ AUX rocThrust-4.3.0-deprecate-hcc_detail.patch 492 BLAKE2B cde3fb2210e482f6b76e2
 DIST rocThrust-4.0.0.tar.gz 1166346 BLAKE2B 02c89e0c4ab2c888a20b7c956a73012157f2735e6ec76369a1f75fbc17bb3f995d1914106ec58562f28243fbe5f019ac230ac3313b6aacb4d8b868f3ac1f091e SHA512 476aa5706487c5801cc91908806a1a1fcb550171f63e0b2debd9b59b18c7435c484578ec456ccfabc140dd7bca7d9bb432a7ba223946b1fca22e72e7d053af2d
 DIST rocThrust-4.3.0.tar.gz 1156832 BLAKE2B a462cfaa31883253fabba584ca77622cc5a7234bd9979472a84ec77b91c60f48f1064149b86d624aaedd70262fb65fb6aadb03cc6e00939d4eed6cd11bfc0090 SHA512 8c6aa3aefd59c87cc8278930bf90021867f519c356c86a3c3ebfcdf90887b8631250b6a9a8156f77c0cbf7ddbad7881e5e1b802f1cd1305cc3a2e7d95ef4e6f3
 EBUILD rocThrust-4.0.0-r1.ebuild 1244 BLAKE2B 4f8019ccf296a915a305a405d3e80d2de348ac7717782671b76306882872a6e356bdbdb63316094ce8ccc8410fced42db56423b4d96f8d690ec6838d3721612e SHA512 40671932493ab5a2a2597a4181d03c666a9272ed881d053ecc8d8285aa8a5b68b9527b4fa0e29b6acff3f31fdfafd9cc060b9e098b16a12a7370eaa37542f5de
+EBUILD rocThrust-4.3.0-r1.ebuild 2062 BLAKE2B 15a1efc0555989c16108f62d6c6c689fac172101565e771f32c36c5765a10105a7fd78cb90098e3746928b35271e3652b1a6880f451f087dc731950e237de40d SHA512 476c3cedfb959ff5764aa2893810ed9a09db58c172cc36ae91f215a35efb13354f3a363be6bd2ac1d5987739028930ce9d4ba73e36699973b7c413215462f713
 EBUILD rocThrust-4.3.0.ebuild 2082 BLAKE2B 414354d8137a09e987b908bc901d404c0025cdd77df7753a602a04b14391637f9c04cb831f0819f61b53b01e12ad01e883547fb7135034dee57a4cd22980b444 SHA512 77fbb475bceb103df10f6dfe50fc74631337fb6e72473edb7a3db03f98ce5f1f66458a501cde22f6c79232107b810a0496323166fd11814e4ee4b694f8206a4d
 MISC metadata.xml 656 BLAKE2B cdcee7af9e0c2f8e0553cc0d41ea208dbaa27aae0847f90b048e4c8791a9be511a84c7fb5ba8dc4c0409266d5a8a855fd4ebf578ad55c5882a000fbb4c5b05c0 SHA512 adefa0bbe1487a7c29a3b175c8d27e694c5464b0f7a3f20afcfd07952ef95cb54a789f7ae174053493d893338f52cf175f4b1939b998e850b62a7fd435dc592a
diff --git a/sci-libs/rocThrust/rocThrust-4.3.0-r1.ebuild b/sci-libs/rocThrust/rocThrust-4.3.0-r1.ebuild
new file mode 100644
index 000000000000..fc6045bf31f2
--- /dev/null
+++ b/sci-libs/rocThrust/rocThrust-4.3.0-r1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="HIP back-end for the parallel algorithm library Thrust"
+HOMEPAGE="https://github.com/ROCmSoftwarePlatform/rocThrust"
+SRC_URI="https://github.com/ROCmSoftwarePlatform/rocThrust/archive/rocm-${PV}.tar.gz -> rocThrust-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64"
+SLOT="0/$(ver_cut 1-2)"
+IUSE="benchmark test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-util/hip:${SLOT}
+	sci-libs/rocPRIM:${SLOT}"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/rocThrust-rocm-${PV}"
+
+PATCHES=( "${FILESDIR}/${PN}-4.0-operator_new.patch"
+	"${FILESDIR}/${P}-deprecate-hcc_detail.patch" )
+
+src_prepare() {
+	sed -e "/PREFIX rocthrust/d" \
+		-e "/DESTINATION/s:rocthrust/include/thrust:include/thrust:" \
+		-e "/rocm_install_symlink_subdir(rocthrust)/d" \
+		-e "/<INSTALL_INTERFACE/s:rocthrust/include/:include/:" -i thrust/CMakeLists.txt || die
+
+	sed -e "s:\${CMAKE_INSTALL_INCLUDEDIR}:&/rocthrust:" \
+		-e "s:\${ROCM_INSTALL_LIBDIR}:\${CMAKE_INSTALL_LIBDIR}:" -i cmake/ROCMExportTargetsHeaderOnly.cmake || die
+
+	# disable downloading googletest and googlebenchmark
+	sed  -r -e '/Downloading/{:a;N;/\n *\)$/!ba; d}' -i cmake/Dependencies.cmake || die
+
+	# remove GIT dependency
+	sed  -r -e '/find_package\(Git/{:a;N;/\nendif/!ba; d}' -i cmake/Dependencies.cmake || die
+
+	eapply_user
+	cmake_src_prepare
+}
+
+src_configure() {
+	# Grant access to the device
+	addwrite /dev/kfd
+	addpredict /dev/dri/
+
+	# Compiler to use
+	export CXX=hipcc
+
+	local mycmakeargs=(
+		-DBUILD_TEST=$(usex test ON OFF)
+		-DBUILD_BENCHMARKS=$(usex benchmark ON OFF)
+		${AMDGPU_TARGETS+-DAMDGPU_TARGETS="${AMDGPU_TARGETS}"}
+		-D__skip_rocmclang="ON" ## fix cmake-3.21 configuration issue caused by officialy support programming language "HIP"
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	# Grant access to the device
+	addwrite /dev/kfd
+	addwrite /dev/dri/
+	cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	use benchmark && dobin "${BUILD_DIR}"/benchmarks/benchmark_thrust_bench
+}
diff --git a/sci-libs/scotch/Manifest b/sci-libs/scotch/Manifest
index 8e66359d08ff..e991a15790f1 100644
--- a/sci-libs/scotch/Manifest
+++ b/sci-libs/scotch/Manifest
@@ -1,5 +1,3 @@
-AUX scotch-6.0.4-as-needed.patch 6168 BLAKE2B 5b008f9035379d91cd8ffde6d64a22b021fd5070a106592abefac78a0522282fbd0dd7f8b439b0452c0d15c57891c9d4eb4415120ea95788fe74e149e6069fc3 SHA512 cd58425866a1726f776318e3792e72d7250686f033ceeda57f0f007fdb4c5e1c2bc3c9346630e39f16023f2a3d70cd106b357c21e5406a1c44b49a316655d8dd
-AUX scotch-6.0.4-flex-2.6.3-fix.patch 1623 BLAKE2B 9d86299eb543147ce7e736779b05c3b8113c12b54fbaf46a2b99a6cef2b670fc1b448d059858f954f37acf72c7c268acf1793de89f193d02f8b61d3f5d4ca1e5 SHA512 1a2a5a363e1dd59e1cced76928da15132cd1c8af57d6d0ad0eec04e02d029c6ae275e202e8c87bc65ff0188f41e379865829b5b61e4f1e44a885d48c4462b09e
 DIST scotch-v6.1.0.tar.gz 6292006 BLAKE2B 5b76b01c0fa752468a36830a15c190cd78efc851c3b6831eb2d16b7cf34a71d55463b266ffdee4c6addd4e66ca7caf75e63825051e600ee8a32494e5033cabbd SHA512 e6d217a23e39635f8749811a3fc64c8da14d0396a71b4042a4f8f3ce32ff1f0b4ed033ebae90f3785443dae9b35ded68ea512ed1e3e7f9ea9a471a499ae26b89
 DIST scotch-v6.1.1.tar.gz 6363384 BLAKE2B 337c81608fd245dde5b19bb6c79924e0ee80181ce3c935ae37e6248be2511a2f4d70bdda5b9217e5e1ed79fc00269de15755c3b6829579aa190ca6da9c3c2dac SHA512 daa62463f25416764250fe0452ae84bc6a2e485ee62a387418b4686c2ab93a2ca2d5a12cba922857c99a1c9ec67fc82951b0f9563ab97f5f3a6b86bb9da22b0c
 DIST scotch-v6.1.2.tar.gz 6395320 BLAKE2B 07aa4f56c097cf364d7d63613f3c5d5d3f2a8419ce27da95a4a20d5ea48fcf2f036acaa62ab1f591b5d1dc672151562bc0721a66f203c60d5ee26a501cf90352 SHA512 dcf63c65bf8155590a70483f80ad21b4a303debf50d47a3c154983935dc056f3df93a61c3d88304f3d1a4517ab3a355e176d72b3835382cd65c1556fbbd21702
diff --git a/sci-libs/scotch/files/scotch-6.0.4-as-needed.patch b/sci-libs/scotch/files/scotch-6.0.4-as-needed.patch
deleted file mode 100644
index 449449bec073..000000000000
--- a/sci-libs/scotch/files/scotch-6.0.4-as-needed.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-diff -Nur scotch_6.0.4/src/check/Makefile scotch_6.0.4_patched/src/check/Makefile
---- scotch_6.0.4/src/check/Makefile	2015-03-01 03:18:02.000000000 -0700
-+++ scotch_6.0.4_patched/src/check/Makefile	2015-07-17 15:15:58.447398954 -0600
-@@ -53,7 +53,7 @@
- 				$(CC) $(CFLAGS) $(CLIBFLAGS) -I$(SCOTCHINCLUDEDIR) -c $(<) -o $(@)
- 
- %$(EXE)	:	%.c
--		 		$(CC) $(CFLAGS) -I$(SCOTCHINCLUDEDIR) -L$(SCOTCHLIBDIR) $(<) -o $(@) $(SCOTCHLIBS) $(LDFLAGS)
-+				$(CC) $(CFLAGS) $(LDFLAGS) -I$(SCOTCHINCLUDEDIR) -L$(SCOTCHLIBDIR) $(<) $(SCOTCHLIBS) $(LIBS) -o $(@)
- 
- ##
- ##  Project rules.
-diff -Nur scotch_6.0.4/src/esmumps/Makefile scotch_6.0.4_patched/src/esmumps/Makefile
---- scotch_6.0.4/src/esmumps/Makefile	2015-03-13 17:32:06.000000000 -0600
-+++ scotch_6.0.4_patched/src/esmumps/Makefile	2015-07-17 15:17:47.389600699 -0600
-@@ -44,7 +44,7 @@
- 				$(CC) $(CFLAGS) $(CLIBFLAGS) -I$(includedir) -c $(<) -o $(@)
- 
- %$(EXE)	:	%.c
--		 		$(CC) $(CFLAGS) -I$(includedir) $(<) -o $(@) -L$(libdir) $(LDFLAGS) -L. -l$(ESMUMPSLIB) -l$(SCOTCHLIB) -lscotch -l$(SCOTCHLIB)errexit -lm
-+				$(CC) $(CFLAGS) $(LDFLAGS) -I$(includedir) $(<) -L$(libdir) -L. -l$(ESMUMPSLIB) -l$(SCOTCHLIB) -lscotch -l$(SCOTCHLIB)errexit $(LIBS) -o $(@)
- 
- ##
- ##  Project rules.
-@@ -57,7 +57,7 @@
- 					libesmumps$(LIB)							\
- 					main_esmumps$(EXE)
- 
--ptscotch			:	clean
-+ptscotch			:	clean common.h
- 					$(MAKE) CFLAGS="$(CFLAGS) -DSCOTCH_PTSCOTCH" CC="$(CCP)" SCOTCHLIB=ptscotch ESMUMPSLIB=ptesmumps	\
- 					libesmumps$(LIB)											\
- 					main_esmumps$(EXE)
-@@ -160,6 +160,6 @@
- 					order.h					\
- 					symbol.h				\
- 					esmumps.h				\
--					lib$(ESMUMPSLIB)$(LIB)			\
-+					libesmumps$(LIB)              \
- 					$(libdir)/lib$(SCOTCHLIB)$(LIB)		\
- 					$(libdir)/lib$(SCOTCHLIB)errexit$(LIB)
-diff -Nur scotch_6.0.4/src/libscotch/Makefile scotch_6.0.4_patched/src/libscotch/Makefile
---- scotch_6.0.4/src/libscotch/Makefile	2014-09-23 13:28:28.000000000 -0600
-+++ scotch_6.0.4_patched/src/libscotch/Makefile	2015-07-17 15:19:17.320116484 -0600
-@@ -43,7 +43,7 @@
- 				$(CC) $(CFLAGS) $(CLIBFLAGS) -c $(<) -o $(@)
- 
- %$(EXE)	:	%.c
--		 		$(CC) $(CFLAGS) -DSCOTCH_VERSION=$(VERSION) -DSCOTCH_RELEASE=$(RELEASE) -DSCOTCH_PATCHLEVEL=$(PATCHLEVEL) $(<) -o $(@) $(LDFLAGS)
-+				$(CC) $(CFLAGS) $(LDFLAGS) -DSCOTCH_VERSION=$(VERSION) -DSCOTCH_RELEASE=$(RELEASE) -DSCOTCH_PATCHLEVEL=$(PATCHLEVEL) $(<) $(LIBS)  -o $(@)
- 
- ##
- ##  Project rules.
-@@ -2937,14 +2937,14 @@
- 					mapping.h				\
- 					order.h					\
- 					parser.h
--			 		$(CCD) $(CFLAGS) -DSCOTCH_VERSION=$(VERSION) -DSCOTCH_RELEASE=$(RELEASE) -DSCOTCH_PATCHLEVEL=$(PATCHLEVEL) $(<) -o $(@) $(LDFLAGS)
-+					$(CCD) $(CFLAGS) $(LDFLAGS) -DSCOTCH_VERSION=$(VERSION) -DSCOTCH_RELEASE=$(RELEASE) -DSCOTCH_PATCHLEVEL=$(PATCHLEVEL) $(<) $(LIBS) -o $(@)
- 
- ptdummysizes$(EXE)		:	dummysizes.c				\
- 					module.h				\
- 					common.h				\
- 					dgraph.h				\
- 					dorder.h
--			 		$(CCD) $(CFLAGS) -DSCOTCH_VERSION=$(VERSION) -DSCOTCH_RELEASE=$(RELEASE) -DSCOTCH_PATCHLEVEL=$(PATCHLEVEL) $(<) -o $(@) $(LDFLAGS)
-+					$(CCD) $(CFLAGS) $(LDFLAGS) -DSCOTCH_VERSION=$(VERSION) -DSCOTCH_RELEASE=$(RELEASE) -DSCOTCH_PATCHLEVEL=$(PATCHLEVEL) $(<) $(LIBS) -o $(@)
- 
- scotch.h			:	dummysizes$(EXE)			\
- 					library.h
-diff -Nur scotch_6.0.4/src/libscotchmetis/Makefile scotch_6.0.4_patched/src/libscotchmetis/Makefile
---- scotch_6.0.4/src/libscotchmetis/Makefile	2011-09-06 10:46:48.000000000 -0600
-+++ scotch_6.0.4_patched/src/libscotchmetis/Makefile	2015-07-17 15:19:42.648698497 -0600
-@@ -44,7 +44,7 @@
- 				$(CC) $(CFLAGS) $(CLIBFLAGS) -I$(includedir) -I../libscotch -c $(<) -o $(@)
- 
- %$(EXE)	:	%.c
--		 		$(CC) $(CFLAGS) -I$(includedir) -I../libscotch $(<) -o $(@) -L$(libdir) $(LDFLAGS)
-+				$(CC) $(CFLAGS) $(LDFLAGS) -I$(includedir) -I../libscotch $(<) -L$(libdir) -o $(@)
- 
- ##
- ##  Project rules.
-diff -Nur scotch_6.0.4/src/scotch/Makefile scotch_6.0.4_patched/src/scotch/Makefile
---- scotch_6.0.4/src/scotch/Makefile	2015-02-24 15:39:44.000000000 -0700
-+++ scotch_6.0.4_patched/src/scotch/Makefile	2015-07-17 15:22:25.275015105 -0600
-@@ -41,13 +41,13 @@
- include ../Makefile.inc
- 
- %$(EXE)	:	%$(OBJ)
--		 		$(CC) $(CFLAGS) -I$(includedir) -I../libscotch $(<) -o $(@) -L$(libdir) -l$(SCOTCHLIB) -lscotch -l$(SCOTCHLIB)errexit $(LDFLAGS)
-+				$(CC) $(CFLAGS) $(LDFLAGS) -I$(includedir) -I../libscotch $(<) -L$(libdir) -l$(SCOTCHLIB) -lscotch -l$(SCOTCHLIB)errexit $(LIBS) -o $(@)
- 
- %$(OBJ)	:	%.c
- 				$(CC) $(CFLAGS) -I$(includedir) -I../libscotch -c $(<) -o $(@)
- 
- %$(EXE)	:	%.c
--		 		$(CC) $(CFLAGS) -I$(includedir) -I../libscotch $(<) -o $(@) -L$(libdir) -l$(SCOTCHLIB) -lscotch -l$(SCOTCHLIB)errexit $(LDFLAGS)
-+				$(CC) $(CFLAGS) $(LDFLAGS) -I$(includedir) -I../libscotch $(<) -L$(libdir) -l$(SCOTCHLIB) -lscotch -l$(SCOTCHLIB)errexit $(LIBS) -o $(@)
- 
- ##
- ##  Project rules.
-@@ -209,7 +209,7 @@
- 					$(libdir)/libptscotch$(LIB)		\
- 					$(libdir)/libptscotcherrexit$(LIB)	\
- 					dgmap.h
--			 		$(CC) $(CFLAGS) -I$(includedir) -I../libscotch $(<) -DSCOTCH_COMPILE_PART -o $(@) -L$(libdir) -lptscotch -lscotch -lptscotcherrexit $(LDFLAGS)
-+					$(CC) $(CFLAGS) $(LDFLAGS) -I$(includedir) -I../libscotch $(<) -DSCOTCH_COMPILE_PART -L$(libdir) -lptscotch -lscotch -lptscotcherrexit $(LIBS) -o $(@)
- 
- dgscat$(EXE)			:	dgscat.c				\
- 					../libscotch/module.h			\
-@@ -321,7 +321,7 @@
- 					gout_o.c				\
- 					$(includedir)/scotch.h			\
- 					$(libdir)/libscotch$(LIB)
--					$(CC) $(CFLAGS) -I../libscotch -I$(includedir) gout_c.c gout_o.c -o $(@) -L$(libdir) -lscotch -lscotcherrexit $(LDFLAGS)
-+					$(CC) $(CFLAGS) $(LDFLAGS) -I../libscotch -I$(includedir) gout_c.c gout_o.c -L$(libdir) -lscotch -lscotcherrexit $(LIBS) -o $(@)
- 
- gpart$(EXE)			:	gmap.c					\
- 					../libscotch/module.h			\
-@@ -330,7 +330,7 @@
- 					$(libdir)/libscotch$(LIB)		\
- 					$(libdir)/libscotcherrexit$(LIB)	\
- 					gmap.h
--			 		$(CC) $(CFLAGS) -I$(includedir) -I../libscotch $(<) -DSCOTCH_COMPILE_PART -o $(@) -L$(libdir) -lscotch -lscotcherrexit $(LDFLAGS)
-+					$(CC) $(CFLAGS) $(LDFLAGS) -I$(includedir) -I../libscotch $(<) -DSCOTCH_COMPILE_PART -L$(libdir) -lscotch -lscotcherrexit $(LIBS) -o $(@)
- 
- gscat$(EXE)			:	gscat.c					\
- 					../libscotch/module.h			\
diff --git a/sci-libs/scotch/files/scotch-6.0.4-flex-2.6.3-fix.patch b/sci-libs/scotch/files/scotch-6.0.4-flex-2.6.3-fix.patch
deleted file mode 100644
index c1301f57076a..000000000000
--- a/sci-libs/scotch/files/scotch-6.0.4-flex-2.6.3-fix.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- scotch_6.0.4/src/libscotch/parser_ll.l.old	2017-01-02 08:42:41.216249106 -0800
-+++ scotch-6.0.4-r1/work/scotch_6.0.4/src/libscotch/parser_ll.l	2017-01-02 09:50:14.572579444 -0800
-@@ -84,20 +84,29 @@
- #endif /* X_OSDOS */
- 
- #ifdef FLEX_SCANNER
- #define YY_ALWAYS_INTERACTIVE       1             /* Set the parser as interactive and read one char at a time */
- #define YY_INPUT(buf,result,max_size) { int c = stratParserInput (); result = (c == 0) ? YY_NULL : ((buf)[0] = c, 1); }
-+
-+# if YY_FLEX_MAJOR_VERSION > 2 ||                                                               \
-+    YY_FLEX_MAJOR_VERSION == 2 && YY_FLEX_MINOR_VERSION > 6 ||                                  \
-+    YY_FLEX_MAJOR_VERSION == 2 && YY_FLEX_MINOR_VERSION == 6 && YY_FLEX_SUBMINOR_VERSION >= 3
-+ int yywrap() { return 1; }
-+# else
-+#  define yywrap()                  (1)           /* Always return end-of-file on end-of-string  */
-+# endif
-+
- #else /* FLEX_SCANNER */
- #undef  getc                                      /* Redirect I/O functions */
- #define getc                        yygetc
- #undef  yygetc
- #define yygetc(stream)              stratParserInput ()
-+#define yywrap()                    (1)           /* Always return end-of-file on end-of-string  */
- #endif /* FLEX_SCANNER */
- 
- #define YY_NO_UNPUT                               /* No prototype for yyunput as not defined     */
- #define YY_SKIP_YYWRAP                            /* No prototype for yywrap as defined as macro */
--#define yywrap()                    (1)           /* Always return end-of-file on end-of-string  */
- 
- /*
- **  The static variables.
- */
- 
diff --git a/sci-libs/silo/Manifest b/sci-libs/silo/Manifest
index d1ce7850acbe..df290b0febf7 100644
--- a/sci-libs/silo/Manifest
+++ b/sci-libs/silo/Manifest
@@ -1,8 +1,8 @@
-AUX silo-4.11-autoreconf.patch 1692 BLAKE2B 23d9ef8806f655874bedb3a0bf3d839e61e4da06a95457bdacb6ddf54da46ceeb563b8bb623b8c6edd9c13eb110ffab07c146e1e04f4ac537a3eac0952942e44 SHA512 0c1eb37267c116180ce6f54dfdb998eceaf865bd4a544da01e29a56cd1cf0846af14518780888c029ea5fc37b02e07b146ec7dcb8bea759869aa1235fbd79a22
 AUX silo-4.11-hdf5.patch 1927 BLAKE2B 7c712cf43f4f8b1b4ac502afbde68de105e5cba34767f9faa523d9fdfa185b8eb6675cfb5c678d0dd9c27a12a5693b9ca6c2d3ee6d3af146db3d2039479ffe8b SHA512 7c34856634daade9976a71cb70286cc735a29a6082f67efcbf61ffcab4f8620a447daace8ae49eb7b6100b8d8c7ed482a3aafa4269a29b70c8da8829815bcbb4
 AUX silo-4.11-test-disable-largefile.patch 913 BLAKE2B b8c244bbe4df98e8a90af306894290c3103d9763610bf720c77fd22ff8ca9f1cdfc8d69176a9d330552e690ba38af72cd32f46bf4047351704d57644a24e3a03 SHA512 320cc6a110a0c1a641aa053ef642cfacafa0e22e76373d10bc214f7cc716619a2229062ee5dffd92ebb16bd02b3c0d5a6137380be5e88bcfd2fef45284436455
 AUX silo-4.11-tests.patch 909 BLAKE2B 0472a4ea51ca60285415b4da0cdfb5cd0cc8b75289abdf6040640d39dd5f528797ec8a36cc1681785c0945f379cfe2ce3ef0d1b9998b36cf38f797f7c0cd173a SHA512 d29efc8b0edfb996e3a1d7a7dbab6f15a60d3481135625852084d30c2f89f5a9a7bcd937619f01c31a301bca3250e4632e87ea5056f54be5613ad6ead008c8eb
 AUX silo-4.11-testsuite-python-write.patch 827 BLAKE2B a2cfc512ff5aaffec6af29a5de16c9c827d7488dcaae8e808ead2a8d9d6dc5f0fddea821d9b6cd170d2657d98a13d9b79faa8bad0fbb11150099a1b7b489beb3 SHA512 6ff64305f7c72be9683494c8095fe192273d06bafe027d18ca0a71fcd1579af71100e31381b65d2f9d6b805bcb95a6a9b85aeec5e99bc4d2dac93b828977f98e
+AUX silo-4.11-widgets.patch 390 BLAKE2B 72a6e08cbbcfb17a11c3d56a59aaa5c5931f888eda64fc93b6e6ec07a78411bf3a3c51b848dd452da8cdb090cb3722d8e36806d5f350a35650be3487319bb3d9 SHA512 8485f49e84530f0212c680c370c562a2f77be16d0abcd7571ee8d0216da8992060c0fe7d90c819f6ac6560b655255e5d3f7ce11d9f4b56e2cf6aaceea55e0177
 DIST silo-4.11-bsd.tgz 13298515 BLAKE2B fcf2e7912381e57d1a64644d3cee4dea50302c12704eaf0ee9e2569b7bc29b1d5c9df66878744ffc2cc04e16834fdf1cd4d677983af36005e4ecf0918c6283d5 SHA512 f642dd21dacffa147aea54d6f8669c704772d5640d6eb7eeff1d7e5e5d37ddbde250d78bad30e9478dcfec63a86863243d7a56cd9b692eaefdd7a89b34df35d0
-EBUILD silo-4.11.ebuild 1098 BLAKE2B 817d224691f2087511604b2d061a72a684ca09baca3d5b463fb9e275267484798eb0d47a989f8502d431111a1834b41b342d98350d4587557f13693b17d44ed7 SHA512 8da126e5136ff7dc4587ab2f815d3eb046ca69882023595a7d9407e602c4d90538146b542a886dfe77138cc3e5a9209b26cce35bdec2087811db8bd17eccb9be
+EBUILD silo-4.11-r1.ebuild 1401 BLAKE2B f26c719aaef1be343cb4acd1683b01dbd8a015367ba68925363125a784c6025be8a8e6fc4585ad8c9b614b4f3d6b7122f738abea32e25f18d2448fa5958ffa54 SHA512 e34ed55bc7bf679b158a21677ae30225832b269d99fca8763310286b69201952d9ea1fb9b7d12805d29af195df092916b7b5aa2a1bc7168d811da0591094c53d
 MISC metadata.xml 729 BLAKE2B 0bab9cb0101f967456a70472cb819b0eb43eb8444ae5260d33c3dc3f8f49480594609698110155dc6a12ef93ff6acf539b02f2cbfebc496fa0b641ed36738715 SHA512 3131fb65d7c9048d5a3b49ca9ce1ce790ca4b34c588b8bd72fc48a9facc995b1da1a8ac7ae4601db1c6cd14313f6d32084eaf101e95f2279df8e3316c3467514
diff --git a/sci-libs/silo/files/silo-4.11-autoreconf.patch b/sci-libs/silo/files/silo-4.11-autoreconf.patch
deleted file mode 100644
index 371b346e921c..000000000000
--- a/sci-libs/silo/files/silo-4.11-autoreconf.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Author: Alastair McKinstry <mckinstry@debian.org>
-Description: Fixes needed for autoreconf to work on Debian
- When autoreconf is run, VL_LIB_READLINE is lost from aclocal, so included in config/
- Also include AX_CHECK_COMPLER_FLAG() which is not in autoconf (just autoconf-archive)
- AX_CHECK_COMPILER_FLAGS() is obsolete
-Last-Updated: 2021-01-14
-Forwarded: no
-Link: https://sources.debian.org/patches/silo-llnl/4.11-2/autoreconf.patch/
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -195,6 +195,8 @@
- dnl This allows multiple src-dir builds within one host.
- AC_PREFIX_DEFAULT("SILO_TOP_SRC_DIR")
- 
-+AC_PROG_F77
-+
- dnl
- dnl Handle the python module right away to determine if we need shared libs.
- dnl Ordinarily, we default to static libs
-@@ -618,10 +620,10 @@
- # it is an argument to the -D argument. So, I think this is
- # just totally bogus!
- # Default to large file support
--AX_CHECK_COMPILER_FLAGS("-D_LARGEFILE_SOURCE",CFLAGS="$CFLAGS -D_LARGEFILE_SOURCE";)
--AX_CHECK_COMPILER_FLAGS("-D_LARGEFILE64_SOURCE",CFLAGS="$CFLAGS -D_LARGEFILE64_SOURCE";)
--AX_CHECK_COMPILER_FLAGS("-D_FILE_OFFSET_BITS=64",CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64";)
--AX_CHECK_COMPILER_FLAGS("-Wdeclaration-after-statement",CFLAGS="$CFLAGS -Wdeclaration-after-statement";)
-+AX_CHECK_COMPILE_FLAG("-D_LARGEFILE_SOURCE",CFLAGS="$CFLAGS -D_LARGEFILE_SOURCE";)
-+AX_CHECK_COMPILE_FLAG("-D_LARGEFILE64_SOURCE",CFLAGS="$CFLAGS -D_LARGEFILE64_SOURCE";)
-+AX_CHECK_COMPILE_FLAG("-D_FILE_OFFSET_BITS=64",CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64";)
-+AX_CHECK_COMPILE_FLAG("-Wdeclaration-after-statement",CFLAGS="$CFLAGS -Wdeclaration-after-statement";)
- 
- #
- # Note: regardless of what the stuff above regarding large file support
diff --git a/sci-libs/silo/files/silo-4.11-widgets.patch b/sci-libs/silo/files/silo-4.11-widgets.patch
new file mode 100644
index 000000000000..46ef1834ca22
--- /dev/null
+++ b/sci-libs/silo/files/silo-4.11-widgets.patch
@@ -0,0 +1,11 @@
+On a minimal QT installation, widgets may not necessarily be
+added and it needs to be explicitely done. Modifying ./configure
+directly given tarball lacks some files to run eautoreconf.
+
+https://bugs.gentoo.org/831361
+--- a/configure
++++ b/configure
+@@ -25748,2 +25748,3 @@
+ qtHaveModule(testlib):           QT += testlib
++qtHaveModule(widgets):           QT += widgets
+ percent.target = %
diff --git a/sci-libs/silo/silo-4.11.ebuild b/sci-libs/silo/silo-4.11-r1.ebuild
index e7a7f142d2aa..3372e92a569c 100644
--- a/sci-libs/silo/silo-4.11.ebuild
+++ b/sci-libs/silo/silo-4.11-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit fortran-2
+inherit flag-o-matic fortran-2
 
 DESCRIPTION="A mesh and field I/O library and scientific database"
 HOMEPAGE="https://wci.llnl.gov/simulation/computer-codes/silo"
@@ -14,26 +14,31 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="browser +hdf5 +silex"
-# Waiting for fix/answer upstream
-# See https://github.com/LLNL/Silo/issues/234
-RESTRICT="test"
 
+# see bugs 656432 and 741741
 RDEPEND="
+	dev-qt/qtcore:5
 	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	net-dialup/lrzsz
 	virtual/szip
 	hdf5? ( sci-libs/hdf5 )
 "
 DEPEND="${RDEPEND}"
 
 PATCHES=(
-	"${FILESDIR}"/${P}-autoreconf.patch
 	"${FILESDIR}"/${P}-hdf5.patch
 	"${FILESDIR}"/${P}-test-disable-largefile.patch
 	"${FILESDIR}"/${P}-tests.patch
 	"${FILESDIR}"/${P}-testsuite-python-write.patch
+	"${FILESDIR}"/${P}-widgets.patch
 )
 
 src_configure() {
+	# add fflags for fixing test bug on matf77.f
+	# see https://github.com/LLNL/Silo/issues/234
+	append-fflags $(test-flags-F77 -fallow-argument-mismatch)
+
 	econf \
 		--enable-install-lite-headers \
 		--enable-shared \
@@ -42,6 +47,8 @@ src_configure() {
 		$(use_with hdf5 hdf5 "${EPREFIX}"/usr/include,"${EPREFIX}"/usr/$(get_libdir) )
 }
 
-# src_test() {
-#	emake -C tests check
-# }
+src_test() {
+	# see https://github.com/LLNL/Silo/issues/236
+	# some tests are skipped by default so we are gonna drop them directly
+	emake ATARGS="1-34 36-44 50-51 66-76 78-81" -C tests check
+}
diff --git a/sci-libs/stellarsolver/Manifest b/sci-libs/stellarsolver/Manifest
index b82bd21b3d7a..f42b5aac6b70 100644
--- a/sci-libs/stellarsolver/Manifest
+++ b/sci-libs/stellarsolver/Manifest
@@ -1,3 +1,5 @@
 DIST stellarsolver-1.8.tar.gz 9117094 BLAKE2B fbfb08e1225c4285b5ce6f88372c1076fcfa622f63b093ffb0261e81c14f6901788b5bc6d6246008024df3a5ad7a96c07908633fa42453df5f57eeae4b1ada8d SHA512 08aa0647507874c9dfe032c10f7e583a54ca18302bc92731147875100c3f0903e03083ee71af851b2497898211ff8903477dfb56e61360a792a388d14d226db1
+DIST stellarsolver-1.9.tar.gz 9117560 BLAKE2B dd458399bd53a6e9de50293ebe15538275fb494d8ef63699eb1234aaee5234fdbb81fe23a28cc1d264490ea8849569293342125461d9e638111c9acb9756fbdf SHA512 a618e551ec28bd8439a495ca6f2a69b857852f0129c8e7d692315bd124b7c7a5130763775264b3f6a7394b3d0480d4f95c1605fb02e311ab6c38b4c60bc6b9e3
 EBUILD stellarsolver-1.8.ebuild 604 BLAKE2B 6870dcffaf8680fbe4324ba0bd7ce103a9d23b7df7c308a888bdf028df713238c1f8c59a604bc9a48324b0172bfcce40605058dec63d1a8d3ed6b06ca7ddf72e SHA512 20dfd5ef82102e44010cf5fba5cea37f2c11905cf2838e85f87332cf300ff2c31b931dd3dcbd229bd4e8736bbf75f9df296aee78bb4f5b29db5828503b9c480f
+EBUILD stellarsolver-1.9.ebuild 606 BLAKE2B e3f5dfe824b7e59b82334cddd40fb721903cf861171b570ab66d44dff21372cf00b7131b3a6d60c46dfabbb6b9a41a978132300ddf9a1c6ac9bc695803d469d1 SHA512 e2f9b98825582cc238255a5a07fa0dc78470607767de59d1879655980c469e7cf669a140f06993ea55b6863d6770679a8aaf80b8e61fc9bfe314c6f1dc70c0f7
 MISC metadata.xml 464 BLAKE2B 4d73483b37f92bd6a6a112d27c17ce7c8c0165cb3400f10c3a5ed5a65bcaa6e2e0d892d305834fc813655258173552cdef75431d9798491d0b124de1dbb6f035 SHA512 3cc978f381b4435b05712e69733336ec7e89963d4b236059c21b4bf7f08b899e617243ef5df0e27c2ef21e59197b97fcf414c1964b86b215d0c355c4f88cac77
diff --git a/sci-libs/stellarsolver/stellarsolver-1.9.ebuild b/sci-libs/stellarsolver/stellarsolver-1.9.ebuild
new file mode 100644
index 000000000000..9a2aed549e42
--- /dev/null
+++ b/sci-libs/stellarsolver/stellarsolver-1.9.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Cross-platform Sextractor and Astrometry.net-Based internal astrometric solver"
+HOMEPAGE="https://github.com/rlancaste/stellarsolver"
+SRC_URI="https://github.com/rlancaste/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	sci-libs/cfitsio:=
+	sci-libs/gsl:=
+	sci-astronomy/wcslib:=
+"
+DEPEND="${RDEPEND}"
diff --git a/sci-libs/tensorflow/Manifest b/sci-libs/tensorflow/Manifest
index d9ab5a623197..5aa2925674fc 100644
--- a/sci-libs/tensorflow/Manifest
+++ b/sci-libs/tensorflow/Manifest
@@ -48,6 +48,6 @@ DIST tensorflow-patches-2.7.0.tar.bz2 2928 BLAKE2B 4814c3b31d1c6236711c41f62b565
 DIST tensorflow-runtime-64c92c8013b557087351c91b5423b6046d10f206.tar.gz 15224747 BLAKE2B b6aaaf4f6dd488dbfc49f6f9bd6d7820894b7f205ab76c38288175c70dd9ee656128a0655fc1f7ca1ada33d96193c9bb3569da02d0b591aea9ffbb9cf1f223b8 SHA512 1e66742ccda9778fdf9e0e1e83b0524d6b3e82e7792918ae058c031e81b033bc51cebf49752832aa2f27a53a6a9846256e4e9e9eec7c5285ad2db2cb8995ecfc
 DIST tensorflow-toolchains-v1.1.10.tar.gz 137512 BLAKE2B 774b22a599070564c0f77ed0da79f6a96359b196dd3007370be885b796c236b9a29c01597507a3049f82cf489824c8016740b778cacb2b8cd859500f9ecb1887 SHA512 1daf4684f5b364a89b3cc475cf2d13d0d0622fc14d2b32d7ad8518932538e716782d755cfcedc98d129a3986bc7c38bfc7854c8ad596891e397510b75ae2f93e
 DIST tensorflow-toolchains-v1.2.7.tar.gz 97867 BLAKE2B 2f613366b34b81d044da1407ff6371c6183b14593c719ea82ffc964c310df72282ba102be50a9c65655f9185b4ab59d707fe823608b6e452ebf9afc70589bcd5 SHA512 b70da3594aa0499b4e158258ba29ef30044cb6e354e2608b79274f712976b687b09e28a2576d3d89e6bd8ff41416ee19f2d5505b712ec98488c8b8cb839ede84
-EBUILD tensorflow-2.5.0-r3.ebuild 15558 BLAKE2B 8766664141227fc2b0ad04c3061fbca8eda2e52f036e1333b2005510aabcd5d2ccb449556bb53259cb7169cb40bf608222590495f580f4e1e9258f769a5833a0 SHA512 65d239aaa14a18d9147a0830e6f2f86246a026b070830cb93959dc5b76c984486ba5bae032733069365edc6df9102285b98a7d3b0eb29d28d819e05bb6e0e076
-EBUILD tensorflow-2.7.0.ebuild 15934 BLAKE2B 9014ea213ceb9139c3cad48da4b1bcf64b82b8b8755e82b9f013bda31cce05ff35ce7f9ab3f8db2e7c1c900e17c4da4810d1910896f4b508f9782243f295096f SHA512 457015c937361ad884f7ec81cba91c5e821648a95ad5b89edb23a5455ee01ab13df207811541bdb6a7d0da19903481d1a6512b0728c723aa90af236aca915534
+EBUILD tensorflow-2.5.0-r3.ebuild 15589 BLAKE2B f9c8d5e5b60c8b259ed17f78314380d111d945486866902b40df7cc090a7bcff2bcb92e386530a10d3abc43e0b30255651c445f5b16df4acf4c5a4ff83500f92 SHA512 b629a9216c691b4076d340a45cc067add1a45ec5c1ef653817c3c9f792d5e0c5abd2a69eb8c3a9260b61ee10473fe08fe62f3643c31ff8846b1f7a9ad9bfb2fc
+EBUILD tensorflow-2.7.0.ebuild 15923 BLAKE2B 3578ec3cb7f6dbf54c1e3171284d862c407b9c1f078e7b9ceafe9aafbc97a24e47b188e63230c31494e74b7886c6a9b20aa0cb8b66535de80f747627fbac562a SHA512 5d84e03c16d3a6358af0d2e4c089e634e15af89a2956c70ac2bf903f6e2e3f1b926b7c5c96ff981c04a2c31954cba99e68e9b6db61f03da86b8b9df3ca9a5239
 MISC metadata.xml 501 BLAKE2B 16095ae1e7ff9fdd7efe0bb5184ce1d7e46cb5c8f98a650ec4f69742262c678b9945d35b12ba518f8a9b36cad8cd23483a95aca0141ddbe07e4210cef16d2949 SHA512 d1f08e9360ab7c4ec516787807cc53f795d99dde6287b7024535bae4dae4a0107117548784bb25ac07cee15ad1676d98e9c9d472ec97023dfc3e0bdd72a26d28
diff --git a/sci-libs/tensorflow/tensorflow-2.5.0-r3.ebuild b/sci-libs/tensorflow/tensorflow-2.5.0-r3.ebuild
index e3c79720e512..0c3051005d95 100644
--- a/sci-libs/tensorflow/tensorflow-2.5.0-r3.ebuild
+++ b/sci-libs/tensorflow/tensorflow-2.5.0-r3.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DISTUTILS_OPTIONAL=1
 PYTHON_COMPAT=( python3_{7,8,9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
 MY_PV=${PV/_rc/-rc}
 MY_P=${PN}-${MY_PV}
 
@@ -106,6 +105,7 @@ RDEPEND="
 		>=dev-python/opt-einsum-3.3.0[${PYTHON_USEDEP}]
 		>=dev-python/protobuf-python-3.13.0[${PYTHON_USEDEP}]
 		dev-python/pybind11[${PYTHON_USEDEP}]
+		dev-python/setuptools[${PYTHON_USEDEP}]
 		dev-python/six[${PYTHON_USEDEP}]
 		dev-python/tblib[${PYTHON_USEDEP}]
 		dev-python/termcolor[${PYTHON_USEDEP}]
@@ -117,11 +117,7 @@ RDEPEND="
 		>=sci-libs/keras-preprocessing-1.1.2[${PYTHON_USEDEP}]
 		>=sci-visualization/tensorboard-2.5.0[${PYTHON_USEDEP}]
 	)"
-DEPEND="${RDEPEND}
-	python? (
-		dev-python/mock
-		dev-python/setuptools
-	)"
+DEPEND="${RDEPEND}"
 PDEPEND="python? (
 		>=sci-libs/tensorflow-estimator-2.5.0[${PYTHON_USEDEP}]
 	)"
@@ -135,8 +131,9 @@ BDEPEND="
 	)
 	!python? ( dev-lang/python )
 	python? (
-		dev-python/cython
-		dev-python/mock
+		dev-python/cython[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/setuptools[${PYTHON_USEDEP}]
 		>=dev-python/grpcio-tools-1.28
 	)"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/sci-libs/tensorflow/tensorflow-2.7.0.ebuild b/sci-libs/tensorflow/tensorflow-2.7.0.ebuild
index 3cfc701dff2f..2ab771170c61 100644
--- a/sci-libs/tensorflow/tensorflow-2.7.0.ebuild
+++ b/sci-libs/tensorflow/tensorflow-2.7.0.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DISTUTILS_OPTIONAL=1
 PYTHON_COMPAT=( python3_{7,8,9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
 MY_PV=${PV/_rc/-rc}
 MY_P=${PN}-${MY_PV}
 
@@ -118,11 +117,7 @@ RDEPEND="
 		>=net-libs/google-cloud-cpp-0.10.0
 		>=sci-visualization/tensorboard-2.7.0[${PYTHON_USEDEP}]
 	)"
-DEPEND="${RDEPEND}
-	python? (
-		dev-python/mock
-		dev-python/setuptools
-	)"
+DEPEND="${RDEPEND}"
 PDEPEND="python? (
 		>=sci-libs/keras-2.7.0[${PYTHON_USEDEP}]
 		>=sci-libs/tensorflow-estimator-2.7.0[${PYTHON_USEDEP}]
@@ -137,8 +132,9 @@ BDEPEND="
 	)
 	!python? ( dev-lang/python )
 	python? (
-		dev-python/cython
-		dev-python/mock
+		dev-python/cython[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/setuptools[${PYTHON_USEDEP}]
 		>=dev-python/grpcio-tools-1.28
 	)"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest
index b9f22caab02c..fa8d6c75d6b5 100644
--- a/sci-libs/vtk/Manifest
+++ b/sci-libs/vtk/Manifest
@@ -23,6 +23,6 @@ DIST vtkDocHtml-8.2.0.tar.gz 132516675 BLAKE2B 8651a3793f3326dee36c5ae8a280b0094
 DIST vtkDocHtml-9.0.3.tar.gz 132650096 BLAKE2B 45fc1a6942df3e79e500a552c3b3cda2099b9451191559d471e3a2e785a8c52b2c6273cfd2cc4a3f3f65582e607d9414475f58d243fde96a4f985bed479e53db SHA512 9b5fef43f3c2b92aa1fe6a9ba9458d6677874b09b167654db7f26df6feffdc34ed1a8fb4e59d64b75625063a774af77fe57f275903602a5f7daa74e1a2e71800
 DIST vtkDocHtml-9.1.0.tar.gz 152767166 BLAKE2B 9163b6b1bf55810a310ca8bc211e067827b1f9907efd2a378363d8e6296d4bf07b25371b66c00cab3576fb06f0cb63fdf2ffea044033e2c42e9087819a3736ba SHA512 036daba5eb6503b5eb3e9323a4ab3ea0f27c09d8fef411dd2ed154c24d5a37d9f19d57db07576c8af404bfdb7178e95b137a3c27bfedb3f9cb72c04f717da80a
 EBUILD vtk-8.2.0-r6.ebuild 10341 BLAKE2B f8fdb78d1181de56f455869a7e4244ae369c62aa682757628b62926d7bb6ce29efde32b3d0faa9cae2c7a2faa52d893941f8ca93b872e831e7a791aca8cc68ae SHA512 73100a10ab6f9b4d1ddaa7cfbb60d3b9c79b53d96c21b9541769306d540b1292986b1e4804cec07d86e80cbb1fb5fb2f4b4870183f1ca70637836a606ac38d14
-EBUILD vtk-9.0.3-r3.ebuild 14294 BLAKE2B 25b9deafd34226c2e97b5bf59261f97247f3d2c138c64e4fd764ed4cafbe466b46b418240ec816588e4035096e943701d67f7e3243f0605f76d7e6e57f97a6a6 SHA512 70d844fb50a2d2fba1037ff6c0b0a611da04cf5ae3898134936a4e3b50d148bb9893ff0bd14d186ffdff9e6bd1afdd1879df21e623a834a6502edfc3e9170233
+EBUILD vtk-9.0.3-r4.ebuild 14314 BLAKE2B 9b300b679f40871c9d89a670b8d5c5b4e2236d1f08ad94155ce8e7711f08530170decc5bde428948c0eeec66fb030d6a2d93a16902fa59fdae62d7dc3ead1508 SHA512 5103af524fd56b5d4f267f659757715b2e01529cae295c9bfd28236f7d04d4af3c04570183fae77eb672c3476b92393ae3a98ef90e38f91bfd33a6446a23e9cb
 EBUILD vtk-9.1.0.ebuild 16274 BLAKE2B 9239ae77537e00220fb84988be25c84baa55876fdd61e0d065111a841b2a80defc1c29a5e5af53600796fd9360be27d7fd0892ddfaa2363fcbe1f867cace40d2 SHA512 637b6e2511ee74416e61aaba1cb4283adb3d2ccf95f4ba461b8d9f0fc612fb429efa83cc1b7804d3ff2ece8d52bde866eb849c4ca7c74958630f22d167f84bf1
 MISC metadata.xml 1405 BLAKE2B 0eadca65bf1cec673770c28b581491053bfd0f0834aee7c063e79fdc8e89ae161f74e97de4bbcdc1f80590284a004ae129f28b948d6efee0bd5d1c2ae1c3b26d SHA512 133b198af799dabfd1f4dad6ba27b27f8a2df728b46b94934ba3cb26c6a51dec8882e905f120ce1e5f55fbf8fda4ee9634c59280f7fd1f7bcd316e64f86aec60
diff --git a/sci-libs/vtk/vtk-9.0.3-r3.ebuild b/sci-libs/vtk/vtk-9.0.3-r4.ebuild
index db7df9ecb55d..578cf8ade8fb 100644
--- a/sci-libs/vtk/vtk-9.0.3-r3.ebuild
+++ b/sci-libs/vtk/vtk-9.0.3-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -47,6 +47,7 @@ REQUIRED_USE="
 	qt5? ( X rendering )
 	tk? ( X rendering python )
 	web? ( python )
+	^^ ( X offscreen )
 "
 
 RDEPEND="
@@ -358,9 +359,9 @@ src_configure() {
 
 	if use offscreen; then
 		mycmakeargs+=(
-			-DVTK_OPENGL_HAS_OSMESA=ON
 			-DVTK_DEFAULT_RENDER_WINDOW_OFFSCREEN=ON
 			-DVTK_DEFAULT_RENDER_WINDOW_HEADLESS=ON
+			-DVTK_OPENGL_HAS_OSMESA=ON
 		)
 	fi
author	V3n3RiX <venerix@koprulu.sector>	2022-02-02 01:39:05 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2022-02-02 01:39:05 +0000
commit	fcc5224904648a8e6eb528d7603154160a20022f (patch)
tree	3bfce096b38a9cea8eed13fc70c1526c456e9abd /sci-libs
parent	2fd57282f0262ca084e05b0f2c63fbada395d02b (diff)