gentoo auto-resync : 18:12:2022 - 09:41:22

15 files changed, 3 insertions, 772 deletions

diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 4a51f0015668..289dd6f4d9ae 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/dcmtk/Manifest b/sci-libs/dcmtk/Manifest
index 4d9bc69d739b..099fa95fc1f6 100644
--- a/sci-libs/dcmtk/Manifest
+++ b/sci-libs/dcmtk/Manifest
@@ -1,7 +1,7 @@
 AUX dcmtk-3.6.5-rename-bundled-charls.patch 2913 BLAKE2B 246d283ccb98606faaee4ef6ad25368ee47e6c96ef44e334d774625b375788e5c1ae41ca3aa6048ff6c76b1ddaae242d3c783875fe7e9e9c740675e96d8a2495 SHA512 dce186372d22e7b5ae06d3fe623029e95b9cb40005716fc97cd7493ba4fd6c4694228d878941efd9a0f57b2424f713edbebb38ed607ed2e84b65a368f647bab6
 DIST dcmtk-3.6.5.tar.gz 6483626 BLAKE2B 6182ef207b42b16ee91e94397cc8a5b2d108435a30d4c86f0b7e39af91186604f16be07a75e176bf50575446abcab21b2f63158dc4e5f2cb6de3996a0881b295 SHA512 c0cf61b0095c5708709406bfef5e8bb82dd01dbf77df7f2af2118004920bda68218eb1e4174bf92941cdae0acdb275c886570dafd29476eee2eb815e9a82830a
 DIST dcmtk-3.6.7.tar.gz 6877857 BLAKE2B 242ba19ed3876b27c8eeb6917f9264911c951e91ab27d2ebd3e95ab5dcf55a0e18986cede87c8ab7e6280eafeb19fda120ccb2114d24a16f222b411b44cc28d8 SHA512 b9c227f496de65424256636fa7ad266affc6593f72c6849271da94837b68c93a5b8e056ecd09d46550b6ac0530c406ab9f71751d317a5fd4171a222f9fc9ca45
-EBUILD dcmtk-3.6.5-r1.ebuild 1944 BLAKE2B 0812c73548ada77a1d9d575dd2d86f1751a90e0c570a84630b9ff38a8445a3b32ecf6e9275683ea62b4b632eb0fecdf6a7acf3c160be0d091cf04c0c52c289de SHA512 639a6c649b8e4ffe62678e68b7bcf165cdc3687369abff0909ed3b488678af24b89a6c64813c4e12b2763bc4cd03830eef583afaadb96af4f9d52bffbe9c2b6b
 EBUILD dcmtk-3.6.5-r2.ebuild 1902 BLAKE2B 74fdd79e44326bd70fa2ee1a3159b130396c080adfa6324e711d081992215703277f9f3e5ddbb47d7d164f270857c1b8a40989f48792414cb1dd845abe016b26 SHA512 1e44f0ebdc717247a59d228f52aea3954e1e031504288f8b9cdb4522b8dddaa353ebb07727bac3a173afd80326eb6b3b653039772f5a3d91c15a5cfe4042e4b0
-EBUILD dcmtk-3.6.7-r1.ebuild 1904 BLAKE2B 8c18a6c92e206d4d316a0321d19c6798e61cdd7081c64babfe274aaba05125f3ff7365f8d89d6ab5ad0d17dc6a59acdf9ac76119543eb5e6862e4ecd46503580 SHA512 85d028d2466954e1a41a6b3b0001866530323a8b612d5715ddc87a41876ae8bcf5365fa875702f657430e4be5629808344d98cf635a8e7815536112484d2d164
+EBUILD dcmtk-3.6.5-r3.ebuild 1944 BLAKE2B 0812c73548ada77a1d9d575dd2d86f1751a90e0c570a84630b9ff38a8445a3b32ecf6e9275683ea62b4b632eb0fecdf6a7acf3c160be0d091cf04c0c52c289de SHA512 639a6c649b8e4ffe62678e68b7bcf165cdc3687369abff0909ed3b488678af24b89a6c64813c4e12b2763bc4cd03830eef583afaadb96af4f9d52bffbe9c2b6b
+EBUILD dcmtk-3.6.7-r1.ebuild 1902 BLAKE2B c15b9a8a1344169b8336025b2d74afb81f6f44cd1e7c3c5188ebd55ca2ceb728b6fe2174b5f4c0487697374bdbf470f3b2159c840de0e8fc5b05f38a3b1f3ccc SHA512 4481690bfb48d1706fc7c02e070dfa95916a09e3405745dbdf919ae324b260fb36ec6dc6aa56f7bed58e9a9a72add7cc505ef40769e74b7d97ddc18164dcd9a8
 MISC metadata.xml 228 BLAKE2B aed5dcff29c27f92a26fb6756bc7ac8951564825a29dd244c02f697ddc0cc72a3171a360dc67db9d2fb3dcf51bcfe4078bb085c5ca0e343856819732a1aaa410 SHA512 34ff32136442a7884b3bacd8d838f962357f15cbbb4e172bbfe2f042e716313d5dfd29d29d38c4acab816a85803e2c94f98f1933c688cc76c2866454891257ad
diff --git a/sci-libs/dcmtk/dcmtk-3.6.5-r1.ebuild b/sci-libs/dcmtk/dcmtk-3.6.5-r3.ebuild
index 806ae73f1d28..806ae73f1d28 100644
--- a/sci-libs/dcmtk/dcmtk-3.6.5-r1.ebuild
+++ b/sci-libs/dcmtk/dcmtk-3.6.5-r3.ebuild
diff --git a/sci-libs/dcmtk/dcmtk-3.6.7-r1.ebuild b/sci-libs/dcmtk/dcmtk-3.6.7-r1.ebuild
index 30f53ff05704..4a85f26eadb1 100644
--- a/sci-libs/dcmtk/dcmtk-3.6.7-r1.ebuild
+++ b/sci-libs/dcmtk/dcmtk-3.6.7-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://dicom.offis.de/dcmtk.php.en"
 SRC_URI="https://dicom.offis.de/download/dcmtk/release/${P}.tar.gz"
 
 LICENSE="OFFIS"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 SLOT="0"
 IUSE="doc png ssl tcpd tiff +threads xml zlib"
 
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index 6bd724bbe3dc..b355e8927edf 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -1,14 +1,7 @@
-DIST gdal-3.5.0-build-fixes-no-deps.patch.xz 5016 BLAKE2B 0d0ef0ccae73f8a903b0ccbf992fa775b394df85a89d86f86ad60187bfce6a87eb8b23a573bd65c0173c0e7cffe3df447cef0ddddfd5aebfcedfbed3e6a7716e SHA512 e32c97e3fef948f2fa9c0f4b7116ccb231554e962380d7bebb433083926fb4e1902b0a3bc243f747c81c95813651153ce2751d8c2de4e8abb096778ffe589a2e
-DIST gdal-3.5.0.tar.xz 8826500 BLAKE2B 7123ff4a7270b309d458e4a7bd32241cdef53953c305c5027873424794f4ed27d2a4838f86c42f9f84b5174ff499ee5539694c41e906509d21d899ccfe38ff99 SHA512 15d9675ffe5e76fdcb431bef1dce0ed8c23695f418186f37c63f4c7274322924095662bbbc95232d5b4d700704c1c4922d52b419cef5bb67f3bb64ee59654d8b
-DIST gdal-3.5.2.tar.xz 8863680 BLAKE2B 6d3277bde363abb202d8caa715af4d1b4b6d184c961502c9ee6d8367ac722329dc941def8b060c9ecd4f48e9561b60cc14a9cc633ba39ace8d02a2245ae2c5a4 SHA512 9515b6709bf3a32f800b38ebba41f1a475946aa7249f072ebe37af0aea896e2b834c9156151f94261366afa400870944fc394637b02e2fd69136af5171715d70
 DIST gdal-3.5.3.tar.xz 9504740 BLAKE2B 7054df4c7ea6d8d3e6e9cf2544fc5c7a9149dea94ed882723ec82c61268100c2f5330f28a8d9d44e1296511eb2a204c64dfe41f135fadb44db380aa331d9c731 SHA512 b7bac9dd568e9db49d1fa5be8cd48df37f37196b0cacce44f738a981f0c43a77b5750312cd0c3385fdd881a6b525a5ceac56bcd08284d76071bd508d01781f49
 DIST gdal-3.6.1.tar.xz 8685072 BLAKE2B 84f707085e77317f2e6577afe594eb01aae777d2863454bfc873ba170f1254094946f02301079d9cce66f8e64848b2b97f03651b114b283c7910d46da1507430 SHA512 07138bdd66a0259cffed3a1587904760b734fffa546f5cdf7ca9ee472c77676e5694f6c92d57f03f9cdb94cc3992a0404688f248b79e263eb0c1e3ab6025f6bb
