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 D2879139694 for ; Wed, 22 Feb 2017 09:48:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D0D64E0C24; Wed, 22 Feb 2017 09:48:54 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9BA0FE0C24 for ; Wed, 22 Feb 2017 09:48:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3D14C340988 for ; Wed, 22 Feb 2017 09:48:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 054555085 for ; Wed, 22 Feb 2017 09:48:51 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1487756927.780e1a2faff8e62942b7a516b811be519f3ae2aa.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-ftp/pure-ftpd/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-ftp/pure-ftpd/pure-ftpd-1.0.45-r1.ebuild X-VCS-Directories: net-ftp/pure-ftpd/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 780e1a2faff8e62942b7a516b811be519f3ae2aa X-VCS-Branch: master Date: Wed, 22 Feb 2017 09:48:51 +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-Archives-Salt: 9c193468-4446-45ac-86dc-566552bc6572 X-Archives-Hash: 2f0533c1d6544139c86b2c070d5775af commit: 780e1a2faff8e62942b7a516b811be519f3ae2aa Author: Lars Wendler gentoo org> AuthorDate: Wed Feb 22 09:42:17 2017 +0000 Commit: Lars Wendler gentoo org> CommitDate: Wed Feb 22 09:48:47 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=780e1a2f net-ftp/pure-ftpd: Converted away from confutils eclass (bug #610482). Package-Manager: Portage-2.3.3, Repoman-2.3.1 net-ftp/pure-ftpd/pure-ftpd-1.0.45-r1.ebuild | 40 +++++++++++----------------- 1 file changed, 16 insertions(+), 24 deletions(-) diff --git a/net-ftp/pure-ftpd/pure-ftpd-1.0.45-r1.ebuild b/net-ftp/pure-ftpd/pure-ftpd-1.0.45-r1.ebuild index 92f84ee473..9d942e9c77 100644 --- a/net-ftp/pure-ftpd/pure-ftpd-1.0.45-r1.ebuild +++ b/net-ftp/pure-ftpd/pure-ftpd-1.0.45-r1.ebuild @@ -3,7 +3,7 @@ # $Id$ EAPI=6 -inherit eutils confutils flag-o-matic +inherit eutils flag-o-matic KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" @@ -47,27 +47,6 @@ src_configure() { sed -e "s:# define MAX_USER_LENGTH 32U:# define MAX_USER_LENGTH 127U:" \ -i "${S}/src/ftpd.h" || die "sed failed" - # required for confutils.eclass - local my_conf="" - - # Let's configure the USE-enabled stuff - enable_extension_without "capabilities" "caps" - enable_extension_with "rfc2640" "charconv" 0 - enable_extension_with "ldap" "ldap" 0 - enable_extension_with "mysql" "mysql" 0 - enable_extension_with "pam" "pam" 0 - enable_extension_with "paranoidmsg" "paranoidmsg" 0 - enable_extension_with "pgsql" "postgres" 0 - enable_extension_with "tls" "ssl" 0 - enable_extension_with "implicittls" "implicittls" 0 - enable_extension_with "virtualchroot" "vchroot" 0 - enable_extension_with "sysquotas" "sysquota" 0 - enable_extension_without "inetd" "xinetd" - - # noiplog is a negative flag, we don't want that enabled by default, - # so we handle it manually, as confutils can't do that - use noiplog && my_conf+=" --without-iplogging" - # Those features are only configurable like this, see bug #179375. use anondel && append-cppflags -DANON_CAN_DELETE use anonperm && append-cppflags -DANON_CAN_CHANGE_PERMS @@ -79,6 +58,7 @@ src_configure() { export ax_cv_check_cflags___fstack_protector_all=no local myeconfargs=( + --enable-largefile --with-altlog --with-cookie --with-diraliases @@ -93,9 +73,21 @@ src_configure() { --with-throttling --with-uploadscript --with-virtualhosts - --enable-largefile + $(use_with charconv rfc2640) + $(use_with ldap) + $(use_with mysql) + $(use_with pam) + $(use_with paranoidmsg) + $(use_with postgres pgsql) + $(use_with ssl tls) + $(use_with implicittls) + $(use_with vchroot virtualchroot) + $(use_with sysquota sysquotas) + $(usex caps '' '--without-capabilities') + $(usex noiplog '--without-iplogging' '') + $(usex xinetd '' '--without-inetd') ) - econf "${myeconfargs[@]}" ${my_conf} + econf "${myeconfargs[@]}" } src_install() {