gentoo resync : 25.11.2020

6 files changed, 5 insertions, 75 deletions

diff --git a/dev-db/pspg/Manifest b/dev-db/pspg/Manifest
index 9fcdd9c9525b..a982966bd2a3 100644
--- a/dev-db/pspg/Manifest
+++ b/dev-db/pspg/Manifest
@@ -1,13 +1,5 @@
-DIST pspg-1.6.5.tar.gz 1005525 BLAKE2B 2befb8a7081e1fcf5df60eca48f34b819d9de3d07920613b7f759887b4ddcccbc52e46ea8f407666a50a53bbfda582a10b1b2ca65d0c4452bc46db8cd971a802 SHA512 755e40dd6c68a01ad235e6fc2751af76c8ed63c2832bfa26356fa80e62bd59a076413cf7fc075685f9267bc7339fadf4975a695d681fc7821b7da0589805c1f0
-DIST pspg-1.6.8.tar.gz 1017316 BLAKE2B 0150b4577365000b2fdd9de93307acbb5133915917c92affd1a598b3f16769ff0afa6e0b9c0d4639b771dcd62f1f7364a028a3b9d96cc6c40e3ac41c550a8d48 SHA512 337ae1eb9e92dc97ca32127322aaa3d0c5edb8766e5cab16e778148b3256119c7c5b1b2e4b6ab0b520113ede07c464d1c1c5e460c8efb7714f5a29acfa845e9d
-DIST pspg-2.5.4.tar.gz 1346559 BLAKE2B 01c0a35a6372ccb7ad007595d01eb0c8380428722418a4f4b6040a549757d2eab601371ded51a762d81677adc259abf5f8af4311fca6427fb24244e0c33035d2 SHA512 2a9c677bbff4eb032403b90f44dbe9f62a46775c1cf180e90fc3df2853973c4b584b674fa11e2b3be844402f5c00777388ff05782fdecee3b27d92280fc288ff
-DIST pspg-2.5.5.tar.gz 1346896 BLAKE2B 7b5b64affcc6ec52ae9712fab06089db3a8ae208d94190fa6695d2285d29a13ac2c5ca3854a1a13ec6907eed04dd6bb188b31cc6440963a069a2715ecf109eba SHA512 74e8c8c5a156d9115a2bc6c9957d302b5e48182181c9560100c09dea765f9a382d78b5fe74ca11fdccd40bdd2f8a165218edf89ffd7713e479f0443a49766c4d
-DIST pspg-2.6.6.tar.gz 1355951 BLAKE2B 134f6af029f070bac66e9f514fee985b7ce77f788b44280cc4df969801d2776a60aa9dd679ae848c4fe68ce58d593c10fd1e2305734d0f76e08f1d2e51ad17bd SHA512 963a4bb3e93880c5dd8538b2ba777977585b2e9766a29001f1e5dd8d4692ccc333cf8bdcf0d7ae3f0cf02568e5645d4534cc58dc540d22df5debc5b4e034114c
 DIST pspg-3.1.2.tar.gz 1368987 BLAKE2B 7eff4134ee97db4df4dfada08ede5e88ea0c37a681c95ba9529f30be98f05cb3a7805e5dcb165b34f5afc2d4d7ca6de0e705334967ade0fdb813636c73df658d SHA512 1446200bdfe88787083da32629acaedab6eaee68b3dccbff3f52c82165029cb0f558790951d5103876c84562fcd6b5578042bca134f4ed37b9c5de96fdc5602f
-EBUILD pspg-1.6.5.ebuild 375 BLAKE2B 1eb56e1d31c91e2766faf5f196d3c7498cc7006b0715f57af5e879f2a65a93bd7061330bb278c193792ead58752fea4de8bc39523b35da546e6896373bd374af SHA512 bce1d5b5642d92cc5aae26905b48e940699f42fcad58b4df3988effa9f14a51bfee55cee95eb72f65a810c99ab59576728e5b63377770f149a2dbf470cd20f86
-EBUILD pspg-1.6.8.ebuild 377 BLAKE2B 59e6f8cefb4a9347304231161958a8915a8cf375dd2096b4d1fdc19b00d3fa4093780ac7b33a78814673191514fbb5d965f5d7c5904b63a9abeab6a9f82819a2 SHA512 589f39286408970b9118c3cad7a343278adbd1c539d42e92bd293cf549c8ba5064a77a23649e55d60559e5a1380e77a92647ebb7a25716cbf7cb28a5389bc26c
-EBUILD pspg-2.5.4.ebuild 417 BLAKE2B e546c8ac11ad8abeb004a3471ef1aa09c8c75c14d84e8598d1743227183c9bba787280aad2c168e8db72ff5b0fdf6517e9941179de55b47bbb0756338bc16d34 SHA512 59a6ae7ac90bc01e5628133110a63f00ab5bdde45c8b21d886efc1a9e7209dee24ebc2f1e30a63fdabb06ab04242c4bc16df2b7fa34086de52d1d3fac3171f6f
-EBUILD pspg-2.5.5.ebuild 417 BLAKE2B e546c8ac11ad8abeb004a3471ef1aa09c8c75c14d84e8598d1743227183c9bba787280aad2c168e8db72ff5b0fdf6517e9941179de55b47bbb0756338bc16d34 SHA512 59a6ae7ac90bc01e5628133110a63f00ab5bdde45c8b21d886efc1a9e7209dee24ebc2f1e30a63fdabb06ab04242c4bc16df2b7fa34086de52d1d3fac3171f6f
-EBUILD pspg-2.6.6.ebuild 415 BLAKE2B b60c5abaf49da08566e205a33fa33030a041b3df0882348dc5eb0ea3a0b90fcb885c4ac2f41ffb054ee80bd105c9f707f4f576bff71c2e4dca3e80a4ad0ed594 SHA512 243e3124bd436d36081aa7a7b0250329a2c772b94d55438faefcb6d4c4e923a9e5c102c37ab5011cd2e057c3b24535d11822a862956a8d0e59f92ea929e9a6ec
+DIST pspg-3.1.5.tar.gz 1380515 BLAKE2B b9539347d1977a178468127df5f92f8b7be835b7e6edc49720131173b71b22e01b614bcde55e354d32a2ecf1665dcebd27502110786b7595411b5ec782391f01 SHA512 287d4794aebc867bf3c344c3747f1d058c1b93710dd0d86de66ae1e0d97961f4e3d511bc0f7df98c309bffc962aaf50b758faab1f8c6f0eb3374450e53ecdccb
 EBUILD pspg-3.1.2.ebuild 415 BLAKE2B e39731cc67c2684c649d2fd54c52fa00c972f151018f0033ce85064020630fee1065c55cbbd6b83a974592844dae17692f8c7c1160a2fd31bb75a3522d392ea1 SHA512 9a108eb787dd60342bb60c5a377ba6430a3f5995215fe7ef2ac702c099a905c4e847d14f8a297acd2d1faaebb83aa4ac22d1abfa86a87bfb3015aec8b65126cb