-DIST gdalautotest-3.5.0.tar 50442240 BLAKE2B 15005f16530690e584e39b036881c339f147e525e3e0dc39b57d027c493ab89027baa2ea3a0ed148c8fa3ebb7cd53cdb4cf4d53c96d068b5a89caf28165e213b SHA512 723c57425dd5f8acd61795be98b450844b5664b9940d47823829d510b8fb84d1d6db9ca880200d7732a83e7b0f1ae6e33269d8ebd91bf0e7d99e887b5f79aad0
-DIST gdalautotest-3.5.2.tar 51046400 BLAKE2B bd6f73b98548998d00b5631025abd2dc800c61a8afd16b63505cadd7fa46621c59f7be4eaee43d6cca9dd55684d17fc0e7e08c8540988f48af9e74c649f32dab SHA512 92017d76dc9523b7e24c50dc54b1b1d8856cb4be8a3c8d4fc23bd8a5abaad46c758d606a743cfc30aa4c74a876f203ae105f7e06b66b2873d06de70c2edd1cc2
 DIST gdalautotest-3.5.3.tar.gz 12374523 BLAKE2B 3f8e2ba8b49d7bb870a49bde4ec95f807ff79cf23d36504cf7beeccff104364d8fc8e287184a0239cd2c4bf5e26c900cfb29bda3beb615504e588519385a322c SHA512 3b18c94d0b0e1d6d2d38ca82cddc8e69f2acf800fa1b4e7fbabaf112e9ad69fa807b92e652b43ebd122e3b5e8d6cc0d5644e92127a673676bc7df396720dab5e
 DIST gdalautotest-3.6.1.tar.gz 12577286 BLAKE2B 5215db1c39ee1b6d923da9503a2220d8862cf262d3f92605902e6a8e7272fbae156c306a8172f7ef75ad110fc6a82a06873c8420d5d1f2a3a8d4600430932a79 SHA512 a91ba311840b98d16df1918752bb5a629bdbe68b98e3ca9f00e2a8ee49f9f68021081700eb39cce7cf5b09fc3fafed987ea067c8135ab2469b91c34338ba7ef2
-EBUILD gdal-3.5.0-r6.ebuild 6881 BLAKE2B 6e743ac69b7c96ad2d1ab1344df08c1dd96ad116439d789286f77747caa78479b3af7c06677964684e0ed53913f3caa4eedf9efa7ee121a408c68a24a2780d04 SHA512 f93edee289bb22aeb40cf88b9c16fadea6bb8a1e7876d2468276a35335a3a71066de2e5a52891a483d6e9e9f6c3e6c9211e2f887764433b361cd1d75ce67fe22
-EBUILD gdal-3.5.2-r3.ebuild 6724 BLAKE2B 4bbfd66562c3c1c1b0ddbc872183278d58099be75e00e0566e392d8c15757e93d4b1503c0393c2642a5c6edcc8e15fe5cb0fcbf0bbec6894f30c9cd315fef4f1 SHA512 91720cec7a109291ba126af20b921a5d716d47071cf4ec89337e705ff7391c11565954f282879b575e0845c10c32dcfdf9ffdb186e3ed7f9d04e95f720c3b51a
 EBUILD gdal-3.5.3-r1.ebuild 6692 BLAKE2B 8cbbe3934271dc9ba7ed32e450af987669df15db3704fe831dc49d78b705ce4b667fd3e03ac0f2c277b52827e49c1072c09cc96706f44ae349388140e38fe4d8 SHA512 ef273d7bc9d01214c911917ed81eb77cb2657c12d4feb6ff1eb397d42f2e8950f9fcbd294b12b1cefc79c677ab90e72aff39790ddc0cfe62f1e17a740dd3b441
 EBUILD gdal-3.6.1.ebuild 6742 BLAKE2B 475625965f768d629e87fa8babf438ad7360ee930213762da1a94fc97be747c0a34d3b6b617c7cd6d4f863e1faeb311ed3e4af1b9a8f43f2ed56a3518031166e SHA512 d1ae81c9005bc6fdf61c6a4c85bc20bf71bf30035f5e535700b7c7de59882f16a1b2813f75668b50e656164e2269b085898c71d9c86021d146a59710282db5ad
 MISC metadata.xml 1475 BLAKE2B da082cb9c65adf70069198c37c208d6f11a9c615aad560afd017265d167ff2345c300c2ec200909047f9e5588615a9fce6ee88617fef13f90eb0c10f2b4a8a65 SHA512 c2b037a7a616d588719fccede5b7ff2c1482fd93f5566d45ac9b721aec1668d7e074ab5bb346867be2cfd0b5c36e7b41611e9cc66a7125257528b221e6c365d7
