7 files changed, 14 insertions, 119 deletions
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 5c2f8bbf0cf3..9fb01ea5eace 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/psqlodbc/Manifest b/dev-db/psqlodbc/Manifest
index 9f5e38f424be..d4931446c067 100644
--- a/dev-db/psqlodbc/Manifest
+++ b/dev-db/psqlodbc/Manifest
@@ -1,9 +1,3 @@
-DIST psqlodbc-11.01.0000.tar.gz 919372 BLAKE2B ce84b4bb210c4c3c3f2a3e9eae713c875e4bae491e20f207f740a02af69cb771f504de6b1da06fcd12306d986299e1537184a6787eac80e320eea6d8c13dc142 SHA512 57762bfa9925012946e56a3d5b815af00078299c121ba0142865c06f877cabf314512e4e6efc654589fb409c4dd2cbb9a3b7fd7aa1a6ace361879552774b11d7
-DIST psqlodbc-13.00.0000.tar.gz 940031 BLAKE2B 346a06b5b7b16ead1d87b7bdadcd050102b1b30e19d7bf236e134439711e4832b193241d6ea02b5628a64afbfad77b0c6d3bdf921fd3ae3a5cf696a58100e53c SHA512 c8d5cb0ce304e702f3c6f0b2e1c681df283973a8459a820f92df806814659eb15668c38a855a69b44cf5ebe459283bef1ca1cba44df0fe16a361e614f5481bc7
-DIST psqlodbc-15.00.0000.tar.gz 945814 BLAKE2B 0170ae9bcd1a77b0655b4d33543a7cca3551d845d8a36dd5d809567e7d7669defb278790f169a80757d41ffb5cbbfda68f0536f4fe25698e85a1fe570736409c SHA512 ae511edb9889e6cc7d05d11ee384db1aa1a52b9cac035b3449b03ab91ada5cc0d737fef34addd4be6a3ef839b68735874ee7125be9ae272328c44631fd2269e2
 DIST psqlodbc-16.00.0000.tar.gz 946997 BLAKE2B 9a4d787b1a29bb8ce874473fb126db7677ebc5e37f502b34c877341aa04c77c8acbb4d2353929631c7949ef9b482091b2dfbddf6934005d66446797bf8abcc22 SHA512 ad971cd29e431225d03faf5ebc0ba7a9f17d20dd70106867f05df8dc1e509413d4db533101a1b3418480ad758b7626c178ec345c5ff7e9409f7fcfbea9427166
