QA: Removed logrotate USE flag, the logrotate.d file is installed unconditionally now (bug 258186)

(Portage version: 2.2_rc23/cvs/Linux x86_64)

2 files changed, 13 insertions, 11 deletions

diff --git a/app-admin/ulogd/ChangeLog b/app-admin/ulogd/ChangeLog
index e6985a916ba6..17a0a057161f 100644
--- a/app-admin/ulogd/ChangeLog
+++ b/app-admin/ulogd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/ulogd
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ChangeLog,v 1.53 2009/01/25 00:55:58 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ChangeLog,v 1.54 2009/02/09 09:36:03 angelos Exp $
+
+  09 Feb 2009; Christoph Mende <angelos@gentoo.org>
+  ulogd-2.0.0_beta2.ebuild:
+  QA: Removed logrotate USE flag, the logrotate.d file is installed
+  unconditionally now (bug 258186)
 
   25 Jan 2009; Jeremy Olexa <darkside@gentoo.org> ulogd-1.23-r1.ebuild,
   ulogd-1.23-r2.ebuild:
diff --git a/app-admin/ulogd/ulogd-2.0.0_beta2.ebuild b/app-admin/ulogd/ulogd-2.0.0_beta2.ebuild
index d00916608673..15109aa459bc 100644
--- a/app-admin/ulogd/ulogd-2.0.0_beta2.ebuild
+++ b/app-admin/ulogd/ulogd-2.0.0_beta2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ulogd-2.0.0_beta2.ebuild,v 1.1 2008/12/05 00:39:28 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ulogd-2.0.0_beta2.ebuild,v 1.2 2009/02/09 09:36:03 angelos Exp $
 
 EAPI="1"
 
@@ -14,7 +14,7 @@ SRC_URI="http://ftp.netfilter.org/pub/${PN}/${MY_P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="mysql postgres sqlite3 pcap logrotate doc"
+IUSE="mysql postgres sqlite3 pcap doc"
 
 RDEPEND="net-firewall/iptables
 	>=net-libs/libnfnetlink-0.0.39
@@ -23,8 +23,7 @@ RDEPEND="net-firewall/iptables
 	mysql? ( virtual/mysql )
 	postgres? ( virtual/postgresql-server )
 	sqlite3? ( dev-db/sqlite:3 )
-	pcap? ( net-libs/libpcap )
-	logrotate? ( app-admin/logrotate )"
+	pcap? ( net-libs/libpcap )"
 
 DEPEND="${RDEPEND}
 	sys-devel/autoconf:2.5
@@ -69,11 +68,9 @@ src_install() {
 	use postgres && dodoc doc/pgsql-ulogd2.sql
 	use sqlite3 && dodoc doc/sqlite3.table
 
-	if use logrotate ; then
-		# install logrotate config
-		insinto /etc/logrotate.d
-		newins ulogd.logrotate ulogd || die "logrotate config failed"
-	fi
+	# install logrotate config
+	insinto /etc/logrotate.d
+	newins ulogd.logrotate ulogd || die "logrotate config failed"
 
 	doman ulogd.8 || die
 }