diff --git a/sci-libs/gdal/gdal-3.5.0-r6.ebuild b/sci-libs/gdal/gdal-3.5.0-r6.ebuild
deleted file mode 100644
index 63a468ed954a..000000000000
--- a/sci-libs/gdal/gdal-3.5.0-r6.ebuild
+++ /dev/null
@@ -1,244 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit cmake java-pkg-opt-2 python-single-r1
-
-DESCRIPTION="Translator library for raster geospatial data formats (includes OGR support)"
-HOMEPAGE="https://gdal.org/"
-SRC_URI="https://download.osgeo.org/${PN}/${PV}/${P}.tar.xz"
-SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-build-fixes-no-deps.patch.xz"
-# Seems to not be compressed...
-SRC_URI+=" test? ( https://download.osgeo.org/${PN}/${PV}/${PN}autotest-${PV}.tar.gz -> ${PN}autotest-${PV}.tar )"
-
-LICENSE="BSD Info-ZIP MIT"
-SLOT="0/31" # subslot is libgdal.so.<SONAME>
-KEYWORDS="amd64 ~arm arm64 ~ia64 ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="armadillo +curl cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_ssse3 doc fits geos gif gml hdf5 heif java jpeg jpeg2k lzma mysql netcdf odbc ogdi opencl oracle pdf png postgres python spatialite sqlite test webp xls zstd"
-# Tests fail to build in 3.5.0, let's not worry too much yet given
-# we're only just porting to CMake. Revisit later.
-RESTRICT="!test? ( test ) test"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
-	spatialite? ( sqlite )"
-
-BDEPEND="virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	java? (
-		dev-java/ant-core
-		dev-lang/swig:0
-		>=virtual/jdk-1.8:*
-	)
-	python? (
-		dev-lang/swig:0
-		$(python_gen_cond_dep '
-			dev-python/setuptools[${PYTHON_USEDEP}]
-		')
-	)"
-DEPEND="dev-libs/expat
-	dev-libs/json-c:=
-	dev-libs/libpcre2
-	dev-libs/libxml2:2
-	dev-libs/openssl:=
-	media-libs/tiff:=
-	>=sci-libs/libgeotiff-1.5.1-r1:=
-	>=sci-libs/proj-6.0.0:=
-	sys-libs/zlib[minizip(+)]
-	armadillo? ( sci-libs/armadillo:=[lapack] )
-	curl? ( net-misc/curl )
-	fits? ( sci-libs/cfitsio:= )
-	geos? ( >=sci-libs/geos-3.8.0 )
-	gif? ( media-libs/giflib:= )
-	gml? ( >=dev-libs/xerces-c-3.1 )
-	heif? ( media-libs/libheif:= )
-	hdf5? ( >=sci-libs/hdf5-1.6.4:=[cxx,szip] )
-	jpeg? ( media-libs/libjpeg-turbo:= )
-	jpeg2k? ( media-libs/openjpeg:2= )
-	lzma? ( || (
-		app-arch/xz-utils
-		app-arch/lzma
-	) )
-	mysql? ( virtual/mysql )
-	netcdf? ( sci-libs/netcdf:= )
-	odbc? ( dev-db/unixODBC )
-	ogdi? ( >=sci-libs/ogdi-4.1.0-r1 )
-	opencl? ( virtual/opencl )
-	oracle? ( dev-db/oracle-instantclient:= )
-	pdf? ( app-text/poppler:= )
-	png? ( media-libs/libpng:= )
-	postgres? ( >=dev-db/postgresql-8.4:= )
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-python/numpy[${PYTHON_USEDEP}]
-		')
-	)
-	spatialite? ( dev-db/spatialite )
-	sqlite? ( dev-db/sqlite:3 )
-	webp? ( media-libs/libwebp:= )
-	xls? ( dev-libs/freexl )
-	zstd? ( app-arch/zstd:= )"
-RDEPEND="${DEPEND}
-	java? ( >=virtual/jre-1.8:* )"
-
-PATCHES=(
-	"${WORKDIR}"/${P}-build-fixes-no-deps.patch
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-	use java && java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	if use test ; then
-		mv "${WORKDIR}"/gdalautotest-${PV} "${S}"/autotest || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_IPO=OFF
-		-DGDAL_USE_EXTERNAL_LIBS=ON
-		-DGDAL_USE_INTERNAL_LIBS=OFF
-
-		# bug #844874 and bug #845150
-		-DCMAKE_INSTALL_INCLUDEDIR="include/gdal"
-
-		# Options here are generally off because of one of:
-		# - Not yet packaged dependencies
-		#
-		# - Off for autotools build and didn't want more churn by
-		#   enabling during port to CMake. Feel free to request them
-		#   being turned on if useful for you.
-		-DGDAL_USE_ARMADILLO=$(usex armadillo)
-		-DGDAL_USE_ARROW=OFF
-		-DGDAL_USE_BLOSC=OFF
-		-DGDAL_USE_BRUNSLI=OFF
-		-DGDAL_USE_CRNLIB=OFF
-		-DGDAL_USE_CFITSIO=$(usex fits)
-		-DGDAL_USE_CURL=$(usex curl)
-		-DGDAL_USE_CRYPTOPP=OFF
-		-DGDAL_USE_DEFLATE=OFF
-		-DGDAL_USE_ECW=OFF
-		-DGDAL_USE_EXPAT=ON
-		-DGDAL_USE_FILEGDB=OFF
-		-DGDAL_USE_FREEXL=$(usex xls)
-		-DGDAL_USE_FYBA=OFF
-		-DGDAL_USE_GEOTIFF=ON
-		-DGDAL_USE_GEOS=$(usex geos)
-		-DGDAL_USE_GIF=$(usex gif)
-		-DGDAL_USE_GTA=OFF
-		-DGDAL_USE_HEIF=$(usex heif)
-		-DGDAL_USE_HDF4=OFF
-		-DGDAL_USE_HDF5=$(usex hdf5)
-		-DGDAL_USE_HDFS=OFF
-		-DGDAL_USE_ICONV=ON # TODO dep
-		-DGDAL_USE_IDB=OFF
-		-DGDAL_USE_JPEG=$(usex jpeg)
-
-		# https://gdal.org/build_hints.html#jpeg12
-		# Independent of whether using system libjpeg
-		-DGDAL_USE_JPEG12_INTERNAL=ON
-
-		-DGDAL_USE_JSONC=ON
-		-DGDAL_USE_JXL=OFF
-		-DGDAL_USE_KDU=OFF
-		-DGDAL_USE_KEA=OFF
-		-DGDAL_USE_LERC=OFF
-		-DGDAL_USE_LIBKML=OFF
-		-DGDAL_USE_LIBLZMA=$(usex lzma)
-		-DGDAL_USE_LIBXML2=ON
-		-DGDAL_USE_LURATECH=OFF
-		-DGDAL_USE_LZ4=OFF
-		-DGDAL_USE_MONGOCXX=OFF
-		-DGDAL_USE_MRSID=OFF
-		-DGDAL_USE_MSSQL_NCLI=OFF
-		-DGDAL_USE_MSSQL_ODBC=OFF
-		-DGDAL_USE_MYSQL=$(usex mysql)
-		-DGDAL_USE_NETCDF=$(usex netcdf)
-		-DGDAL_USE_ODBC=$(usex odbc)
-		-DGDAL_USE_ODBCCPP=OFF
-		-DGDAL_USE_OGDI=$(usex ogdi)
-		-DGDAL_USE_OPENCAD=OFF
-		-DGDAL_USE_OPENCL=$(usex opencl)
-		-DGDAL_USE_OPENEXR=OFF
-		-DGDAL_USE_OPENJPEG=$(usex jpeg2k)
-		-DGDAL_USE_OPENSSL=ON
-		-DGDAL_USE_ORACLE=$(usex oracle)
-		-DGDAL_USE_PARQUET=OFF
-		-DGDAL_USE_PCRE2=ON
-		-DGDAL_USE_PDFIUM=OFF
-		-DGDAL_USE_PNG=$(usex png)
-		-DGDAL_USE_POPPLER=$(usex pdf)
-		-DGDAL_USE_POSTGRESQL=$(usex postgres)
-		-DGDAL_USE_QHULL=OFF
-		-DGDAL_USE_RASTERLITE2=OFF
-		-DGDAL_USE_RDB=OFF
-		-DGDAL_USE_SPATIALITE=$(usex spatialite)
-		-DGDAL_USE_SQLITE3=$(usex sqlite)
-		-DGDAL_USE_SFCGAL=OFF
-		-DGDAL_USE_TEIGHA=OFF
-		-DGDAL_USE_TIFF=ON
-		-DGDAL_USE_TILEDB=OFF
-		-DGDAL_USE_WEBP=$(usex webp)
-		-DGDAL_USE_XERCESC=$(usex gml)
-		-DGDAL_USE_ZLIB=ON
-		-DGDAL_USE_ZSTD=$(usex zstd)
-
-		# Bindings
-		-DBUILD_PYTHON_BINDINGS=$(usex python)
-		-DBUILD_JAVA_BINDINGS=$(usex java)
-		# bug #845369
-		-DBUILD_CSHARP_BINDINGS=OFF
-
-		# Check work/gdal-3.5.0_build/CMakeCache.txt after configure
-		# and https://github.com/OSGeo/gdal/blob/master/cmake/helpers/CheckCompilerMachineOption.cmake#L71
-		# Commented out: not (yet?) implemented upstream.
-		# Also, arm64 stuff is a TODO upstream, but not there (yet?)
-		-Dtest_avx=$(usex cpu_flags_x86_avx)
-		-Dtest_avx2=$(usex cpu_flags_x86_avx2)
-		-Dtest_sse=$(usex cpu_flags_x86_sse)
-		-Dtest_sse2=$(usex cpu_flags_x86_sse2)
-		#-Dtest_sse3=$(usex cpu_flags_x86_sse3)
-		-Dtest_sse4.1=$(usex cpu_flags_x86_sse4_1)
-		#-Dtest_sse4.2=$(usex cpu_flags_x86_sse4_2)
-		#-Dtest_sse4a=$(usex cpu_flags_x86_sse4a)
-		-Dtest_ssse3=$(usex cpu_flags_x86_ssse3)
-		#-Dtest_fma4=$(usex cpu_flags_x86_fma4)
-		#-Dtest_xop=$(usex cpu_flags_x86_xop)
-	)
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-
-	use doc && cmake_src_compile doc
-}
-
-src_test() {
-	export GDAL_RUN_SLOW_TESTS=0
-	export GDAL_DOWNLOAD_TEST_DATA=0
-
-	# Two test suites:
-	# 1. autotests (much larger, uses pytest)
-	# 2. Small set of fuzzing tests (no download needed)
-	cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-
-	# TODO: install docs?
-}
-
-pkg_postinst() {
-	elog "Check available image and data formats after building with"
-	elog "gdalinfo and ogrinfo (using the --formats switch)."
-}
diff --git a/sci-libs/gdal/gdal-3.5.2-r3.ebuild b/sci-libs/gdal/gdal-3.5.2-r3.ebuild
deleted file mode 100644
index 797fd2a8cde7..000000000000
--- a/sci-libs/gdal/gdal-3.5.2-r3.ebuild
+++ /dev/null
@@ -1,238 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} )
-inherit cmake java-pkg-opt-2 python-single-r1
-
-DESCRIPTION="Translator library for raster geospatial data formats (includes OGR support)"
-HOMEPAGE="https://gdal.org/"
-SRC_URI="https://download.osgeo.org/${PN}/${PV}/${P}.tar.xz"
-SRC_URI+=" test? ( https://download.osgeo.org/${PN}/${PV}/${PN}autotest-${PV}.tar.gz -> ${PN}autotest-${PV}.tar )"
-
-LICENSE="BSD Info-ZIP MIT"
-SLOT="0/31" # subslot is libgdal.so.<SONAME>
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="armadillo +curl cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_ssse3 doc fits geos gif gml hdf5 heif java jpeg jpeg2k lzma mysql netcdf odbc ogdi opencl oracle pdf png postgres python spatialite sqlite test webp xls zstd"
-# Tests fail to build in 3.5.0, let's not worry too much yet given
-# we're only just porting to CMake. Revisit later.
-RESTRICT="!test? ( test ) test"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
-	spatialite? ( sqlite )"
-
-BDEPEND="virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	java? (
-		dev-java/ant-core
-		dev-lang/swig:0
-		>=virtual/jdk-1.8:*
-	)
-	python? (
-		dev-lang/swig:0
-		$(python_gen_cond_dep '
-			dev-python/setuptools[${PYTHON_USEDEP}]
-		')
-	)"
-DEPEND="dev-libs/expat
-	dev-libs/json-c:=
-	dev-libs/libpcre2
-	dev-libs/libxml2:2
-	dev-libs/openssl:=
-	media-libs/tiff:=
-	>=sci-libs/libgeotiff-1.5.1-r1:=
-	>=sci-libs/proj-6.0.0:=
-	sys-libs/zlib[minizip(+)]
-	armadillo? ( sci-libs/armadillo:=[lapack] )
-	curl? ( net-misc/curl )
-	fits? ( sci-libs/cfitsio:= )
-	geos? ( >=sci-libs/geos-3.8.0 )
-	gif? ( media-libs/giflib:= )
-	gml? ( >=dev-libs/xerces-c-3.1 )
-	heif? ( media-libs/libheif:= )
-	hdf5? ( >=sci-libs/hdf5-1.6.4:=[cxx,szip] )
-	jpeg? ( media-libs/libjpeg-turbo:= )
-	jpeg2k? ( media-libs/openjpeg:2= )
-	lzma? ( || (
-		app-arch/xz-utils
-		app-arch/lzma
-	) )
-	mysql? ( virtual/mysql )
-	netcdf? ( sci-libs/netcdf:= )
-	odbc? ( dev-db/unixODBC )
-	ogdi? ( >=sci-libs/ogdi-4.1.0-r1 )
-	opencl? ( virtual/opencl )
-	oracle? ( dev-db/oracle-instantclient:= )
-	pdf? ( app-text/poppler:= )
-	png? ( media-libs/libpng:= )
-	postgres? ( >=dev-db/postgresql-8.4:= )
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-python/numpy[${PYTHON_USEDEP}]
-		')
-	)
-	spatialite? ( dev-db/spatialite )
-	sqlite? ( dev-db/sqlite:3 )
-	webp? ( media-libs/libwebp:= )
-	xls? ( dev-libs/freexl )
-	zstd? ( app-arch/zstd:= )"
-RDEPEND="${DEPEND}
-	java? ( >=virtual/jre-1.8:* )"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-	use java && java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	if use test ; then
-		mv "${WORKDIR}"/gdalautotest-${PV} "${S}"/autotest || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_IPO=OFF
-		-DGDAL_USE_EXTERNAL_LIBS=ON
-		-DGDAL_USE_INTERNAL_LIBS=OFF
-
-		# bug #844874 and bug #845150
-		-DCMAKE_INSTALL_INCLUDEDIR="include/gdal"
-
-		# Options here are generally off because of one of:
-		# - Not yet packaged dependencies
-		#
-		# - Off for autotools build and didn't want more churn by
-		#   enabling during port to CMake. Feel free to request them
-		#   being turned on if useful for you.
-		-DGDAL_USE_ARMADILLO=$(usex armadillo)
-		-DGDAL_USE_ARROW=OFF
-		-DGDAL_USE_BLOSC=OFF
-		-DGDAL_USE_BRUNSLI=OFF
-		-DGDAL_USE_CRNLIB=OFF
-		-DGDAL_USE_CFITSIO=$(usex fits)
-		-DGDAL_USE_CURL=$(usex curl)
-		-DGDAL_USE_CRYPTOPP=OFF
-		-DGDAL_USE_DEFLATE=OFF
-		-DGDAL_USE_ECW=OFF
-		-DGDAL_USE_EXPAT=ON
-		-DGDAL_USE_FILEGDB=OFF
-		-DGDAL_USE_FREEXL=$(usex xls)
-		-DGDAL_USE_FYBA=OFF
-		-DGDAL_USE_GEOTIFF=ON
-		-DGDAL_USE_GEOS=$(usex geos)
-		-DGDAL_USE_GIF=$(usex gif)
-		-DGDAL_USE_GTA=OFF
-		-DGDAL_USE_HEIF=$(usex heif)
-		-DGDAL_USE_HDF4=OFF
-		-DGDAL_USE_HDF5=$(usex hdf5)
-		-DGDAL_USE_HDFS=OFF
-		-DGDAL_USE_ICONV=ON # TODO dep
-		-DGDAL_USE_IDB=OFF
-		-DGDAL_USE_JPEG=$(usex jpeg)
-
-		# https://gdal.org/build_hints.html#jpeg12
-		# Independent of whether using system libjpeg
-		-DGDAL_USE_JPEG12_INTERNAL=ON
-
-		-DGDAL_USE_JSONC=ON
-		-DGDAL_USE_JXL=OFF
-		-DGDAL_USE_KDU=OFF
-		-DGDAL_USE_KEA=OFF
-		-DGDAL_USE_LERC=OFF
-		-DGDAL_USE_LIBKML=OFF
-		-DGDAL_USE_LIBLZMA=$(usex lzma)
-		-DGDAL_USE_LIBXML2=ON
-		-DGDAL_USE_LURATECH=OFF
-		-DGDAL_USE_LZ4=OFF
-		-DGDAL_USE_MONGOCXX=OFF
-		-DGDAL_USE_MRSID=OFF
-		-DGDAL_USE_MSSQL_NCLI=OFF
-		-DGDAL_USE_MSSQL_ODBC=OFF
-		-DGDAL_USE_MYSQL=$(usex mysql)
-		-DGDAL_USE_NETCDF=$(usex netcdf)
-		-DGDAL_USE_ODBC=$(usex odbc)
-		-DGDAL_USE_ODBCCPP=OFF
-		-DGDAL_USE_OGDI=$(usex ogdi)
-		-DGDAL_USE_OPENCAD=OFF
-		-DGDAL_USE_OPENCL=$(usex opencl)
-		-DGDAL_USE_OPENEXR=OFF
-		-DGDAL_USE_OPENJPEG=$(usex jpeg2k)
-		-DGDAL_USE_OPENSSL=ON
-		-DGDAL_USE_ORACLE=$(usex oracle)
-		-DGDAL_USE_PARQUET=OFF
-		-DGDAL_USE_PCRE2=ON
-		-DGDAL_USE_PDFIUM=OFF
-		-DGDAL_USE_PNG=$(usex png)
-		-DGDAL_USE_POPPLER=$(usex pdf)
-		-DGDAL_USE_POSTGRESQL=$(usex postgres)
-		-DGDAL_USE_QHULL=OFF
-		-DGDAL_USE_RASTERLITE2=OFF
-		-DGDAL_USE_RDB=OFF
-		-DGDAL_USE_SPATIALITE=$(usex spatialite)
-		-DGDAL_USE_SQLITE3=$(usex sqlite)
-		-DGDAL_USE_SFCGAL=OFF
-		-DGDAL_USE_TEIGHA=OFF
-		-DGDAL_USE_TIFF=ON
-		-DGDAL_USE_TILEDB=OFF
-		-DGDAL_USE_WEBP=$(usex webp)
-		-DGDAL_USE_XERCESC=$(usex gml)
-		-DGDAL_USE_ZLIB=ON
-		-DGDAL_USE_ZSTD=$(usex zstd)
-
-		# Bindings
-		-DBUILD_PYTHON_BINDINGS=$(usex python)
-		-DBUILD_JAVA_BINDINGS=$(usex java)
-		# bug #845369
-		-DBUILD_CSHARP_BINDINGS=OFF
-
-		# Check work/gdal-3.5.0_build/CMakeCache.txt after configure
-		# and https://github.com/OSGeo/gdal/blob/master/cmake/helpers/CheckCompilerMachineOption.cmake#L71
-		# Commented out: not (yet?) implemented upstream.
-		# Also, arm64 stuff is a TODO upstream, but not there (yet?)
-		-Dtest_avx=$(usex cpu_flags_x86_avx)
-		-Dtest_avx2=$(usex cpu_flags_x86_avx2)
-		-Dtest_sse=$(usex cpu_flags_x86_sse)
-		-Dtest_sse2=$(usex cpu_flags_x86_sse2)
-		#-Dtest_sse3=$(usex cpu_flags_x86_sse3)
-		-Dtest_sse4.1=$(usex cpu_flags_x86_sse4_1)
-		#-Dtest_sse4.2=$(usex cpu_flags_x86_sse4_2)
-		#-Dtest_sse4a=$(usex cpu_flags_x86_sse4a)
-		-Dtest_ssse3=$(usex cpu_flags_x86_ssse3)
-		#-Dtest_fma4=$(usex cpu_flags_x86_fma4)
-		#-Dtest_xop=$(usex cpu_flags_x86_xop)
-	)
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-
-	use doc && cmake_src_compile doc
-}
-
-src_test() {
-	export GDAL_RUN_SLOW_TESTS=0
-	export GDAL_DOWNLOAD_TEST_DATA=0
-
-	# Two test suites:
-	# 1. autotests (much larger, uses pytest)
-	# 2. Small set of fuzzing tests (no download needed)
-	cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-	use python && python_optimize
-	# TODO: install docs?
-}
-
-pkg_postinst() {
-	elog "Check available image and data formats after building with"
-	elog "gdalinfo and ogrinfo (using the --formats switch)."
-}
diff --git a/sci-libs/geos/Manifest b/sci-libs/geos/Manifest
index 8904892eed1a..cc0a19a1fef3 100644
--- a/sci-libs/geos/Manifest
+++ b/sci-libs/geos/Manifest
@@ -1,9 +1,5 @@
-DIST geos-3.10.0.tar.bz2 6799370 BLAKE2B dd1490318fccda8ccaf5152f8521ab98ef5e4b143e12e861d02124421985a8b2c966bca6f966aa167fb60f703d25c132b8c7ee4d61e382a449bce5eb40d4cb89 SHA512 12657c6649bfbf6efa3232a054969c6229bb23fc16a7c72d6ca5fdb662e0d08e14bbcaa6944a17de8972b6c236608d94c870ead0b04fada2d2af3d42c238058e
-DIST geos-3.10.2.tar.bz2 6714655 BLAKE2B 1bc4f29a28b2b49faa9e1ea2aba7359d6dcb124136e0a2d2069508f7b95fae09e59ecb0acf3742d9261444055e85471cf45baba6e278c8b3501e91eacf3bb886 SHA512 390381711ccf56b862c2736cf6329200822f121de1c49df52b8b85cabea8c7787b199df2196acacc2e5c677ff3ebe042d93d70e89deadbc19d754499edb65126
 DIST geos-3.11.0.tar.bz2 6727294 BLAKE2B 7d2cb7ae2dc6c5eb13836c16c8164402c1e964f98df95d5aaf9f6fd957ebcdbdefb43ae4fb17a5a671b6dfdb812bdacfdbfdfdea6e5bd44f135e3701a3cc914d SHA512 40c7553bbb93673c231ddd0131b73bf43b3f50524bc5bd9e6934c068d2c09632f388b7429254ae15d9641da2d15e3a626b430438854e98d9e7419ad04e535189
 DIST geos-3.11.1.tar.bz2 6753232 BLAKE2B 376050ca3224e5220f69d82ff62d79ff7ea3d35d5fe90b7ab4e0cabcb4200b47d7569110538c201df9cb28da784f09f8207a9a8233ee002ab2ec87f5cf336ba1 SHA512 708500aba9b04208ee46a531d55ddf63a213dfaa2922dae937b524300b2b46c95143ed6cd3ff1414e9099f2be95e5df5a2e0b49df43acf93a9478215259f20d3
