gentoo resync : 02.02.2022

2 files changed, 20 insertions, 11 deletions

diff --git a/sys-cluster/torque/Manifest b/sys-cluster/torque/Manifest
index edf735529802..439cefa02f79 100644
--- a/sys-cluster/torque/Manifest
+++ b/sys-cluster/torque/Manifest
@@ -19,7 +19,8 @@ DIST torque-4.1.7.tar.gz 6218108 BLAKE2B 6c1ad0f1bb3f364603ad7f498999bd910491910
 DIST torque-4.2.10-gh-20150517.tar.gz 5836286 BLAKE2B 7108f1adcb6f674526b7db97df4ebcee04ae5c818d4f35ed1230a4e72e52ec0bc3b44e17334a143b21bcd3acccefc3927eca4f98d54d37745c8bb46a75e07045 SHA512 600bb5389b6a4161732b7aa82627f1ebeae238d7091aa2e223d9a14c44bf4668662f664b976f62ba3f1d8a366f90fb6058a8c904e20c26432dccd6abcd9c57fa
 DIST torque-6.0.4-gcc7.patch 50412 BLAKE2B 43748e9bfd3811abdfeb56f93dd517fcb07a6902194120e2c9e16bbe5bbe0f04afd3f898616d46e0310902a6376671be0c8f3865e8f7dd5381fca46e7ad62fc8 SHA512 430ae6a80ebbfb2066831326f8ce25a34cb6fc17c1fbe4a202c495baceb2b7011c9f6782da31b78c34287f26765c76c587611d689791523b8bd53d634e3681b6
 DIST torque-6.0.4-gh-20170829.tar.gz 6182495 BLAKE2B f9156ae4ffe388a7f3fa0df142e5f2d48c16fd7b8c148a3a80cd1c977eb0c1ef4a455da275f993100867be043422526ed05c53734e707851083d6d23ee1a2cc4 SHA512 8f1101adb89e06617de501f7956e126633b78b495baeb7980d3c534d34537cc604a3cf0a7c23c48eb2554b26cc13672b0e00c75d0f722d63ac4d42d57388ed94
+DIST torque-6.0.4-glibc-2.34-pthread.patch.bz2 6266 BLAKE2B b5175b8bfe2deabe86b067f1ec5269770bcf096c6e875b8fd3cb404a976c9cb550ddcbe6e4ebb1e59c96044f95c285519e70fb4acd5c9db86c3050093ff65b3b SHA512 dbe0bd6000c140e1fe9b36e55c1a844701406a563bd178b9c972793b83282f3434e2160da5280666dcc0934c2b88e36c0a2b9518ffe7695b23d73fce0a07388d
 EBUILD torque-4.1.7-r2.ebuild 7372 BLAKE2B 6d4b19b1c1a57f686bd42f87e5bd3ac4de856e36b0a065dad651fc7a923be7705a92b1935e4eadb4bbb413b78cd6d477d2e79e3d332872e3832e555cd00e8978 SHA512 e4b9c0f4ab43d0f22f95618c4d526ff20c3cc7303a7572dc7a56fd2a8754e95a6590bf455721adb6c22176ff4c194a61027c47665609fdd5178165e2e7cfd0fd
 EBUILD torque-4.2.10-r2.ebuild 6010 BLAKE2B e2dac055f1ad5319dfd9ec324fb00f490002d149ffa866b92280dd2b8a85760be1bec33949dbe455b564e47f9ba322aaa68bf65fb96dd997ccf029ff96d7e266 SHA512 3d1811fe61d688c5d4c282ce1898a91fcc21462321ed0798796ba1cf993457a131ee0a3ee61ea7cc066e02ac3d33aa6d801a91625329f4a39cef28b89e5b3089
-EBUILD torque-6.0.4-r2.ebuild 5505 BLAKE2B b81b228be1d85632f465deeab3433e77d0b851eb11d267d9e6a315364d30145a82dcab855dc083a16210951c69181f54ae974a1237dcf01a0b55a98d1d2c8921 SHA512 cb0bad10bb03ed93ae2e29ec5be2775876b095598b34f1ee41fff81936da477ba8cfe526c90df4964d311a2419423805db0135c91aad34a61610729a27985b27
+EBUILD torque-6.0.4-r2.ebuild 5768 BLAKE2B be2b4fce7d91e9986a30f989132f6a5eadd07da7f875452b7acda2ab37caebd83360fecbb6e11c2fe9c78833e4425a1f7f934fe9ce435d9f55a23926f5e246c8 SHA512 b408193d53535d7bdc36b62613ec97cd19ff35822b9926e72496cc37f5e191adef97c2712b5c39a261101a11e59f9e7d952909d065adcf1d6443b59131b4867b
 MISC metadata.xml 876 BLAKE2B dff45c761bc80096a4cde3ad89bc50f8c74016f1d67802247846c4c06cec77e13d7cc5809e4d93e74c7a4280cec21f3d45d9f0999c2baf26d25fce9a4b38cade SHA512 581ff1715f585ae9b88618ed71e2d901b9154bf256b915a0b73f67386ee02752d584bd3ba191698ca779947801a71995f36e61a5b9ad94390e165526dbfd6de7
