gentoo resync : 12.03.2021

2 files changed, 21 insertions, 13 deletions

diff --git a/net-irc/psybnc/Manifest b/net-irc/psybnc/Manifest
index c593ebf2f1c2..82394e8102c3 100644
--- a/net-irc/psybnc/Manifest
+++ b/net-irc/psybnc/Manifest
@@ -9,5 +9,5 @@ AUX psybnc.conf 313 BLAKE2B c56022b42942b100479b6c539e9da85178db679b6596fc2b4162
 AUX psybnc.confd 113 BLAKE2B e4fddc3cb37c5b9defea0d4d6e6c2b26f34bf50fbbe51679b8f0e686b504c2caf980c5a97864fac86a251431126c5a0338bb50a8eba9d3976156cf1eaf1b7681 SHA512 e58704dec299271d9a450eb243d0af1323aca58d555b61fc3aa899324a6bdc9aa82afc0597c190dc07c278f22c7cb448592a271e9ee6e4aa3552518ce6254753
 AUX psybnc.initd 898 BLAKE2B 7be60ef0dda81cb917e23e06e3fec88af952d71c2eef4255c316baf5a218e8bdc2d8d8bc4eb353ab7c19a697e97685441ec2a0c3503e4f22adf0d55c9a895e13 SHA512 2ea77dfd515b81d53d7fe1b38fe3069d7d2081d939fdbb2c6ff97cd859a86ad8a52dd1b40e0b592a9368488759a3fb35741e25c6a5ade3045eb7159acd64bbbd
 DIST psyBNC-2.3.2-9.tar.gz 318676 BLAKE2B 0197aa3bc8c770738a7d4d5a5a79b77f7a0cafeef60ccca1167172b28af05c0cd9836f7e9816c873dafa2e55b0bf9ce54cfbe3958939405f58f7f3874ec7ea64 SHA512 b664f57610e54fadd938b359a0e8052b8fe3dd36bd1ee339f36ee22ae4d36a76e803425c5133f925ac18c01767ffbc8a2f471c014b5b76b05894cfea9fe5416b
-EBUILD psybnc-2.3.2.9-r3.ebuild 4615 BLAKE2B bcb79a60491e976cfe5965d7cbdb9c730ace03aa418fc6fd3786b857963c02475b23e1af19e741d77ff3c593d6aad900bf8d5d59c37ac05f8849f22dd679fae3 SHA512 e2d1b8e401ef8362bc6ce5ceffd5a5a0d5b3b5e5826ded3c9a0832068375fba86279eb0094df8b4058d4870048ea6358a67e8cba33f5eaf3b52f9c90ba3751fc
+EBUILD psybnc-2.3.2.9-r3.ebuild 4673 BLAKE2B 7755b8b8b6eab39fb4720e304ff51622dad4dccac092488a181e6459efba499a81e50f8abd399834a6b361a3b2343ec4d40c112add1b67db234d2cce0a54fb83 SHA512 ab1d4a4e25085a63c35802da6930e8cf12f5bb09e0bd87bedc07a94535608ffec7b95672025bfc3d53a88de74f85fd2225c4e399f654de105e03a1933f16408c
 MISC metadata.xml 360 BLAKE2B c3cbefd59c47603f27e542da342a855416fd79da62af69f30721929a7e25055ed5f5d46a2b99259589a0d0584fe68a837a4abdf2f0722d0eb3a1d02215f387a7 SHA512 7bcf4c1c7acd11782e8c2f19a179ac753967d4b6609aaf15b3b41ce7a492312db6006ba229b0169976f013d440f46d65c39cfa8f6276ef195339ff858958c135
diff --git a/net-irc/psybnc/psybnc-2.3.2.9-r3.ebuild b/net-irc/psybnc/psybnc-2.3.2.9-r3.ebuild
index b6593d48d197..5a3deaeb55fe 100644
--- a/net-irc/psybnc/psybnc-2.3.2.9-r3.ebuild
+++ b/net-irc/psybnc/psybnc-2.3.2.9-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,16 +11,18 @@ PSYBNC_HOME="/var/lib/psybnc"
 DESCRIPTION="A multi-user and multi-server gateway to IRC networks"
 HOMEPAGE="http://www.psybnc.at/index.html"
 SRC_URI="http://www.psybnc.at/download/beta/psyBNC-${MY_PV}.tar.gz"
+S="${WORKDIR}/${PN}"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE="ipv6 ssl oidentd scripting multinetwork"
 
