From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1112186-garchives=archives.gentoo.org@lists.gentoo.org>
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 6A9A9138334
	for <garchives@archives.gentoo.org>; Fri, 20 Sep 2019 22:39:17 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 8EB52E08E5;
	Fri, 20 Sep 2019 22:39:16 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	(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 5F5F1E08E5
	for <gentoo-commits@lists.gentoo.org>; Fri, 20 Sep 2019 22:39:16 +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 B9BF834B426
	for <gentoo-commits@lists.gentoo.org>; Fri, 20 Sep 2019 22:39:14 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 2D769764
	for <gentoo-commits@lists.gentoo.org>; Fri, 20 Sep 2019 22:39:12 +0000 (UTC)
From: "Sergei Trofimovich" <slyfox@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sergei Trofimovich" <slyfox@gentoo.org>
Message-ID: <1569019143.c4747bb45781f7cd1eb8021589dee6440fe3dd6c.slyfox@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
X-VCS-Repository: repo/gentoo
X-VCS-Files: net-ftp/proftpd/metadata.xml net-ftp/proftpd/proftpd-1.3.6-r5.ebuild
X-VCS-Directories: net-ftp/proftpd/
X-VCS-Committer: slyfox
X-VCS-Committer-Name: Sergei Trofimovich
X-VCS-Revision: c4747bb45781f7cd1eb8021589dee6440fe3dd6c
X-VCS-Branch: master
Date: Fri, 20 Sep 2019 22:39:12 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 8a7cd76f-b80d-4e1a-bcaf-f433eeed793e
X-Archives-Hash: cd1a6823d930f80f1e90c332031b3925

commit:     c4747bb45781f7cd1eb8021589dee6440fe3dd6c
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 20 22:38:40 2019 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Fri Sep 20 22:39:03 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4747bb4

net-ftp/proftpd: change 'log_forensic'/'unique_id' to dashed variants

Reported-by: Michał Górny
Closes: https://bugs.gentoo.org/695100
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 net-ftp/proftpd/metadata.xml            | 4 ++--
 net-ftp/proftpd/proftpd-1.3.6-r5.ebuild | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/net-ftp/proftpd/metadata.xml b/net-ftp/proftpd/metadata.xml
index 99ccdb6d8f8..572ef17d299 100644
--- a/net-ftp/proftpd/metadata.xml
+++ b/net-ftp/proftpd/metadata.xml
@@ -23,7 +23,7 @@ server.</longdescription>
 		<flag name="ident">Enable support for the mod_ident module</flag>
 		<flag name="ifsession">Enable support for the ifsession module</flag>
 		<flag name="ifversion">Enable support for the mod_ifversion module</flag>
-		<flag name="log_forensic">Enable support for the mod_log_forensic module, log only suspicious actions.</flag>
+		<flag name="log-forensic">Enable support for the mod_log_forensic module, log only suspicious actions.</flag>
 		<flag name="memcache">Enable support for the mod_memcache module, for using memcached servers</flag>
 		<flag name="msg">Enable support for the mod_msg module, allows system users to send messages to connected clients via the ftpdctl program.</flag>
 		<flag name="qos">Enable support for the mod_qos module</flag>
@@ -35,7 +35,7 @@ server.</longdescription>
 		<flag name="sitemisc">Enable support for the sitemisc module</flag>
 		<flag name="sodium">Use <pkg>dev-libs/libsodium</pkg> for password encryption an key exchange</flag>
 		<flag name="softquota">Enable support for the quotatab module</flag>
-		<flag name="unique_id">Enable support for the mod_unique_id module, every connection gets unique ID.</flag>
+		<flag name="unique-id">Enable support for the mod_unique_id module, every connection gets unique ID.</flag>
 		<flag name="vroot">Enable support for the virtual root module</flag>
 	</use>
 	<upstream>

diff --git a/net-ftp/proftpd/proftpd-1.3.6-r5.ebuild b/net-ftp/proftpd/proftpd-1.3.6-r5.ebuild
index 9fef53a6a6c..679d8c8859e 100644
--- a/net-ftp/proftpd/proftpd-1.3.6-r5.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.6-r5.ebuild
@@ -28,8 +28,8 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse dso dynmasq exec ifsession ifversion ident ipv6
-	kerberos ldap libressl log_forensic memcache msg mysql ncurses nls pam +pcre postgres qos radius
-	ratio readme rewrite selinux sftp shaper sitemisc snmp sodium softquota sqlite ssl tcpd test unique_id vroot"
+	kerberos ldap libressl log-forensic memcache msg mysql ncurses nls pam +pcre postgres qos radius
+	ratio readme rewrite selinux sftp shaper sitemisc snmp sodium softquota sqlite ssl tcpd test unique-id vroot"
 # TODO: geoip
 REQUIRED_USE="ban? ( ctrls )
 	msg? ( ctrls )
@@ -172,7 +172,7 @@ src_configure() {
 		m="${m}:mod_gss:mod_auth_gss"
 	fi
 	use ldap && m="${m}:mod_ldap"
-	use log_forensic && m="${m}:mod_log_forensic"
+	use log-forensic && m="${m}:mod_log_forensic"
 	use msg && m="${m}:mod_msg"
 	if use mysql || use postgres || use sqlite ; then
 		m="${m}:mod_sql:mod_sql_passwd"
@@ -207,7 +207,7 @@ src_configure() {
 		m="${m}:mod_wrap2:mod_wrap2_file"
 		use mysql || use postgres || use sqlite && m="${m}:mod_wrap2_sql"
 	fi
-	use unique_id && m="${m}:mod_unique_id"
+	use unique-id && m="${m}:mod_unique_id"
 	use vroot && m="${m}:mod_vroot"
 
 	if [[ -n ${PROFTP_CUSTOM_MODULES} ]]; then