Merge updates from master

5 files changed, 2 insertions, 70 deletions

diff --git a/dev-db/citus/Manifest b/dev-db/citus/Manifest
index ba05405e6711..293f142610bd 100644
--- a/dev-db/citus/Manifest
+++ b/dev-db/citus/Manifest
@@ -1,4 +1,4 @@
 DIST citus-11.3.1.tar.gz 6623462 BLAKE2B ef07fb1e6cf0dd3f49600c3befcb300d47244393dd3bbe01450a8cb7bdb40adf1b7c6d7cf473ac80c466fc5dd4d6e0f5a62d1a587804d74011dda65731431028 SHA512 481d74cdf0e8de86b918fc73ed72f988f42679a827a39e7d89e2d0ebb0447d629dbaf323099dc97e886ea3012539200831f580bfe0cf3a12ef1f3a7bfe3fab42
 DIST citus-12.0.1.tar.gz 6740395 BLAKE2B ca004f8026d94c1ed70c9c7450726287aff415c13b80b93d25a19fbae9a79cbbeaec51521fc7922d5574c75bddb9537d42d656121ca586f4512afe773be5bf76 SHA512 db9b882c63ef6ab848a85d547390d4fc61b97056485dcc8fa51c289a302b78d0de959e29c27a91c494fd3e20491f6a96e96436d8766d02b2770f0e375b94564e
-DIST citus-12.1.2.tar.gz 6897486 BLAKE2B 6cbd65cf0cefc5bbe4abcedbeaece8c9a123a05d0d6b812d95cea69153843fd187ff67ce0e99e19758f43569b7e38379294c3c1551f7751ffcb5a6d025800f1a SHA512 00ca6d7053c91671c894bb2afec25ba2a38aae50b6f363a1e63e08e4f3016e43739c9a48b20d93afecb5cc0f2d886fd12318dd8f54f67c052baca2d421882828
 DIST citus-12.1.3.tar.gz 6905546 BLAKE2B 6ece3bb20dfdad3d9413a17dc4b9177ae3cb8829e692b37bd226c60cbb1fa1e827e9de6f833d31c65835ab040593e0cc5fe4b6b0c8b0314306313cd88533e622 SHA512 2bcd5fa83e4fa56b90a3a3873229d3c5a294a0483d031d04ebd9602132883dc54485ca0907b867cd545f9b131a5f8cdeecb2e7e500b46d87f01aa5d5a34ff16f
+DIST citus-12.1.4.tar.gz 6906485 BLAKE2B cb5ed7c53449c7497693cfff69f360e43ab10acc7ac8b7a7be9bcb4e7440dbdd0bd2a85bbbac25e62b43be3040301e11180e1c797b9f6c7a56fbdad2b0cd4bf3 SHA512 c4f7cd8f6f2f72b66de17ae529590518d5c62654d6e1393a4c7b2f1d8b2f9c70e7d4e1f07aef3434272f84edc92d299a0c9df00934b1f065a0997c6fc5274913
diff --git a/dev-db/citus/citus-12.1.2.ebuild b/dev-db/citus/citus-12.1.4.ebuild
index 6f1052ed0c2d..6f1052ed0c2d 100644
--- a/dev-db/citus/citus-12.1.2.ebuild
+++ b/dev-db/citus/citus-12.1.4.ebuild
diff --git a/dev-db/timescaledb/Manifest b/dev-db/timescaledb/Manifest
index 3990ebaa2357..230b785bcbd6 100644
--- a/dev-db/timescaledb/Manifest
+++ b/dev-db/timescaledb/Manifest
@@ -1,3 +1,2 @@
-DIST timescaledb-2.14.0.tar.gz 7316149 BLAKE2B d646e20d56ced87f3b95a7a58ed30bcbeec571b1042b64c2fef4f8521248db2142f54cb45d2afbbeb902e451823615fde1bb0259b421350928c146634db9c4d5 SHA512 75a66a51de313fa1beb4a576181888dbe742ffa0325b5813b5b12749c9fc97705eaa030186e424a360ee20745226768a679632182c079117586c5e4a5c108236
 DIST timescaledb-2.14.2.tar.gz 7319288 BLAKE2B aa6d56939a4647f9276743cabece77c33760e7f9d451b90aaa03c9391fcfad94afcd315b65c0c589c7188073884bf7ab65f9c796e35f634b8704f334ffa4ac34 SHA512 5a7ab4df5d89b83d423be5d6770098ab0303b22e29166afd3ab91ac2199571df20e33ec9f40bfa90ddf44829571fe696f311d81d27b46d569f2d75e75970e4f9
