Fix initscript to not use deprecated opts. Use ssl useflag not gnutls for ssl support as ssl should enable the ssl support and gnutls/openssl respective features if multiple backends are available.

(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)

3 files changed, 18 insertions, 12 deletions

diff --git a/app-admin/rsyslog/ChangeLog b/app-admin/rsyslog/ChangeLog
index f24254fced69..bf1d9cc566c3 100644
--- a/app-admin/rsyslog/ChangeLog
+++ b/app-admin/rsyslog/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/rsyslog
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/ChangeLog,v 1.61 2011/12/28 12:00:25 ultrabug Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/ChangeLog,v 1.62 2012/01/16 07:57:47 scarabeus Exp $
+
+  16 Jan 2012; Tomáš Chvátal <scarabeus@gentoo.org>
+  files/5-stable/rsyslog.initd, rsyslog-5.8.6.ebuild:
+  Fix initscript to not use deprecated opts. Use ssl useflag not gnutls for ssl
+  support as ssl should enable the ssl support and gnutls/openssl respective
+  features if multiple backends are available.
 
 *rsyslog-5.8.6 (28 Dec 2011)
 
diff --git a/app-admin/rsyslog/files/5-stable/rsyslog.initd b/app-admin/rsyslog/files/5-stable/rsyslog.initd
index 98dee94b5fb8..0794d5cb56d3 100644
--- a/app-admin/rsyslog/files/5-stable/rsyslog.initd
+++ b/app-admin/rsyslog/files/5-stable/rsyslog.initd
@@ -1,9 +1,9 @@
 #!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/files/5-stable/rsyslog.initd,v 1.2 2011/09/05 09:25:41 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/files/5-stable/rsyslog.initd,v 1.3 2012/01/16 07:57:47 scarabeus Exp $
 
-opts="reload"
+extra_started_commands="reload"
 
 depend() {
 	provide logger
diff --git a/app-admin/rsyslog/rsyslog-5.8.6.ebuild b/app-admin/rsyslog/rsyslog-5.8.6.ebuild
index fd97c03ec539..e41a5c8db92d 100644
--- a/app-admin/rsyslog/rsyslog-5.8.6.ebuild
+++ b/app-admin/rsyslog/rsyslog-5.8.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-5.8.6.ebuild,v 1.1 2011/12/28 12:00:25 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-5.8.6.ebuild,v 1.2 2012/01/16 07:57:47 scarabeus Exp $
 
 EAPI=4
 
@@ -14,17 +14,17 @@ SRC_URI="http://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
 LICENSE="GPL-3 LGPL-3"
 KEYWORDS="~amd64 ~arm ~hppa ~sparc ~x86"
 SLOT="0"
-IUSE="dbi debug doc extras gnutls kerberos mysql oracle postgres relp snmp static-libs zeromq zlib"
+IUSE="dbi debug doc extras kerberos mysql oracle postgres relp snmp ssl static-libs zeromq zlib"
 
 RDEPEND="dbi? ( dev-db/libdbi )
 	extras? ( net-libs/libnet )
-	gnutls? ( net-libs/gnutls )
 	kerberos? ( virtual/krb5 )
 	mysql? ( virtual/mysql )
 	postgres? ( dev-db/postgresql-base )
 	oracle? ( dev-db/oracle-instantclient-basic )
 	relp? ( >=dev-libs/librelp-0.1.3 )
 	snmp? ( net-analyzer/net-snmp )
+	ssl? ( net-libs/gnutls )
 	zeromq? ( net-libs/zeromq )
 	zlib? ( sys-libs/zlib )"
 DEPEND="${RDEPEND}
@@ -90,7 +90,7 @@ src_configure() {
 		$(use_enable dbi libdbi)
 		$(use_enable postgres pgsql)
 		$(use_enable oracle oracle)
-		$(use_enable gnutls)
+		$(use_enable ssl gnutls)
 		$(use_enable kerberos gssapi-krb5)
 		$(use_enable relp)
 		$(use_enable snmp)
@@ -158,9 +158,9 @@ pkg_postinst() {
 }
 
 pkg_config() {
-	if ! use gnutls ; then
+	if ! use ssl ; then
 		einfo "There is nothing to configure for rsyslog unless you"
-		einfo "used USE=gnutls to build it."
+		einfo "used USE=ssl to build it."
 		return 0
 	fi