-EBUILD geos-3.10.0.ebuild 879 BLAKE2B 103ec4938698174502001266fbfc6cccdb1a446694785711897250850c7faab477079ad02d38eacb7481f68b05077437eb321a3baa4264d9c9b2d992ab0806a9 SHA512 addb684fdcffc270a27335e3de712bac43c38fbb579e9556e1e9b70f7cae8f00148e516766918079f21ba08ba1ec8a9cc74ffef24f783e1067a697d55b7bd1cf
-EBUILD geos-3.10.2.ebuild 879 BLAKE2B f29b0906dc9fee2174a155d7b2333ea8ec9dab858b31efe05f765856570a5bcf64af6ed835e305021f534f357e7174ccfbcc8f0cb638bea80b07313917bb6078 SHA512 e36a0039536a3b98c9b72024b39d0c9d989dfbfee3635225f9e665e7b100ee14ff7b1995f135a27a91db9b72a6fff5af30032d55266fb44cc71d743941b3a074
 EBUILD geos-3.11.0.ebuild 965 BLAKE2B 1d309b8b185f41c09a916d38647c287591e4aa541b3adc9c28d1632bfc9d8e80453e7c8b68e31ec4582a315d0d0c113491c4e24000ccdb76f378a8bf17086394 SHA512 b7324c7318f9634070c98104574be684f44fcb9327fb70548582d4ba3dcac269aa7fa07716f18f4d2aa144526dbd728e8aac83de3f8d0690c4f27482902209fe
 EBUILD geos-3.11.1.ebuild 971 BLAKE2B ae5417fe6a759720d95888b2aca295074123c697cd59e65f0119d69fe5f2fc7a7bb76a050d615bc63b926fccf1a51900f358ffdfd854820291e3059e08cc089b SHA512 a843f0d09f39d17f397db30e1801d338271071170db87bd7969eea0494bd654e04fc7c29dc786b7d2dae7e839c9ebfc5f516774ac475708442b6eabbb5a3b7ab
 MISC metadata.xml 990 BLAKE2B 7ad10fb1fcd8f933626c7a4d943070e147e6ff7776c4c57960cb42433c102036fdd724fd7288ea40aafe99c3255490fe304bfc4932e0c866349a38703c3990eb SHA512 1a2e4778017e909088675a9fc4e27e5b4e4aee4ec82708dd9ad9e3abfc8ce44f68bc19e70ab9de7543caf8379b151c40a2cdbe5e3a599216b201ef2fae8d4452