+EBUILD pspg-3.1.5.ebuild 434 BLAKE2B d552756257d7e3eb4cec907b899ac3f9a837c19475446bea99abf01be7fe5a1c4a0e127c429a94e629fa2c0a60230f1180028ef2b1e7bbb167190b2b4bc765fd SHA512 ae700be2aa4c09491cf14c74dbbe71e943a12bddc9d3f11656b3d4661c99d2ad4cc05543b8c6a1846b05268cb76ccd429d8fda188f183357d5670b79b95e976e
 MISC metadata.xml 298 BLAKE2B 40abb765b052aa2cbbf749c54c686f1c98968cb1af2e93c149bfbfe6244d3c17e827189d7a1da90a566016758bfbed63b16ad0a0328725349748d1b18b2437b1 SHA512 167896d1d92ccb4b171cce16d63405369a9e28b0d01c12b2ed94fcec1f982892e179c007287fc3386e1c00393d6570a2ae9e8efe9420e53a82308426075d5c89
diff --git a/dev-db/pspg/pspg-1.6.5.ebuild b/dev-db/pspg/pspg-1.6.5.ebuild
deleted file mode 100644
index 15ddb24f19d5..000000000000
--- a/dev-db/pspg/pspg-1.6.5.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A better pager for psql and mysql"
-HOMEPAGE="https://github.com/okbob/pspg"
-SRC_URI="https://github.com/okbob/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND="sys-libs/ncurses:*"
-RDEPEND="${DEPEND}"
diff --git a/dev-db/pspg/pspg-1.6.8.ebuild b/dev-db/pspg/pspg-1.6.8.ebuild
deleted file mode 100644
index fd99e424e3bc..000000000000
--- a/dev-db/pspg/pspg-1.6.8.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A better pager for psql and mysql"
-HOMEPAGE="https://github.com/okbob/pspg"
-SRC_URI="https://github.com/okbob/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="sys-libs/ncurses:*"
-RDEPEND="${DEPEND}"
diff --git a/dev-db/pspg/pspg-2.5.5.ebuild b/dev-db/pspg/pspg-2.5.5.ebuild
deleted file mode 100644
index e802ac47a294..000000000000
--- a/dev-db/pspg/pspg-2.5.5.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A better pager for psql and mysql"
-HOMEPAGE="https://github.com/okbob/pspg"
-SRC_URI="https://github.com/okbob/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="sys-libs/ncurses:*
-dev-db/postgresql:=
-sys-libs/readline:*"
-RDEPEND="${DEPEND}"
diff --git a/dev-db/pspg/pspg-2.6.6.ebuild b/dev-db/pspg/pspg-2.6.6.ebuild
deleted file mode 100644
index c9506ef83e56..000000000000
--- a/dev-db/pspg/pspg-2.6.6.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A better pager for psql and mysql"
-HOMEPAGE="https://github.com/okbob/pspg"
-SRC_URI="https://github.com/okbob/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND="sys-libs/ncurses:*
-dev-db/postgresql:=
-sys-libs/readline:*"
-RDEPEND="${DEPEND}"
diff --git a/dev-db/pspg/pspg-2.5.4.ebuild b/dev-db/pspg/pspg-3.1.5.ebuild
index e802ac47a294..4ea4a57c2c3c 100644
--- a/dev-db/pspg/pspg-2.5.4.ebuild
+++ b/dev-db/pspg/pspg-3.1.5.ebuild
@@ -13,5 +13,7 @@ KEYWORDS="~amd64 ~x86"
 
 DEPEND="sys-libs/ncurses:*
 dev-db/postgresql:=
-sys-libs/readline:*"
+sys-libs/readline:="
 RDEPEND="${DEPEND}"
+
+RESTRICT="test"