Drop logrotate useflag. Fixes bug #344175.

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

3 files changed, 13 insertions, 15 deletions

diff --git a/app-admin/rsyslog/ChangeLog b/app-admin/rsyslog/ChangeLog
index 0fb5246394fb..d06333a4e4b4 100644
--- a/app-admin/rsyslog/ChangeLog
+++ b/app-admin/rsyslog/ChangeLog
@@ -1,6 +1,10 @@
 # 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.38 2011/03/25 09:27:20 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/ChangeLog,v 1.39 2011/03/30 14:12:55 scarabeus Exp $
+
+  30 Mar 2011; Tomáš Chvátal <scarabeus@gentoo.org> rsyslog-5.6.4.ebuild,
+  rsyslog-5.6.5.ebuild:
+  Drop logrotate useflag. Fixes bug #344175.
 
   25 Mar 2011; Ultrabug <ultrabug@gentoo.org> rsyslog-5.6.5.ebuild:
   add back virtual/logger provider waiting for migration (#358881)
diff --git a/app-admin/rsyslog/rsyslog-5.6.4.ebuild b/app-admin/rsyslog/rsyslog-5.6.4.ebuild
index 7ad1f62a6439..a25fd74add2d 100644
--- a/app-admin/rsyslog/rsyslog-5.6.4.ebuild
+++ b/app-admin/rsyslog/rsyslog-5.6.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-5.6.4.ebuild,v 1.1 2011/03/04 09:01:47 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-5.6.4.ebuild,v 1.2 2011/03/30 14:12:55 scarabeus Exp $
 
 EAPI=3
 
@@ -11,13 +11,12 @@ 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 logrotate mysql oracle postgres relp snmp static-libs zlib"
+IUSE="dbi debug doc extras gnutls kerberos mysql oracle postgres relp snmp static-libs zlib"
 
 DEPEND="dbi? ( dev-db/libdbi )
 	extras? ( net-libs/libnet )
 	gnutls? ( net-libs/gnutls )
 	kerberos? ( virtual/krb5 )
-	logrotate? ( app-admin/logrotate )
 	mysql? ( virtual/mysql )
 	postgres? ( dev-db/postgresql-base )
 	oracle? ( dev-db/oracle-instantclient-basic )
@@ -98,10 +97,8 @@ src_install() {
 		doins plugins/ompgsql/createDB.sql || die
 	fi
 
-	if use logrotate; then
-		insinto /etc/logrotate.d/
-		newins "${FILESDIR}/${BRANCH}/rsyslog.logrotate" rsyslog || die
-	fi
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}/${BRANCH}/rsyslog.logrotate" rsyslog || die
 }
 
 pkg_postinst() {
diff --git a/app-admin/rsyslog/rsyslog-5.6.5.ebuild b/app-admin/rsyslog/rsyslog-5.6.5.ebuild
index a3f0a5cd96f8..9fce710352d8 100644
--- a/app-admin/rsyslog/rsyslog-5.6.5.ebuild
+++ b/app-admin/rsyslog/rsyslog-5.6.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-5.6.5.ebuild,v 1.2 2011/03/25 09:27:20 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-5.6.5.ebuild,v 1.3 2011/03/30 14:12:55 scarabeus Exp $
 
 EAPI=3
 
@@ -11,13 +11,12 @@ 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 logrotate mysql oracle postgres relp snmp static-libs zlib"
+IUSE="dbi debug doc extras gnutls kerberos mysql oracle postgres relp snmp static-libs zlib"
 
 DEPEND="dbi? ( dev-db/libdbi )
 	extras? ( net-libs/libnet )
 	gnutls? ( net-libs/gnutls )
 	kerberos? ( virtual/krb5 )
-	logrotate? ( app-admin/logrotate )
 	mysql? ( virtual/mysql )
 	postgres? ( dev-db/postgresql-base )
 	oracle? ( dev-db/oracle-instantclient-basic )
@@ -98,10 +97,8 @@ src_install() {
 		doins plugins/ompgsql/createDB.sql || die
 	fi
 
-	if use logrotate; then
-		insinto /etc/logrotate.d/
-		newins "${FILESDIR}/${BRANCH}/rsyslog.logrotate" rsyslog || die
-	fi
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}/${BRANCH}/rsyslog.logrotate" rsyslog || die
 }
 
 pkg_postinst() {