From: Patrick Lauer <patrick@gentoo.org>
Date: Mon, 4 Jul 2016 15:20:35 +0000 (+0200)
Subject: mail-mta/postfix: Don't screw user config in pkg_config #587496
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=fd192b99315b9901124b1e26e34b87dc2f3b48eb;p=gentoo.git

mail-mta/postfix: Don't screw user config in pkg_config #587496

Package-Manager: portage-2.3.0
RepoMan-Options: --force
---

diff --git a/mail-mta/postfix/postfix-3.1.0.ebuild b/mail-mta/postfix/postfix-3.1.0-r1.ebuild
similarity index 96%
rename from mail-mta/postfix/postfix-3.1.0.ebuild
rename to mail-mta/postfix/postfix-3.1.0-r1.ebuild
index 67c504a83d2e..20a4f5dcb8e1 100644
--- a/mail-mta/postfix/postfix-3.1.0.ebuild
+++ b/mail-mta/postfix/postfix-3.1.0-r1.ebuild
@@ -299,13 +299,9 @@ pkg_postinst() {
 pkg_config() {
 	# configure tls
 	if use ssl ; then
-		if "${EROOT}"usr/sbin/postfix tls all-default-client ; then
-			elog "Configuring client side TLS settings"
-			"${EROOT}"usr/sbin/postfix tls enable-client
-		fi
-		if "${EROOT}"usr/sbin/postfix tls all-default-server ; then
-			elog "Configuring server side TLS settings"
-			"${EROOT}"usr/sbin/postfix tls enable-server
-		fi
+		elog "To configure client side TLS settings:"
+		elog "${EROOT}"usr/sbin/postfix tls enable-client
+		elog "To configure server side TLS settings:"
+		elog "${EROOT}"usr/sbin/postfix tls enable-server
 	fi
 }
diff --git a/mail-mta/postfix/postfix-3.1.1-r1.ebuild b/mail-mta/postfix/postfix-3.1.1-r2.ebuild
similarity index 96%
rename from mail-mta/postfix/postfix-3.1.1-r1.ebuild
rename to mail-mta/postfix/postfix-3.1.1-r2.ebuild
index b624d76b6571..56d5b0e8e42a 100644
--- a/mail-mta/postfix/postfix-3.1.1-r1.ebuild
+++ b/mail-mta/postfix/postfix-3.1.1-r2.ebuild
@@ -300,13 +300,9 @@ pkg_postinst() {
 pkg_config() {
 	# configure tls
 	if use ssl ; then
-		if "${EROOT}"usr/sbin/postfix tls all-default-client ; then
-			elog "Configuring client side TLS settings"
-			"${EROOT}"usr/sbin/postfix tls enable-client
-		fi
-		if "${EROOT}"usr/sbin/postfix tls all-default-server ; then
-			elog "Configuring server side TLS settings"
-			"${EROOT}"usr/sbin/postfix tls enable-server
-		fi
+		elog "To configure client side TLS settings:"
+		elog "${EROOT}"usr/sbin/postfix tls enable-client
+		elog "To configure server side TLS settings:"
+		elog "${EROOT}"usr/sbin/postfix tls enable-server
 	fi
 }
diff --git a/mail-mta/postfix/postfix-3.2_pre20160612.ebuild b/mail-mta/postfix/postfix-3.2_pre20160612-r1.ebuild
similarity index 96%
rename from mail-mta/postfix/postfix-3.2_pre20160612.ebuild
rename to mail-mta/postfix/postfix-3.2_pre20160612-r1.ebuild
index b93b68dafe86..47e4efad24c7 100644
--- a/mail-mta/postfix/postfix-3.2_pre20160612.ebuild
+++ b/mail-mta/postfix/postfix-3.2_pre20160612-r1.ebuild
@@ -300,13 +300,9 @@ pkg_postinst() {
 pkg_config() {
 	# configure tls
 	if use ssl ; then
-		if "${EROOT}"usr/sbin/postfix tls all-default-client ; then
-			elog "Configuring client side TLS settings"
-			"${EROOT}"usr/sbin/postfix tls enable-client
-		fi
-		if "${EROOT}"usr/sbin/postfix tls all-default-server ; then
-			elog "Configuring server side TLS settings"
-			"${EROOT}"usr/sbin/postfix tls enable-server
-		fi
+		elog "To configure client side TLS settings:"
+		elog "${EROOT}"usr/sbin/postfix tls enable-client
+		elog "To configure server side TLS settings:"
+		elog "${EROOT}"usr/sbin/postfix tls enable-server
 	fi
 }