gentoo resync : 29.12.2022

3 files changed, 28 insertions, 30 deletions

diff --git a/dev-db/cockroach/Manifest b/dev-db/cockroach/Manifest
index b9a06c99574c..93bffd4f5e89 100644
--- a/dev-db/cockroach/Manifest
+++ b/dev-db/cockroach/Manifest
@@ -6,6 +6,6 @@ AUX cockroach.initd-1.0 1676 BLAKE2B f74872fe73a571ad29e4c85193c35f1c139ce316b95
 AUX cockroach.initd-1.0.1 1820 BLAKE2B f3080961c251e23a01c1e5664a0112d5cab809278bfb4d1d2dbb388bb483c519e08f87e528c2c3b35519b3781890815a574442828b93913de80c5459a79454e6 SHA512 df0c06bb6ee97c3f531250486ca1fe3d2333c1e280e2d0acb24c9aa061bd6ba35358504e29bf934a382e0a677c812e6dd474e78fcab1cd5188e93e8082748e04
 DIST cockroach-v19.1.1.src.tgz 103054418 BLAKE2B eaa4f0e24f74a4bbc9a209b8778431ddc7944d0735eef0e136cfcdf820e70ad17eb4781757c325906e65d56d4c36881c294e0dd79d9e153359be859fc7ee887a SHA512 a7051fea3808b785e8d0047b0273021119d0eb1d12f5c680afa649713a79b155aff0bfa8ec123eebea095549308d002ba82dee3eb94b66c6f729d80115d20c06
 DIST cockroach-v2.1.5.src.tgz 89931919 BLAKE2B 7ed310acf18cbe7c8bafe5992edd3350d9e7654cda86931dbfd64fe17043140132ec019de9f1f44d61bc92d2461618c81e60fffb014446521e747a57f6b5d442 SHA512 3ef2ad985b463e681cdaffe5590543024ca11e9c0c5528415b47bdd4cdfd42504cbc21a350449fea6da08625f801ef94fe51f55be1e9a62bac27fce0cc7b73c1
-EBUILD cockroach-19.1.1.ebuild 1824 BLAKE2B 11514ea1b9923318be05fe7958aadae67795dc00620ae7191a1ade866dc4e31468130d30e7493d5e87e5d8427a02a6055728979f6b01120ac9b4fc14472707f7 SHA512 5ed2cc7899152a98314aca9d39b3791c14b838b9621011ab23d9e69a968ea37af923e5ce22e147ec7309433a3ef8e1e5e5e587b71174a962c039f2071c8f5039
-EBUILD cockroach-2.1.5.ebuild 1824 BLAKE2B 11514ea1b9923318be05fe7958aadae67795dc00620ae7191a1ade866dc4e31468130d30e7493d5e87e5d8427a02a6055728979f6b01120ac9b4fc14472707f7 SHA512 5ed2cc7899152a98314aca9d39b3791c14b838b9621011ab23d9e69a968ea37af923e5ce22e147ec7309433a3ef8e1e5e5e587b71174a962c039f2071c8f5039
+EBUILD cockroach-19.1.1-r1.ebuild 1573 BLAKE2B a58729082e9f4e6d04dbc9475049930a81b1437916e6337ff2c3400e469b2d40fed7a70d61b32ee78db21933b487d7acb229154d17564b7bc5a7cf88e90d3fd6 SHA512 efce0b4490a211a1ab5ac614b166a3e7e58977cab9d70759d8d71683c72d20961ad7de919069da79351d6c27d248659c6c6f05eeba194e648c8134cc134bf3b9
+EBUILD cockroach-2.1.5-r1.ebuild 1573 BLAKE2B a58729082e9f4e6d04dbc9475049930a81b1437916e6337ff2c3400e469b2d40fed7a70d61b32ee78db21933b487d7acb229154d17564b7bc5a7cf88e90d3fd6 SHA512 efce0b4490a211a1ab5ac614b166a3e7e58977cab9d70759d8d71683c72d20961ad7de919069da79351d6c27d248659c6c6f05eeba194e648c8134cc134bf3b9
 MISC metadata.xml 410 BLAKE2B dffb906b26ea3eacecaea358d6ca662f32d5603a69f6c3665aab282e614c67da7b421bc0bfdf64d334c8211194f660f89ec0c17400564eed275efffeb729db30 SHA512 803e615b6b04c8c84e6569081f11ffc378f62df17f8bc4ee3439cc4c4e590f6002e0e4d44bd82a90e3b01ae5a62a91f3a3c7f9fc05cf82ae25d695d0a9332c62
