From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-906320-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 ED5DD138330
	for <garchives@archives.gentoo.org>; Fri, 14 Oct 2016 02:27:12 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 68CA2E0BEF;
	Fri, 14 Oct 2016 02:27:10 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	(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 315D8E0BEF
	for <gentoo-commits@lists.gentoo.org>; Fri, 14 Oct 2016 02:27:10 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
	(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 C8CCA34119A
	for <gentoo-commits@lists.gentoo.org>; Fri, 14 Oct 2016 02:27:07 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id C0EEB2F9
	for <gentoo-commits@lists.gentoo.org>; Fri, 14 Oct 2016 02:27:05 +0000 (UTC)
From: "Jason Donenfeld" <zx2c4@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, "Jason Donenfeld" <zx2c4@gentoo.org>
Message-ID: <1476412007.729d3ba212f555535996e947ee01a44da6b441fc.zx2c4@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: mail-mta/opensmtpd/
X-VCS-Repository: repo/gentoo
X-VCS-Files: mail-mta/opensmtpd/opensmtpd-5.9.2.201607021504_p1-r1.ebuild mail-mta/opensmtpd/opensmtpd-5.9.2_p1-r1.ebuild mail-mta/opensmtpd/opensmtpd-5.9.2_p1-r2.ebuild mail-mta/opensmtpd/opensmtpd-6.0.2_p1-r1.ebuild mail-mta/opensmtpd/opensmtpd-6.0.2_p1.ebuild
X-VCS-Directories: mail-mta/opensmtpd/
X-VCS-Committer: zx2c4
X-VCS-Committer-Name: Jason Donenfeld
X-VCS-Revision: 729d3ba212f555535996e947ee01a44da6b441fc
X-VCS-Branch: master
Date: Fri, 14 Oct 2016 02:27:05 +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-Archives-Salt: 87364a6b-42df-4e16-b269-ecc457b7852a
X-Archives-Hash: 0799c955f5725f4b3f0336926a95c747

commit:     729d3ba212f555535996e947ee01a44da6b441fc
Author:     Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 14 02:25:42 2016 +0000
Commit:     Jason Donenfeld <zx2c4 <AT> gentoo <DOT> org>
CommitDate: Fri Oct 14 02:26:47 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=729d3ba2

mail-mta/opensmtpd: new stable version

Package-Manager: portage-2.3.2

 mail-mta/opensmtpd/opensmtpd-5.9.2_p1-r1.ebuild    | 94 ---------------------
 mail-mta/opensmtpd/opensmtpd-5.9.2_p1-r2.ebuild    | 95 ----------------------
 ...4_p1-r1.ebuild => opensmtpd-6.0.2_p1-r1.ebuild} |  0
 mail-mta/opensmtpd/opensmtpd-6.0.2_p1.ebuild       |  7 +-
 4 files changed, 3 insertions(+), 193 deletions(-)

diff --git a/mail-mta/opensmtpd/opensmtpd-5.9.2_p1-r1.ebuild b/mail-mta/opensmtpd/opensmtpd-5.9.2_p1-r1.ebuild
deleted file mode 100644
index eec682c..00000000
--- a/mail-mta/opensmtpd/opensmtpd-5.9.2_p1-r1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit multilib user flag-o-matic eutils pam toolchain-funcs autotools systemd versionator
-
-DESCRIPTION="Lightweight but featured SMTP daemon from OpenBSD"
-HOMEPAGE="http://www.opensmtpd.org/"
-MY_P="${P}"
-if [ $(get_last_version_component_index) -eq 4 ]; then
-	MY_P="${PN}-$(get_version_component_range 4-)"
-fi
-SRC_URI="https://www.opensmtpd.org/archives/${MY_P/_}.tar.gz"
-
-LICENSE="ISC BSD BSD-1 BSD-2 BSD-4"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="pam +mta"
-
-DEPEND="dev-libs/openssl:0
-		sys-libs/zlib
-		pam? ( virtual/pam )
-		sys-libs/db:=
-		dev-libs/libevent
-		app-misc/ca-certificates
-		net-mail/mailbase
-		net-libs/libasr
-		!mail-mta/courier
-		!mail-mta/esmtp
-		!mail-mta/exim
-		!mail-mta/mini-qmail
-		!mail-mta/msmtp[mta]
-		!mail-mta/netqmail
-		!mail-mta/nullmailer
-		!mail-mta/postfix
-		!mail-mta/qmail-ldap
-		!mail-mta/sendmail
-		!mail-mta/ssmtp[mta]
-"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P/_}
-
-src_prepare() {
-	# Use /run instead of /var/run
-	sed -i -e '/pidfile_path/s:_PATH_VARRUN:"/run/":' openbsd-compat/pidfile.c || die
-	epatch_user
-	eautoreconf
-}
-
-src_configure() {
-	tc-export AR
-	AR="$(which "$AR")" econf \
-		--with-table-db \
-		--with-user-smtpd=smtpd \
-		--with-user-queue=smtpq \
-		--with-group-queue=smtpq \
-		--with-path-socket=/run \
-		--with-path-CAfile=/etc/ssl/certs/ca-certificates.crt \
-		--sysconfdir=/etc/opensmtpd \
-		$(use_with pam auth-pam)
-}
-
-src_install() {
-	default
-	newinitd "${FILESDIR}"/smtpd.initd smtpd
-	systemd_dounit "${FILESDIR}"/smtpd.{service,socket}
-	use pam && newpamd "${FILESDIR}"/smtpd.pam smtpd
-	dosym /usr/sbin/smtpctl /usr/sbin/makemap
-	dosym /usr/sbin/smtpctl /usr/sbin/newaliases
-	if use mta ; then
-		dodir /usr/sbin
-		dosym /usr/sbin/smtpctl /usr/sbin/sendmail
-		dosym /usr/sbin/smtpctl /usr/bin/sendmail
-		dosym /usr/sbin/smtpctl /usr/$(get_libdir)/sendmail
-	fi
-}
-
-pkg_preinst() {
-	enewgroup smtpd 25
-	enewuser smtpd 25 -1 /var/empty smtpd
-	enewgroup smtpq 252
-	enewuser smtpq 252 -1 /var/empty smtpq
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Plugins for SQLite, MySQL, PostgreSQL, LDAP, socketmaps,"
-	einfo "Redis, and many other useful addons and filters are"
-	einfo "available in the mail-filter/opensmtpd-extras package."
-	einfo
-}

diff --git a/mail-mta/opensmtpd/opensmtpd-5.9.2_p1-r2.ebuild b/mail-mta/opensmtpd/opensmtpd-5.9.2_p1-r2.ebuild
deleted file mode 100644
index 9999795..00000000
--- a/mail-mta/opensmtpd/opensmtpd-5.9.2_p1-r2.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit multilib user flag-o-matic eutils pam toolchain-funcs autotools systemd versionator
-
-DESCRIPTION="Lightweight but featured SMTP daemon from OpenBSD"
-HOMEPAGE="http://www.opensmtpd.org/"
-MY_P="${P}"
-if [ $(get_last_version_component_index) -eq 4 ]; then
-	MY_P="${PN}-$(get_version_component_range 4-)"
-fi
-SRC_URI="https://www.opensmtpd.org/archives/${MY_P/_}.tar.gz"
-
-LICENSE="ISC BSD BSD-1 BSD-2 BSD-4"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="libressl pam +mta"
-
-DEPEND="!libressl? ( dev-libs/openssl:0 )
-		libressl? ( dev-libs/libressl )
-		sys-libs/zlib
-		pam? ( virtual/pam )
-		sys-libs/db:=
-		dev-libs/libevent
-		app-misc/ca-certificates
-		net-mail/mailbase
-		net-libs/libasr
-		!mail-mta/courier
-		!mail-mta/esmtp
-		!mail-mta/exim
-		!mail-mta/mini-qmail
-		!mail-mta/msmtp[mta]
-		!mail-mta/netqmail
-		!mail-mta/nullmailer
-		!mail-mta/postfix
-		!mail-mta/qmail-ldap
-		!mail-mta/sendmail
-		!mail-mta/ssmtp[mta]
-"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P/_}
-
-src_prepare() {
-	# Use /run instead of /var/run
-	sed -i -e '/pidfile_path/s:_PATH_VARRUN:"/run/":' openbsd-compat/pidfile.c || die
-	epatch_user
-	eautoreconf
-}
-
-src_configure() {
-	tc-export AR
-	AR="$(which "$AR")" econf \
-		--with-table-db \
-		--with-user-smtpd=smtpd \
-		--with-user-queue=smtpq \
-		--with-group-queue=smtpq \
-		--with-path-socket=/run \
-		--with-path-CAfile=/etc/ssl/certs/ca-certificates.crt \
-		--sysconfdir=/etc/opensmtpd \
-		$(use_with pam auth-pam)
-}
-
-src_install() {
-	default
-	newinitd "${FILESDIR}"/smtpd.initd smtpd
-	systemd_dounit "${FILESDIR}"/smtpd.{service,socket}
-	use pam && newpamd "${FILESDIR}"/smtpd.pam smtpd
-	dosym /usr/sbin/smtpctl /usr/sbin/makemap
-	dosym /usr/sbin/smtpctl /usr/sbin/newaliases
-	if use mta ; then
-		dodir /usr/sbin
-		dosym /usr/sbin/smtpctl /usr/sbin/sendmail
-		dosym /usr/sbin/smtpctl /usr/bin/sendmail
-		dosym /usr/sbin/smtpctl /usr/$(get_libdir)/sendmail
-	fi
-}
-
-pkg_preinst() {
-	enewgroup smtpd 25
-	enewuser smtpd 25 -1 /var/empty smtpd
-	enewgroup smtpq 252
-	enewuser smtpq 252 -1 /var/empty smtpq
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Plugins for SQLite, MySQL, PostgreSQL, LDAP, socketmaps,"
-	einfo "Redis, and many other useful addons and filters are"
-	einfo "available in the mail-filter/opensmtpd-extras package."
-	einfo
-}

diff --git a/mail-mta/opensmtpd/opensmtpd-5.9.2.201607021504_p1-r1.ebuild b/mail-mta/opensmtpd/opensmtpd-6.0.2_p1-r1.ebuild
similarity index 100%
rename from mail-mta/opensmtpd/opensmtpd-5.9.2.201607021504_p1-r1.ebuild
rename to mail-mta/opensmtpd/opensmtpd-6.0.2_p1-r1.ebuild

diff --git a/mail-mta/opensmtpd/opensmtpd-6.0.2_p1.ebuild b/mail-mta/opensmtpd/opensmtpd-6.0.2_p1.ebuild
index 9999795..eec682c 100644
--- a/mail-mta/opensmtpd/opensmtpd-6.0.2_p1.ebuild
+++ b/mail-mta/opensmtpd/opensmtpd-6.0.2_p1.ebuild
@@ -16,11 +16,10 @@ SRC_URI="https://www.opensmtpd.org/archives/${MY_P/_}.tar.gz"
 
 LICENSE="ISC BSD BSD-1 BSD-2 BSD-4"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="libressl pam +mta"
+KEYWORDS="amd64 x86"
+IUSE="pam +mta"
 
-DEPEND="!libressl? ( dev-libs/openssl:0 )
-		libressl? ( dev-libs/libressl )
+DEPEND="dev-libs/openssl:0
 		sys-libs/zlib
 		pam? ( virtual/pam )
 		sys-libs/db:=