From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A3424139360 for ; Sat, 14 Aug 2021 02:47:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CFA43E0A00; Sat, 14 Aug 2021 02:47:36 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AEC57E0A00 for ; Sat, 14 Aug 2021 02:47:36 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5E3A534087E for ; Sat, 14 Aug 2021 02:47:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BB51678A for ; Sat, 14 Aug 2021 02:47:33 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1628909208.7123e409ac015189a9e5c173f542180926a0e428.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-ftp/vsftpd/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-ftp/vsftpd/vsftpd-3.0.5.ebuild X-VCS-Directories: net-ftp/vsftpd/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 7123e409ac015189a9e5c173f542180926a0e428 X-VCS-Branch: master Date: Sat, 14 Aug 2021 02:47:33 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 3944775c-7c85-44f7-97d4-fd115d715239 X-Archives-Hash: ea0d1188a7ab46681d08a01350e4eac3 commit: 7123e409ac015189a9e5c173f542180926a0e428 Author: Mike Gilbert gentoo org> AuthorDate: Sat Aug 14 02:45:42 2021 +0000 Commit: Mike Gilbert gentoo 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 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[@]}"