diff --git a/sys-cluster/torque/torque-6.0.4-r2.ebuild b/sys-cluster/torque/torque-6.0.4-r2.ebuild
index feb8fad349fe..ad1d843840bc 100644
--- a/sys-cluster/torque/torque-6.0.4-r2.ebuild
+++ b/sys-cluster/torque/torque-6.0.4-r2.ebuild
@@ -1,14 +1,15 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-inherit autotools flag-o-matic linux-info
+inherit autotools flag-o-matic linux-info toolchain-funcs
 
 DESCRIPTION="Resource manager and queuing system based on OpenPBS"
 HOMEPAGE="http://www.adaptivecomputing.com/products/open-source/torque"
 SRC_URI="https://github.com/adaptivecomputing/torque/archive/6a0b37f85c7d644e9217cbab1542792d646f59a6.tar.gz -> ${P}-gh-20170829.tar.gz
-	https://dev.gentoo.org/~juippis/distfiles/tmp/torque-6.0.4-gcc7.patch"
+	https://dev.gentoo.org/~juippis/distfiles/tmp/torque-6.0.4-gcc7.patch
+	https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-6.0.4-glibc-2.34-pthread.patch.bz2"
 
 LICENSE="torque-2.5"
 SLOT="0"
@@ -52,6 +53,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-6.0.3-fix-emptystring-comparison.patch
 	"${FILESDIR}"/${P}-no-openssl.patch
 	"${FILESDIR}"/${P}-error_buf_overflow_prevent.patch
+	"${WORKDIR}"/${P}-glibc-2.34-pthread.patch
 )
 
 pkg_setup() {
@@ -59,9 +61,9 @@ pkg_setup() {
 
 	# Find a Torque server to use.  Check environment, then
 	# current setup (if any), and fall back on current hostname.
-	if [ -z "${PBS_SERVER_NAME}" ]; then
-		if [ -f "${ROOT}${PBS_SERVER_HOME}/server_name" ]; then
-			PBS_SERVER_NAME="$(<${ROOT}${PBS_SERVER_HOME}/server_name)"
+	if [[ -z "${PBS_SERVER_NAME}" ]]; then
+		if [ -f "${EROOT}/${PBS_SERVER_HOME}/server_name" ]; then
+			PBS_SERVER_NAME="$(<${EROOT}/${PBS_SERVER_HOME}/server_name)"
 		else
 			PBS_SERVER_NAME=$(hostname -f)
 		fi
@@ -118,6 +120,11 @@ src_configure() {
 		--without-loadlibfile
 }
 
+src_compile() {
+	# The .c files are C++, and $(CC) is misused.
+	emake CC="$(tc-getCXX)"
+}
+
 src_install() {
 	local dir
 
@@ -142,6 +149,7 @@ src_install() {
 		newinitd "${FILESDIR}"/pbs_server-init.d-munge pbs_server
 		newinitd "${FILESDIR}"/pbs_sched-init.d pbs_sched
 	fi
+
 	newinitd "${FILESDIR}"/pbs_mom-init.d-munge pbs_mom
 	newconfd "${FILESDIR}"/${PN}-conf.d-munge ${PN}
 	newinitd "${FILESDIR}"/trqauthd-init.d trqauthd
@@ -149,13 +157,13 @@ src_install() {
 }
 
 pkg_preinst() {
-	if [[ -f "${ROOT}etc/pbs_environment" ]]; then
-		cp "${ROOT}etc/pbs_environment" "${ED}"/etc/pbs_environment || die
+	if [[ -f "${EROOT}/etc/pbs_environment" ]]; then
+		cp "${EROOT}/etc/pbs_environment" "${ED}"/etc/pbs_environment || die
 	fi
 
-	if use server && [[ -f "${ROOT}${PBS_SERVER_HOME}/server_priv/nodes" ]]; then
+	if use server && [[ -f "${EROOT}/${PBS_SERVER_HOME}/server_priv/nodes" ]]; then
 		cp \
-			"${EROOT}${PBS_SERVER_HOME}/server_priv/nodes" \
+			"${EROOT}/${PBS_SERVER_HOME}/server_priv/nodes" \
 			"${ED}/${PBS_SERVER_HOME}/server_priv/nodes" || die
 	fi