diff --git a/sci-libs/geos/geos-3.10.0.ebuild b/sci-libs/geos/geos-3.10.0.ebuild
deleted file mode 100644
index ee5577541ea4..000000000000
--- a/sci-libs/geos/geos-3.10.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Geometry engine library for Geographic Information Systems"
-HOMEPAGE="https://libgeos.org/"
-SRC_URI="https://download.osgeo.org/geos/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ia64 ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
-IUSE="doc"
-
-BDEPEND="doc? ( app-doc/doxygen )"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_DOCUMENTATION=$(usex doc)
-
-		# bug #709368
-		$(usex arm '-DDISABLE_GEOS_INLINE=ON' '')
-	)
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-
-	use doc && cmake_src_compile docs
-}
-
-src_install() {
-	cmake_src_install
-
-	if use doc ; then
-		HTML_DOCS=( "${BUILD_DIR}"/doc/doxygen_docs/html/. )
-		einstalldocs
-	fi
-}
diff --git a/sci-libs/geos/geos-3.10.2.ebuild b/sci-libs/geos/geos-3.10.2.ebuild
deleted file mode 100644
index f43f7504f26b..000000000000
--- a/sci-libs/geos/geos-3.10.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Geometry engine library for Geographic Information Systems"
-HOMEPAGE="https://libgeos.org/"
-SRC_URI="https://download.osgeo.org/geos/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ia64 ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
-IUSE="doc"
-
-BDEPEND="doc? ( app-doc/doxygen )"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_DOCUMENTATION=$(usex doc)
-
-		# bug #709368
-		$(usex arm '-DDISABLE_GEOS_INLINE=ON' '')
-	)
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-
-	use doc && cmake_src_compile docs
-}
-
-src_install() {
-	cmake_src_install
-
-	if use doc ; then
-		HTML_DOCS=( "${BUILD_DIR}"/doc/doxygen_docs/html/. )
-		einstalldocs
-	fi
-}
diff --git a/sci-libs/libgeotiff/Manifest b/sci-libs/libgeotiff/Manifest
index 57fe8aae8a92..cf0f50c3f7de 100644
--- a/sci-libs/libgeotiff/Manifest
+++ b/sci-libs/libgeotiff/Manifest
@@ -1,9 +1,5 @@
 AUX Doxyfile 9282 BLAKE2B 0dcda644c528df5bd495db1785ce0f3213f0ce0c3551205e9c043a52151b59e82704545d55521f1983ca2b77a93c20dc0e9ddcc6b446a6485e942f301e19e165 SHA512 cc0324c682d5f45f516f0a71311a9b6527c5c4cd6c1a4113503ad9023b72c64ef9c257008cda95d565723183f932f61f79aab73e123e7b7ecf8b7fdb30457fee
 AUX libgeotiff-1.7.1-gnuinstalldirs.patch 4645 BLAKE2B 40deb94bd4eeb55d59d7682b03e34b4b6e3889779a4a134324e4fdc11bcdfe0b1a9b1653256bfe3c58e42f24fc818d2b63e6f651f559efe2e99ce1f7c2badffe SHA512 64e0c4b7ad4e37b910332cc4128f8836ef0215478cc5e8b38b9168c83f6ee718dbf152ec456a983c5ae942d883613d9e201897f83f90e720d355151a765bfbf1
