Bump versions.

(Portage version: 2.2.20/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 55758000)

4 files changed, 15 insertions, 18 deletions

diff --git a/mail-mta/opensmtpd/ChangeLog b/mail-mta/opensmtpd/ChangeLog
index 4301163517a3..4a0f3833547b 100644
--- a/mail-mta/opensmtpd/ChangeLog
+++ b/mail-mta/opensmtpd/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for mail-mta/opensmtpd
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/opensmtpd/ChangeLog,v 1.71 2015/06/02 11:55:35 zx2c4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/opensmtpd/ChangeLog,v 1.72 2015/06/12 16:44:40 zx2c4 Exp $
+
+*opensmtpd-5.4.6_p1 (12 Jun 2015)
+*opensmtpd-5.4.6.201506112227_p1 (12 Jun 2015)
+
+  12 Jun 2015; Jason A. Donenfeld <zx2c4@gentoo.org>
+  +opensmtpd-5.4.6.201506112227_p1.ebuild, +opensmtpd-5.4.6_p1.ebuild,
+  -opensmtpd-5.4.5.201506020910_p1.ebuild, -opensmtpd-5.4.5_p2.ebuild,
+  metadata.xml:
+  Bump versions.
 
   02 Jun 2015; Jason A. Donenfeld <zx2c4@gentoo.org>
   opensmtpd-5.4.5.201506020910_p1.ebuild:
diff --git a/mail-mta/opensmtpd/metadata.xml b/mail-mta/opensmtpd/metadata.xml
index 68e10206a7ae..23ffebf2e96c 100644
--- a/mail-mta/opensmtpd/metadata.xml
+++ b/mail-mta/opensmtpd/metadata.xml
@@ -10,8 +10,6 @@ OpenSMTPD is an implementation of the server-side SMTP protocol as defined by RF
 </maintainer>
 <use>
 <flag name='mta'>Enable this to install as system-wide MTA</flag>
-<flag name='redis'>Enable redis support</flag>
-<flag name='socketmap'>Enable socketmap support</flag>
 </use>
 </pkgmetadata>
 
diff --git a/mail-mta/opensmtpd/opensmtpd-5.4.5.201506020910_p1.ebuild b/mail-mta/opensmtpd/opensmtpd-5.4.6.201506112227_p1.ebuild
index 9183bb50271f..e6e0518163a9 100644
--- a/mail-mta/opensmtpd/opensmtpd-5.4.5.201506020910_p1.ebuild
+++ b/mail-mta/opensmtpd/opensmtpd-5.4.6.201506112227_p1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/opensmtpd/opensmtpd-5.4.5.201506020910_p1.ebuild,v 1.2 2015/06/02 11:55:35 zx2c4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/opensmtpd/opensmtpd-5.4.6.201506112227_p1.ebuild,v 1.1 2015/06/12 16:44:40 zx2c4 Exp $
 
 EAPI=5
 
diff --git a/mail-mta/opensmtpd/opensmtpd-5.4.5_p2.ebuild b/mail-mta/opensmtpd/opensmtpd-5.4.6_p1.ebuild
index eefbc1a3a744..fac3a41b5ac3 100644
--- a/mail-mta/opensmtpd/opensmtpd-5.4.5_p2.ebuild
+++ b/mail-mta/opensmtpd/opensmtpd-5.4.6_p1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/opensmtpd/opensmtpd-5.4.5_p2.ebuild,v 1.1 2015/05/27 12:39:40 zx2c4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/opensmtpd/opensmtpd-5.4.6_p1.ebuild,v 1.1 2015/06/12 16:44:40 zx2c4 Exp $
 
 EAPI=5
 
@@ -17,16 +17,12 @@ 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 ldap mysql postgres sqlite redis socketmap +mta"
+IUSE="pam +mta"
 
 DEPEND="dev-libs/openssl
 		sys-libs/zlib
 		pam? ( virtual/pam )
 		sys-libs/db
-		sqlite? ( dev-db/sqlite:3 )
-		mysql? ( virtual/mysql )
-		postgres? ( dev-db/postgresql )
-		redis? ( dev-libs/hiredis )
 		dev-libs/libevent
 		app-misc/ca-certificates
 		net-mail/mailbase
@@ -48,8 +44,8 @@ RDEPEND="${DEPEND}"
 S=${WORKDIR}/${MY_P/_}
 
 src_prepare() {
-	epatch "${FILESDIR}/${P}-libevent-version-macro.patch"
-	epatch "${FILESDIR}/${P}-setgroups-header.patch"
+	epatch "${FILESDIR}/${PN}-5.4.5_p2-libevent-version-macro.patch"
+	epatch "${FILESDIR}/${PN}-5.4.5_p2-setgroups-header.patch"
 	epatch_user
 	eautoreconf
 }
@@ -63,12 +59,6 @@ src_configure() {
 		--with-sock-dir=/var/run \
 		--sysconfdir=/etc/opensmtpd \
 		--with-ca-file=/etc/ssl/certs/ca-certificates.crt \
-		$(use_with ldap experimental-ldap) \
-		$(use_with mysql experimental-mysql) \
-		$(use_with postgres experimental-postgres) \
-		$(use_with sqlite experimental-sqlite) \
-		$(use_with redis experimental-redis) \
-		$(use_with socketmap experimental-socketmap) \
 		$(use_with pam)
 }