-DIST timescaledb-2.15.0.tar.gz 7428047 BLAKE2B 6806def8ec01213b81d545817048af569a7b43ab88397e51d25dea680780e7764d9ec0bd638cb9deca6a7492d9a2b0e792adcc46a794cacde83d62c23c09dd83 SHA512 fe2ccc0baa4ec39773a9258142fd287f4ff3c296a39bc19daa75d30a5e3755efc4aa902c00e4e1030f4d5203b95c31c0493a5eb78aed6a26d8226930d1e2aef8
+DIST timescaledb-2.15.2.tar.gz 7440309 BLAKE2B eedec0a989ed216704d14b840ed2113e335dd5594a74f4c20e3aa369dade97f0566d777484758bb7e270720155b2b20a029e6922fb3a141a1346f7d68df2777c SHA512 956f828a282638945037a5c7a8eaf39a1698de5e40ab89b8a60af5a4e5585fdf17eeeafc34e90f03df4a13bbe95466245babb09845a2020f65c77183fccce78e
diff --git a/dev-db/timescaledb/timescaledb-2.15.0.ebuild b/dev-db/timescaledb/timescaledb-2.15.0.ebuild
deleted file mode 100644
index ec3d2f7794de..000000000000
--- a/dev-db/timescaledb/timescaledb-2.15.0.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-POSTGRES_COMPAT=( 13 14 15 16 )
-POSTGRES_USEDEP="ssl"
-
-inherit postgres-multi cmake
-
-DESCRIPTION="Open-source time-series SQL database"
-HOMEPAGE="https://www.timescale.com/"
-SRC_URI="https://github.com/timescale/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-IUSE="proprietary-extensions"
-LICENSE="POSTGRESQL Apache-2.0 proprietary-extensions? ( timescale )"
-
-KEYWORDS="~amd64"
-
-SLOT=0
-
-RESTRICT="test"
-
-DEPEND="${POSTGRES_DEP}"
-RDEPEND="${DEPEND}"
-
-CMAKE_IN_SOURCE_BUILD=yes
-CMAKE_BUILD_TYPE="RelWithDebInfo"
-BUILD_DIR=${WORKDIR}/${P}
-
-src_prepare() {
-	postgres-multi_src_prepare
-	postgres-multi_foreach cmake_src_prepare
-}
-
-timescale_configure() {
-	local CMAKE_USE_DIR=$BUILD_DIR
-	local mycmakeargs=( "-DPG_CONFIG=/usr/bin/pg_config${MULTIBUILD_VARIANT}" "-DREGRESS_CHECKS=OFF" )
-
-	# licensing is tied to features, this useflag disables the non-apache2 licensed bits
-	if ! use proprietary-extensions ; then
-		mycmakeargs+=("-DAPACHE_ONLY=ON")
-	fi
-	cmake_src_configure
-}
-
-src_configure() {
-	postgres-multi_foreach timescale_configure
-}
-
-timescale_src_compile() {
-	local CMAKE_USE_DIR=$BUILD_DIR
-	cmake_src_compile
-}
-
-src_compile() {
-	postgres-multi_foreach timescale_src_compile
-}
-
-timescale_src_install() {
-	local CMAKE_USE_DIR=$BUILD_DIR
-	cmake_src_install
-}
-
-src_install() {
-	postgres-multi_foreach timescale_src_install
-}
diff --git a/dev-db/timescaledb/timescaledb-2.14.0.ebuild b/dev-db/timescaledb/timescaledb-2.15.2.ebuild
index ec3d2f7794de..ec3d2f7794de 100644
--- a/dev-db/timescaledb/timescaledb-2.14.0.ebuild
+++ b/dev-db/timescaledb/timescaledb-2.15.2.ebuild