-DIST libgeotiff-1.6.0.tar.gz 537175 BLAKE2B 4b1430c9e80cdd4193f474484b295c151ecb9a654248e08527046f1aa35cfab0be59980edad2cc6ae90c1a7b0e03d46fd203affd5b01c83e0fd4435d5e56b2d3 SHA512 4c59598140d6c435a25aff6520e07a01a0153cac526df3b3e1366d5edc43cd82b15099da79ee8a2fb916e858f5a5d7421cfbf96bb485c91fac9e19c7209b7418
-DIST libgeotiff-1.7.0.tar.gz 541931 BLAKE2B 3c0843f8c86d6bbcedf9d07b45d2d676f1ccfaba7b5e40fa7f8d5f290b39da5cfaebe39567eab9e8add1b99042aad51d5104b81c2c05493d18d022d41e5b106b SHA512 8e294b5db89e88dbd4f7eb9d804be788ff3d14a1a14f721e9805b42cc797500596f0473dd8e5be6c1da01b56bdebc872df2b30470a2d96686f308019de10739a
 DIST libgeotiff-1.7.1.tar.gz 542779 BLAKE2B e26a14fcb463f4a9e5a3652b978223da6b11dcb4ec6a3b6068460f929a57e9affafdb652f16fad23a2da4612c6ae3c2624bfb4f26c96fc4290a33f1e0629b726 SHA512 af119040598f4349124848d9788ea1d0d2019e23fc48eaf4b0445320c51e91afa6c7e25b49738bdaf0aa4467a19104b00838d669da27dee77898c489fe5fe4c1