-DEPEND="ssl? ( >=dev-libs/openssl-0.9.7d )
-		oidentd? ( >=net-misc/oidentd-2.0 )"
+DEPEND="
+	ssl? ( >=dev-libs/openssl-0.9.7d:= )
+	oidentd? ( >=net-misc/oidentd-2.0 )
+"
 RDEPEND="${DEPEND}"
-S="${WORKDIR}"/"${PN}"
 
 pkg_setup() {
 	enewgroup psybnc
@@ -37,14 +39,15 @@ src_unpack() {
 	# Pretend we already have a certificate, we generate it in pkg_config
 	touch key/psybnc.cert.pem || die
 
-	if [[ -f ${ROOT}/usr/share/psybnc/salt.h ]]; then
+	if [[ -f "${EPREFIX}"/usr/share/psybnc/salt.h ]]; then
 		einfo "Using existing salt.h for password encryption"
-		cp "${ROOT}"/usr/share/psybnc/salt.h salt.h || die
+		cp "${EPREFIX}"/usr/share/psybnc/salt.h salt.h || die
 	fi
 }
 
 src_prepare() {
 	default
+
 	eapply "${FILESDIR}/compile.diff"
 	eapply "${FILESDIR}/ldflags-fix.patch"
 
@@ -65,6 +68,7 @@ src_compile() {
 	if use ipv6; then
 		rm -f tools/chkipv6.c || die
 	fi
+
 	if use ssl; then
 		rm -f tools/chkssl.c || die
 	fi
@@ -118,7 +122,7 @@ src_install() {
 
 pkg_config() {
 	if use ssl; then
-		if [[ -f ${ROOT}/etc/psybnc/ssl/psybnc.cert.pem || -f ${ROOT}/etc/psybnc/ssl/psybnc.key.pem ]]; then
+		if [[ -f "${EROOT}"/etc/psybnc/ssl/psybnc.cert.pem || -f "${EROOT}"/etc/psybnc/ssl/psybnc.key.pem ]]; then
 			ewarn "Existing /etc/psybnc/psybnc.cert.pem or /etc/psybnc/psybnc.key.pem found!"
 			ewarn "Remove /etc/psybnc/psybnc.*.pem and run emerge --config =${CATEGORY}/${PF} again."
 			return
@@ -127,10 +131,12 @@ pkg_config() {
 		einfo "Generating certificate request..."
 		openssl req -new -out "${ROOT}"/etc/psybnc/ssl/psybnc.req.pem \
 			-keyout "${ROOT}"/etc/psybnc/ssl/psybnc.key.pem -nodes || die
+
 		einfo "Generating self-signed certificate..."
 		openssl req -x509 -days 365 -in "${ROOT}"/etc/psybnc/ssl/psybnc.req.pem \
 			-key "${ROOT}"/etc/psybnc/ssl/psybnc.key.pem \
 			-out "${ROOT}"/etc/psybnc/ssl/psybnc.cert.pem || die
+
 		einfo "Setting permissions on files..."
 		chown root:psybnc "${ROOT}"/etc/psybnc/ssl/psybnc.{cert,key,req}.pem || die
 		chmod 0640 "${ROOT}"/etc/psybnc/ssl/psybnc.{cert,key,req}.pem || die
@@ -140,20 +146,22 @@ pkg_config() {
 pkg_postinst() {
 	if use ssl; then
 		elog
-		elog "Please run \"emerge --config =${CATEGORY}/${PF}\" to create needed SSL certificates."
+		elog "Please run \"emerge --config =${CATEGORY}/${PF}\" to create the needed SSL certificates."
 	fi
+
 	if use oidentd; then
 		elog
 		elog "You have enabled oidentd-support. You will need to set"
-		elog "up your /etc/oident.conf file before running psybnc. An example"
-		elog "for psyBNC can be found under /etc/oidentd.conf.psybnc"
+		elog "up your ${EROOT}/etc/oident.conf file before running psybnc. An example"
+		elog "for psyBNC can be found under ${EROOT}/etc/oidentd.conf.psybnc"
 	fi
+
 	elog
 	elog "You can connect to psyBNC on port 23998 with user gentoo and password gentoo."
-	elog "Please edit the psyBNC configuration at /etc/psybnc/psybnc.conf to change this."
+	elog "Please edit the psyBNC configuration at ${EROOT}/etc/psybnc/psybnc.conf to change this."
 	elog
 	elog "To be able to reuse an existing psybnc.conf, you need to make sure that the"
-	elog "old salt.h is available at /usr/share/psybnc/salt.h when compiling a new"
+	elog "old salt.h is available at ${EROOT}/usr/share/psybnc/salt.h when compiling a new"
 	elog "version of psyBNC. It is needed for password encryption and decryption."
 	elog
 }