diff --git a/dev-db/cockroach/cockroach-19.1.1.ebuild b/dev-db/cockroach/cockroach-19.1.1-r1.ebuild
index b4fd44218a0a..aae348a5ea02 100644
--- a/dev-db/cockroach/cockroach-19.1.1.ebuild
+++ b/dev-db/cockroach/cockroach-19.1.1-r1.ebuild
@@ -1,42 +1,41 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 MY_PV=v${PV}
 CHECKREQS_MEMORY="2G"
 
-inherit check-reqs toolchain-funcs user
+inherit check-reqs toolchain-funcs
 
 DESCRIPTION="open source database for building cloud services"
 HOMEPAGE="https://www.cockroachlabs.com"
 SRC_URI="https://binaries.cockroachdb.com/cockroach-${MY_PV}.src.tgz"
+S="${WORKDIR}/cockroach-${MY_PV}"
 
 LICENSE="Cockroach Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE=""
 
-DEPEND=">=app-arch/xz-utils-5.2.3
-	>=dev-lang/go-1.8.3
-	>=dev-util/cmake-3.8.1"
+RDEPEND="
+	acct-group/cockroach
+	acct-user/cockroach
+"
 
-S="${WORKDIR}/cockroach-${MY_PV}"
+DEPEND="
+	${RDEPEND}
+	>=app-arch/xz-utils-5.2.3
+	>=dev-lang/go-1.8.3
+	>=dev-util/cmake-3.8.1
+"
 
 QA_EXECSTACK="usr/bin/cockroach"
 
 pkg_pretend() {
 	check-reqs_pkg_pretend
-	if [[ ${MERGE_TYPE} != binary && $(gcc-major-version) -lt 6 ]]; then
-		eerror "Cockroach cannot be built with this version of gcc."
-		eerror "You need at least gcc-6.0"
-		die "Your C compiler is too old for this package."
-	fi
 }
 
 pkg_setup() {
 	check-reqs_pkg_setup
-	enewgroup cockroach
-	enewuser cockroach -1 /bin/sh /var/lib/cockroach cockroach
 }
 
 src_compile() {
diff --git a/dev-db/cockroach/cockroach-2.1.5.ebuild b/dev-db/cockroach/cockroach-2.1.5-r1.ebuild
index b4fd44218a0a..aae348a5ea02 100644
--- a/dev-db/cockroach/cockroach-2.1.5.ebuild
+++ b/dev-db/cockroach/cockroach-2.1.5-r1.ebuild
@@ -1,42 +1,41 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 MY_PV=v${PV}
 CHECKREQS_MEMORY="2G"
 
-inherit check-reqs toolchain-funcs user
+inherit check-reqs toolchain-funcs
 
 DESCRIPTION="open source database for building cloud services"
 HOMEPAGE="https://www.cockroachlabs.com"
 SRC_URI="https://binaries.cockroachdb.com/cockroach-${MY_PV}.src.tgz"
+S="${WORKDIR}/cockroach-${MY_PV}"
 
 LICENSE="Cockroach Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE=""
 
-DEPEND=">=app-arch/xz-utils-5.2.3
-	>=dev-lang/go-1.8.3
-	>=dev-util/cmake-3.8.1"
+RDEPEND="
+	acct-group/cockroach
+	acct-user/cockroach
+"
 
-S="${WORKDIR}/cockroach-${MY_PV}"
+DEPEND="
+	${RDEPEND}
+	>=app-arch/xz-utils-5.2.3
+	>=dev-lang/go-1.8.3
+	>=dev-util/cmake-3.8.1
+"
 
 QA_EXECSTACK="usr/bin/cockroach"
 
 pkg_pretend() {
 	check-reqs_pkg_pretend
-	if [[ ${MERGE_TYPE} != binary && $(gcc-major-version) -lt 6 ]]; then
-		eerror "Cockroach cannot be built with this version of gcc."
-		eerror "You need at least gcc-6.0"
-		die "Your C compiler is too old for this package."
-	fi
 }
 
 pkg_setup() {
 	check-reqs_pkg_setup
-	enewgroup cockroach
-	enewuser cockroach -1 /bin/sh /var/lib/cockroach cockroach
 }
 
 src_compile() {