-EBUILD psqlodbc-11.01.0000.ebuild 690 BLAKE2B 9f70ec2a0c718567611936ac3cadadee457a2338bb3792ed4a14ff2f84ca4f7c70b1d63b2a731abac47530e17436af414f0c0864ee7aa58717efc2866116cea9 SHA512 308f135df50933cc6a0a41cfe5cc1468bad9e76163383e73101437eb8011d0e45dcdbf34ac50f4cda354aeb3357d439254baa2022e3952f92681c8509a36ad12
-EBUILD psqlodbc-13.00.0000.ebuild 727 BLAKE2B bcdb118196c22fdf7224888d82749c34552d3f968798d883ad7306bcde8ce15a9178dcc288781088822b6b952cbbb844b3031cfafd68d33b4f29a8f3bf166bbe SHA512 d0d5a2f32e1c1ba83b5af483eef438eec84616eb46939609789c475e40996df7a0d014d2b434874474cdc96de1834ef41458e4308b7f6b6ac7b22d5dc05d20e3
-EBUILD psqlodbc-15.00.0000.ebuild 727 BLAKE2B 99d9aef213a81973531cf93b8780970aed255f7597eefdbae065b5064faed127221d4b14f5004015f1264c90065d65c689fb1efe76b21730d3337e570c19804a SHA512 5991ac6e312f0f47438b95a4dc192d60a97e09a6e4bf56d0e1deb4f28c4b4c322dbd33ad061db13481a3923ac2ddc0f941f7079e6080abe0773ce96fec390808
-EBUILD psqlodbc-16.00.0000.ebuild 808 BLAKE2B 589e4c4e0c594f3b3134f7c5708ff4a4032e9eede25021afbb058603a760738941823c1e0c0c45e40c8a7786d548f01646be461cf375c64693b68a366c92ce9e SHA512 82e0a58e46367f6f1502d8818bcca630741dda0765ba115dbd09cdecb31c6e370488da279bfcafb5e49c97b646f7e12a7a58451474c899d85ced501845035b07
-MISC metadata.xml 389 BLAKE2B a8b15e826ffaaa01a299f5500c8d6ed57ffc4d387e4874af0f61d2a04b9e83dc825efc33bf254b1f1f712f6c151937eab607ba26ddd148a4c72bb090ded5c294 SHA512 cc7a0ea725654842c246f8a4d56cff2cd6186209f5232689845739d9ddde789df42bb914011df607313306afdf414a12f719e04517b5e7b58e4bb7f738d3bd12
+EBUILD psqlodbc-16.00.0000.ebuild 806 BLAKE2B d29585a457bee2f8bd7eb8a1f2eb2d01c5849f3c58a6726a1f6308d843034e4feaf80b32ea3740d1a2c8bbe37203c3b23016e5526361a23414deb9e3f1f36f58 SHA512 d71a7f32b8aaa36fac39ed7610ff85e95b638cc9a6bfd024cdb53b6a91e4b102dc4a16ff04aacd3eb158402ae909c46c5c60aad131ed12733a6165a410665776
+MISC metadata.xml 494 BLAKE2B 7d2a03027774a4b0ed698f354a4b94481084d735c54c2f1144626d9415fc6e84a7f0cf3cf042f9ebde74714f2128f3f238ad9b9395decd2637c5acc56f984418 SHA512 506f1c11f0b628abea1d849af201dbd237bad3658f0ce0119ad23abf06f7b3b86c1db9c71294f027436835dfa4b7637e908bd897a2d23eb9b2949fb3a741dc7f
diff --git a/dev-db/psqlodbc/metadata.xml b/dev-db/psqlodbc/metadata.xml
index 30ac10c32727..ed5be1480c95 100644
--- a/dev-db/psqlodbc/metadata.xml
+++ b/dev-db/psqlodbc/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-<email>pgsql-bugs@gentoo.org</email>
-<name>PostgreSQL and Related Package Development</name>
-</maintainer>
-<use>
-<flag name="iodbc">Use <pkg>dev-db/libiodbc</pkg>. Disable to use <pkg>dev-db/unixODBC</pkg>.</flag>
-</use>
+	<maintainer type="project">
+		<email>pgsql-bugs@gentoo.org</email>
+		<name>PostgreSQL and Related Package Development</name>
+	</maintainer>
+	<use>
+		<flag name="iodbc">Use <pkg>dev-db/libiodbc</pkg>. Disable to use <pkg>dev-db/unixODBC</pkg>.</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">postgresql-interfaces/psqlodbc</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-db/psqlodbc/psqlodbc-11.01.0000.ebuild b/dev-db/psqlodbc/psqlodbc-11.01.0000.ebuild
deleted file mode 100644
index 2e25f4eb74be..000000000000
--- a/dev-db/psqlodbc/psqlodbc-11.01.0000.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Official ODBC driver for PostgreSQL"
-HOMEPAGE="https://odbc.postgresql.org/"
-SRC_URI="https://ftp.postgresql.org/pub/odbc/versions/src/${P}.tar.gz"
-SLOT="0"
-LICENSE="LGPL-2"
-KEYWORDS="amd64 x86"
-IUSE="doc iodbc ssl threads"
-
-DEPEND="dev-db/postgresql:*[ssl?]
-		!iodbc? ( dev-db/unixODBC )
-		iodbc? ( dev-db/libiodbc )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	econf \
-		$(use_with iodbc) \
-		$(use_with !iodbc unixodbc) \
-		$(use_enable threads pthreads)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc readme.txt
-	use doc && dodoc docs/*{html,jpg,txt}
-}
diff --git a/dev-db/psqlodbc/psqlodbc-13.00.0000.ebuild b/dev-db/psqlodbc/psqlodbc-13.00.0000.ebuild
deleted file mode 100644
index eb5492ff004f..000000000000
--- a/dev-db/psqlodbc/psqlodbc-13.00.0000.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Official ODBC driver for PostgreSQL"
-HOMEPAGE="https://odbc.postgresql.org/"
-SRC_URI="https://ftp.postgresql.org/pub/odbc/versions/src/${P}.tar.gz"
-SLOT="0"
-LICENSE="LGPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc iodbc ssl threads"
-
-DEPEND="dev-db/postgresql:*[ssl?]
-		!iodbc? ( dev-db/unixODBC )
-		iodbc? ( dev-db/libiodbc )
-"
-RDEPEND="${DEPEND}"
-
-# No tests to run
-RESTRICT="test"
-
-src_configure() {
-	econf \
-		$(use_with iodbc) \
-		$(use_with !iodbc unixodbc) \
-		$(use_enable threads pthreads)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc readme.txt
-	use doc && dodoc docs/*{html,jpg,txt}
-}
diff --git a/dev-db/psqlodbc/psqlodbc-15.00.0000.ebuild b/dev-db/psqlodbc/psqlodbc-15.00.0000.ebuild
deleted file mode 100644
index 3970af804572..000000000000
--- a/dev-db/psqlodbc/psqlodbc-15.00.0000.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Official ODBC driver for PostgreSQL"
-HOMEPAGE="https://odbc.postgresql.org/"
-SRC_URI="https://ftp.postgresql.org/pub/odbc/versions/src/${P}.tar.gz"
-SLOT="0"
-LICENSE="LGPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc iodbc ssl threads"
-
-DEPEND="dev-db/postgresql:*[ssl?]
-		!iodbc? ( dev-db/unixODBC )
-		iodbc? ( dev-db/libiodbc )
-"
-RDEPEND="${DEPEND}"
-
-# No tests to run
-RESTRICT="test"
-
-src_configure() {
-	econf \
-		$(use_with iodbc) \
-		$(use_with !iodbc unixodbc) \
-		$(use_enable threads pthreads)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc readme.txt
-	use doc && dodoc docs/*{html,jpg,txt}
-}
diff --git a/dev-db/psqlodbc/psqlodbc-16.00.0000.ebuild b/dev-db/psqlodbc/psqlodbc-16.00.0000.ebuild
index eb924528a69d..6dc2af90535f 100644
--- a/dev-db/psqlodbc/psqlodbc-16.00.0000.ebuild
+++ b/dev-db/psqlodbc/psqlodbc-16.00.0000.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -8,7 +8,7 @@ HOMEPAGE="https://odbc.postgresql.org/"
 SRC_URI="https://ftp.postgresql.org/pub/odbc/versions/src/${P}.tar.gz"
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="iodbc ssl threads"
 
 DEPEND="dev-db/postgresql:*[ssl?]