-EBUILD libgeotiff-1.6.0-r1.ebuild 1275 BLAKE2B 333ff9338946d20ebdf77e3562b6df05e984c04817f6c69228e7e0699449963bf7896e0c3a536f9e98c45e116184d30c91b328e8294face090066928740a0809 SHA512 f33f6868989a67223e99a080a635e05d45eadef7176b1f7aacf0b9626f18597abab9d958b34e91dda4aa7f3d1be24bc0e817a9e51e2916c7c97c79d2b6ee9693
-EBUILD libgeotiff-1.7.0-r1.ebuild 1282 BLAKE2B e7c9e63703e930eb95d2f6bc7250efd9e104f9b7f02f18ad28cac98dc04f5cdd93adb4b1366eefc3738cd7aa9947044b6c35f9d71b614c11569d889b7ee12945 SHA512 c9a430035e1ab03c54e597be52b798a2fa2d18e2114fe649d44285682cc92303917b58b388af82c9f7fbb14f75e1e79a35ad330cb07932ca632b28aa2c2ff4b5
 EBUILD libgeotiff-1.7.1-r3.ebuild 1249 BLAKE2B f38b0d14d770b6c3227e0463c5533a651ae16a3b5cbdb5ef814bdbe5a3fd0eb6f5d85d3788986ee6eee50c903074b3e87360dadc5b871673bb005e526ccb7a48 SHA512 915f279ccccda9349832e1b6cb9092da9ce18366e5e07516530ba60eba6ec711dc345a4439a62d18c979a190e5c8d1fffce53fb24616723a0013e2e69b5dfaff
 MISC metadata.xml 361 BLAKE2B 880dd2e10e5cc19d0d735f23c844c8f8730b0119555ad79f19bfbbc8f3d64fe1cda0228450ce975fb1a0888cf13b1ff87054463db7a1f930bd447776c2b4e2a5 SHA512 4e48120c42d321362e73b95734f3882792d954a4b56ff8f9e2c1250e67ff7dd18732f06265795efe425cf984caffed1391d58282352aaea5ea94a96ab5186c22
diff --git a/sci-libs/libgeotiff/libgeotiff-1.6.0-r1.ebuild b/sci-libs/libgeotiff/libgeotiff-1.6.0-r1.ebuild
deleted file mode 100644
index 840f7e6a4316..000000000000
--- a/sci-libs/libgeotiff/libgeotiff-1.6.0-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Library for reading TIFF files with embedded tags for geographic information"
-HOMEPAGE="https://trac.osgeo.org/geotiff/ https://github.com/OSGeo/libgeotiff"
-SRC_URI="https://download.osgeo.org/geotiff/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/5"
-KEYWORDS="amd64 ~arm arm64 ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="debug doc"
-
-BDEPEND="
-	doc? ( app-doc/doxygen )
-	virtual/pkgconfig
-"
-DEPEND="
-	>=media-libs/tiff-3.9.1:=
-	media-libs/libjpeg-turbo:=
-	>=sci-libs/proj-6.0.0:=
-	sys-libs/zlib
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	sed -e "s:-O3::g" -i configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-static \
-		--enable-debug=$(usex debug) \
-		--with-jpeg="${EPREFIX}"/usr \
-		--with-zip="${EPREFIX}"/usr
-}
-
-src_compile() {
-	default
-
-	if use doc; then
-		mkdir -p docs/api || die
-		cp "${FILESDIR}"/Doxyfile Doxyfile || die
-		doxygen -u Doxyfile || die "updating doxygen config failed"
-		doxygen Doxyfile || die "docs generation failed"
-	fi
-}
-
-src_install() {
-	use doc && local HTML_DOCS=( docs/api/. )
-
-	default
-
-	find "${D}" -name '*.la' -type f -delete || die
-}
diff --git a/sci-libs/libgeotiff/libgeotiff-1.7.0-r1.ebuild b/sci-libs/libgeotiff/libgeotiff-1.7.0-r1.ebuild
deleted file mode 100644
index 70ea62b744bb..000000000000
--- a/sci-libs/libgeotiff/libgeotiff-1.7.0-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Library for reading TIFF files with embedded tags for geographic information"
-HOMEPAGE="https://trac.osgeo.org/geotiff/ https://github.com/OSGeo/libgeotiff"
-SRC_URI="https://download.osgeo.org/geotiff/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/5"
-KEYWORDS="amd64 ~arm arm64 ~ia64 ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="debug doc"
-
-BDEPEND="
-	doc? ( app-doc/doxygen )
-	virtual/pkgconfig
-"
-DEPEND="
-	>=media-libs/tiff-3.9.1:=
-	media-libs/libjpeg-turbo:=
-	>=sci-libs/proj-6.0.0:=
-	sys-libs/zlib
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	sed -e "s:-O3::g" -i configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-static \
-		--enable-debug=$(usex debug) \
-		--with-jpeg="${EPREFIX}"/usr \
-		--with-zip="${EPREFIX}"/usr
-}
-
-src_compile() {
-	default
-
-	if use doc; then
-		mkdir -p docs/api || die
-		cp "${FILESDIR}"/Doxyfile Doxyfile || die
-		doxygen -u Doxyfile || die "updating doxygen config failed"
-		doxygen Doxyfile || die "docs generation failed"
-	fi
-}
-
-src_install() {
-	use doc && local HTML_DOCS=( docs/api/. )
-
-	default
-
-	find "${D}" -name '*.la' -type f -delete || die
-}
diff --git a/sci-libs/proj/Manifest b/sci-libs/proj/Manifest
index c2f94da6f83a..6461739a2e2e 100644
--- a/sci-libs/proj/Manifest
+++ b/sci-libs/proj/Manifest
@@ -1,14 +1,11 @@
 DIST proj-7.2.1.tar.gz 5714666 BLAKE2B 9379ef758b1221b9487f162a27e7afa737e668ad7a13fc7adbd8e1e2c1c4699263d5d3105d03781b423f284205de3c79fc68850b9fba6aa05f1dc553b77b0842 SHA512 59b9b31b0183e620a2f4a25a08620c170773fe4f99e8eca59e9ed6815f43bb379ea21ef71e8f759dbd747855b982657d7503bac3acc542218e0d862105f25324
