[gentoo-commits] repo/gentoo:master commit in: net-ftp/vsftpd/

[Mike Gilbert]

commit:     7123e409ac015189a9e5c173f542180926a0e428
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 14 02:45:42 2021 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sat Aug 14 02:46:48 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7123e409

net-ftp/vsftpd: drop pkg-config use

Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 net-ftp/vsftpd/vsftpd-3.0.5.ebuild | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/net-ftp/vsftpd/vsftpd-3.0.5.ebuild 
b/net-ftp/vsftpd/vsftpd-3.0.5.ebuild
index c417498f044..e4ecfb256b8 100644
--- a/net-ftp/vsftpd/vsftpd-3.0.5.ebuild
+++ b/net-ftp/vsftpd/vsftpd-3.0.5.ebuild
@@ -14,10 +14,6 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="pam ssl tcpd"
 
-BDEPEND="
-       virtual/pkgconfig
-"
-
 DEPEND="
        >=sys-libs/libcap-2
        pam? ( sys-libs/pam )
@@ -49,13 +45,7 @@ undef() {
 }
 
 src_configure() {
-       cflags=()
-       libs=()
-
-       local PKG_CONFIG=$(tc-getPKG_CONFIG)
-
-       cflags+=( $(${PKG_CONFIG} --cflags libcap) ) || die
-       libs+=( $(${PKG_CONFIG} --libs libcap) ) || die
+       libs=( -lcap )
 
        if use pam; then
                libs+=( -lpam )
@@ -66,8 +56,7 @@ src_configure() {
 
        if use ssl; then
                define VSF_BUILD_SSL
-               cflags+=( $(${PKG_CONFIG} --cflags libcrypto libssl) ) || die
-               libs+=( $(${PKG_CONFIG} --libs libcrypto libssl) ) || die
+               libs+=( -lcrypto -lssl )
        fi
 
        if use tcpd; then
@@ -79,8 +68,8 @@ src_configure() {
 src_compile() {
        local args=(
                CC="$(tc-getCC)"
-               CFLAGS="${CFLAGS} ${cflags[*]}"
-               LDFLAGS="${CFLAGS} ${LDFLAGS}"
+               CFLAGS="${CFLAGS}"
+               LDFLAGS="${LDFLAGS}"
                LIBS="${libs[*]}"
        )
        emake "${args[@]}"