Remove configuration hints (bug #455690), move emerge --config suggestion to preinst, ewarn to elog.

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A792A613)

3 files changed, 16 insertions, 19 deletions

diff --git a/net-dialup/freeradius/ChangeLog b/net-dialup/freeradius/ChangeLog
index 2429fdb9bd9a..8abccc68ecc6 100644
--- a/net-dialup/freeradius/ChangeLog
+++ b/net-dialup/freeradius/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-dialup/freeradius
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/ChangeLog,v 1.118 2014/05/03 15:47:45 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/ChangeLog,v 1.119 2014/05/03 15:56:28 jer Exp $
+
+  03 May 2014; Jeroen Roovers <jer@gentoo.org> freeradius-2.2.5.ebuild,
+  freeradius-3.0.2.ebuild:
+  Remove configuration hints (bug #455690), move emerge --config suggestion to
+  preinst, ewarn to elog.
 
 *freeradius-3.0.2 (03 May 2014)
 *freeradius-2.2.5 (03 May 2014)
diff --git a/net-dialup/freeradius/freeradius-2.2.5.ebuild b/net-dialup/freeradius/freeradius-2.2.5.ebuild
index e433de5d8ac3..4b9b12b670c6 100644
--- a/net-dialup/freeradius/freeradius-2.2.5.ebuild
+++ b/net-dialup/freeradius/freeradius-2.2.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/freeradius-2.2.5.ebuild,v 1.1 2014/05/03 15:47:45 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/freeradius-2.2.5.ebuild,v 1.2 2014/05/03 15:56:28 jer Exp $
 
 EAPI=5
 
@@ -184,13 +184,9 @@ pkg_config() {
 	fi
 }
 
-pkg_postinst() {
-	elog "Users are no longer read from /etc/raddb/radiusd.conf. Please"
-	elog "configure them in /etc/conf.d/radius instead."
-	elog "Also make sure that if you change the pidfile in /etc/raddb/radiusd.conf"
-	elog "you change the pidfile definition in /etc/conf.d/radius as well."
-	if use ssl; then
-		ewarn "You have to run \`emerge --config =${CATEGORY}/${PF}\` to be able"
-		ewarn "to start the radiusd service."
+pkg_preinst() {
+	if ! has_version ${CATEGORY}/${PN} && use ssl; then
+		elog "You have to run \`emerge --config =${CATEGORY}/${PF}\` to be able"
+		elog "to start the radiusd service."
 	fi
 }
diff --git a/net-dialup/freeradius/freeradius-3.0.2.ebuild b/net-dialup/freeradius/freeradius-3.0.2.ebuild
index 353357ef60a3..3387d6fc0162 100644
--- a/net-dialup/freeradius/freeradius-3.0.2.ebuild
+++ b/net-dialup/freeradius/freeradius-3.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/freeradius-3.0.2.ebuild,v 1.1 2014/05/03 15:47:45 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/freeradius-3.0.2.ebuild,v 1.2 2014/05/03 15:56:28 jer Exp $
 
 EAPI=5
 
@@ -177,13 +177,9 @@ pkg_config() {
 	fi
 }
 
-pkg_postinst() {
-	elog "Users are no longer read from /etc/raddb/radiusd.conf. Please"
-	elog "configure them in /etc/conf.d/radius instead."
-	elog "Also make sure that if you change the pidfile in /etc/raddb/radiusd.conf"
-	elog "you change the pidfile definition in /etc/conf.d/radius as well."
-	if use ssl; then
-		ewarn "You have to run \`emerge --config =${CATEGORY}/${PF}\` to be able"
-		ewarn "to start the radiusd service."
+pkg_preinst() {
+	if ! has_version ${CATEGORY}/${PN} && use ssl; then
+		elog "You have to run \`emerge --config =${CATEGORY}/${PF}\` to be able"
+		elog "to start the radiusd service."
 	fi
 }