-DIST proj-8.2.1.tar.gz 5882136 BLAKE2B c4d80ee1bb1287e2539c9b5c5a5c6305fe8d2fc83526fd29507802b94351f51b016184c07a5e8c1bbf820252a6dfa5b4d55376e5d5566774e3e5e3154857dfa1 SHA512 c6164771fd492be5aa91d8dd2f2794a19b47431078f148356aa70dee96a4589ec5decbab9d8dd756a7bcb322ad94935750c22e0e7fb16e21c8f59ca474e7137e
 DIST proj-9.1.0.tar.gz 5299132 BLAKE2B 955b1f2492f47432d8df771fda495e87f977f6a6b4a0957effca0535ff4c3a8edf451028bd805800a2c0c6662e971e1073c35a863426b47f75817ef44e30d281 SHA512 cc23fbfaa16cd14f499ee5162bfe743ec9d738d0ba6358716320aa03e1a752da45fd6102fca1981c9b695934e7c358540be53d667c48dae922ac5511eea6824c
 DIST proj-9.1.1.tar.gz 5311995 BLAKE2B d51652f649ac97f419740e30facd86b04ee0872197d235aecc9d8fd50c18340bc7969a4a78c33f28753fc8b5556e7e8bdc47e0b6a9d9971e214575481cf25c0b SHA512 b9d19a999e063e465579eb86da3fd2aa32fd894f0d15ba178733bcbad92246b3b3ea1811a276cd556874e171a5ba7cfd678ce563c0b8626c6db9349a64c04726
 DIST proj-data-1.11.tar.gz 597743778 BLAKE2B d68a3a1154d560b724364a843e09ca5350a6a04ce30fb124788220d8e48eff3ab33f6061effec88e658067e0d430b5606f386d82bdcefa69551d9855db9ee476 SHA512 6c91b7ad81b9cf93330cb27f6632cc3e6d854ed4e84318520200d3fffe59c94e4061e2ebece220a143624ae5c4b672458379a546e75547544347cc28576b984f
 DIST proj-data-1.12.tar.gz 611423889 BLAKE2B 5376f041aae1a23668a0cae79f4deadff29aad80a1187f837cd5c62c21dc49738fc598c52825f5d8575cd135b55c188d9456b5da72adc6a507fa778f0cad6596 SHA512 788d7c3ad70dd7aab21824ff189dd0cddc28b7e64999f6a9953d7af95f9fabab7143b0f1c3bed19d5deb8f3e3a7be62723fc5fda778fcaefab0ab6d449db5def
-DIST proj-data-1.8.tar.gz 586765549 BLAKE2B a54287fa81e2055737c1956bf7f10246ccdd8d9af49fe7e8a01a6f2206c234d2827c4268d901d49bbbfff4caace220aa1867f0088442e4849f9d3cd57f4ca72d SHA512 884425c3bc09a39cb1b611264ccaa17940f4779f4e0d6023306f6b82622cdd0a2e5970a79018d499d323640acb72560789ef127ff4e0c712fa3679e5cfeb34bc
 DIST proj-datumgrid-1.8.tar.gz 6604329 BLAKE2B 78df259a811a79457d011b4f675f1a72b6613928bb0083d01bfe65bb4c333628725b300efdb7cf10ebc6f26ff03733886c20f25c7aef80875e81e59bda9fd7d3 SHA512 23153f5b57d210e37cd6e9e0fced23bdabb1c67476e9fb50eb83a68ae066a5c3675822472f5d558d10ddf36ac1d73d538b75304d112a1bfcd8d0bbd26c6481a5
 DIST proj-datumgrid-europe-1.6.tar.gz 189057258 BLAKE2B 66daf2341b05d8d5f929f6d67e1913656c2380a3663b4359cb97576ff5954dbea5890862869bb1077f6cde760dada4d9f13201c5b2c29ef3458a8b43089e459c SHA512 463d2575d5ce6f5984e69897c34ef80ec31a77f5ba00a07a5f55e97c3033dbae40b7d17891e5495bc47e6faf917968b1cdb7b3be9b2a4838e3b093b74753c2a8
 EBUILD proj-7.2.1-r1.ebuild 1217 BLAKE2B 07af488ae5410186a41cc59bf7d97ab6a5d461d0a674b7b28cf8965294173da4247dbc41cb46748b58e47a74613df2cafdef30b641353a90fcb23c96813839a4 SHA512 41bafe9de36bd37ac3d1a2e3fc44b22cf95b06547ed2f69d418f4134b569bda3b94c4e11b6e2ad3adab9441ab70921b9a421facc77dc26645b08598232422efe
-EBUILD proj-8.2.1-r1.ebuild 1488 BLAKE2B 2fefdd3ed48bcae40c0627909d5f235f9b1ee151246ecec9878e62cbd74b623a4201e6abaf12d117e310e49c670629014e4c674619004816677d1f18af6eb7a3 SHA512 4fc7d78c7f5bfb4149437b611b649bbc61b3bcc858263472b0f129eca3b524247ec54d1e68054e721770d861f0d06beefc02bfa5b76bb3ca885dc0c22b545a4f
 EBUILD proj-9.1.0-r1.ebuild 1470 BLAKE2B 8294b6d79f290a8541431d9e568273d445640c6aa61b83e72b78ffb22658ce12f749680dcb624df516a247f88df303a50566fee062f926c104a8d93c44b439e1 SHA512 5518c8aadf0a7f25ec428ee9f6fd34c22d7b0d5e6cad47880631cf1abf8c739cdcd6c1e2feb0f3f51ecaf35256d6c497ae9ac223d51864fbe1c8c67300af3121
 EBUILD proj-9.1.1-r1.ebuild 1482 BLAKE2B f3eb157d739c820c7cd2780e5c7620bce6cdabfebfba03a4ae29ea26c719b65dafee2cf36838585274425b1fbf9e4e8cd0123e5cb987e8caea36c89f5e396702 SHA512 52f47c5c7a2e3de62deeb4ab085276e0210f42792579fc5b2e9e68b85862196703912c3ff15d020db6c28f11af55702da030b200269561514d5ea67986c02fb3
 MISC metadata.xml 450 BLAKE2B a29666b3ab3d0e39d3d2ab247f250cd4f9a716ee1f01563e8d6739f507b96f553187999c6fcd501a0f8e9a564f7e5fe3a54c29dd985d1f91873da8252840ebf7 SHA512 c319fbe8249838dc881424641a19abc639d4a74d585e434be1a27802eb9fa88711a1c631ba92abd333d7baaa739b1c98faebe7c20ce7c1a4639d38b9dbe40381
diff --git a/sci-libs/proj/proj-8.2.1-r1.ebuild b/sci-libs/proj/proj-8.2.1-r1.ebuild
deleted file mode 100644
index 98ed794008f6..000000000000
--- a/sci-libs/proj/proj-8.2.1-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-# Check https://proj.org/download.html for latest data tarball
-PROJ_DATA="proj-data-1.8.tar.gz"
-DESCRIPTION="PROJ coordinate transformation software"
-HOMEPAGE="https://proj.org/"
-SRC_URI="https://download.osgeo.org/proj/${P}.tar.gz
-	https://download.osgeo.org/proj/${PROJ_DATA}"
-
-LICENSE="MIT"
-# SONAME in 8.1.1 is actually 23 (in 8.1.0, was 22)
-# ... and now 8.2.0 is back to 22 again.
-# Please increment to 25 on the next SONAME bump, even if it's not
-# going to correspond...
-# It's far less confusing to just increment it again here (so N+1)
-SLOT="0/24"
-KEYWORDS="amd64 ~arm arm64 ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="curl test +tiff"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-db/sqlite:3
-	curl? ( net-misc/curl )
-	tiff? ( media-libs/tiff:= )"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-
-	cd "${S}"/data || die
-	mv README README.DATA || die
-
-	unpack ${PROJ_DATA}
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DDOCDIR="${EPREFIX}"/usr/share/${PF}
-		-DBUILD_TESTING=$(usex test)
-		-DENABLE_CURL=$(usex curl)
-		-DBUILD_PROJSYNC=$(usex curl)
-		-DENABLE_TIFF=$(usex tiff)
-	)
-
-	use test && mycmakeargs+=( -DUSE_EXTERNAL_GTEST=ON )
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	cd data || die
-	dodoc README.DATA
-
-	find "${ED}" -name '*.la' -type f -delete || die
-}