[gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/

["Sam James" <sam@gentoo.org>]

commit:     33f62c77eb8f4c280cf80a1e8cc8f8815055b2e4
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri May  7 13:58:25 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri May  7 14:38:00 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33f62c77

net-mail/cyrus-imapd: move append-ldflags from pkg_setup->src_configure

Has no place on non-source builds.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-mail/cyrus-imapd/cyrus-imapd-3.0.15.ebuild | 13 +++++++------
 net-mail/cyrus-imapd/cyrus-imapd-3.4.0.ebuild  |  8 +++-----
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.15.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.15.ebuild
index 621e5456a13..aa2bb2f6608 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.15.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.15.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit autotools flag-o-matic pam ssl-cert
 
 DESCRIPTION="The Cyrus IMAP Server"
@@ -74,12 +75,7 @@ REQUIRED_USE="
 # TODO: check underlinking for other libraries
 PATCHES=(
 	"${FILESDIR}/cyrus-imapd-libcap-libs-r1.patch"
-	)
-
-pkg_setup() {
-	# https://bugs.gentoo.org/604466
-	append-ldflags $(no-as-needed)
-}
+)
 
 src_prepare() {
 	default
@@ -104,10 +100,15 @@ src_prepare() {
 
 src_configure() {
 	local myconf
+
+	# https://bugs.gentoo.org/604466
+	append-ldflags $(no-as-needed)
+
 	if use afs ; then
 		myconf+=" --with-afs-libdir=/usr/$(get_libdir)"
 		myconf+=" --with-afs-incdir=/usr/include/afs"
 	fi
+
 	# sphinx is unmaintained and dead, bug #662944
 	econf \
 		--enable-unit-tests \

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.4.0.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.4.0.ebuild
index 3a9516d6cca..e5c77cc1573 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.4.0.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.4.0.ebuild
@@ -73,11 +73,6 @@ REQUIRED_USE="
 #	"${FILESDIR}/cyrus-imapd-libcap-libs-r1.patch"
 #)
 
-pkg_setup() {
-	# https://bugs.gentoo.org/604466
-	append-ldflags $(no-as-needed)
-}
-
 src_prepare() {
 	default
 
@@ -103,6 +98,9 @@ src_prepare() {
 src_configure() {
 	local myconf
 
+	# https://bugs.gentoo.org/604466
+	append-ldflags $(no-as-needed)
+
 	if use afs ; then
 		myconf+=" --with-afs-libdir=/usr/$(get_libdir)"
 		myconf+=" --with-afs-incdir=/usr/include/afs"