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

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

3 files changed, 25 insertions, 13 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/Manifest b/app-admin/ulogd/Manifest
index 84df855dc91c..e02cb550e3dd 100644
--- a/app-admin/ulogd/Manifest
+++ b/app-admin/ulogd/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX configure-fixes.patch 1519 RMD160 b877e8e91d297f3a2c7ffe62ac12216d9febec16 SHA1 ddebd675545dd17ee2d4265cd2381313009cc3ed SHA256 e29b46964f815bf8b30f1dd9a84e32e3d11cb2e28878bea26315f42d9f0b6495
 AUX ulogd 735 RMD160 2b913c9e679d1f2ab449c814ce849dcd58bd17d8 SHA1 8592dcfd9fba4e290f8aa73aa169bf9203997bcb SHA256 d104ef5e0501bdb2128d75a949b211298df4584dc5227b128989edb688355054
 AUX ulogd-0.98 731 RMD160 fc1fec147ebb78a555b96ebdc5cfb3a260de0e7a SHA1 1d75871491a221652a432bc17c2136770893d4c2 SHA256 af574a0d7a1a35a756f2f5ff030532051675a0f5725661ce45a95903bc4f2f69
@@ -10,6 +13,13 @@ DIST ulogd-glsa-200701.patch.bz2 5279 RMD160 2b119c5e6b41672923246743d32dd8d14ed
 EBUILD ulogd-1.23-r1.ebuild 1505 RMD160 f874a927362491899421e1c4dad0cab084b37150 SHA1 10e5ff2aeb6f966de518d37520a4e83c490819e0 SHA256 c8bfbf2fbdf7644b39e72b3e8d685c0db5ae1aa5aea8f2c807233b29cf80b9da
 EBUILD ulogd-1.23-r2.ebuild 2105 RMD160 7d70f78f4ef3eca10d474946086e4e2a171d48f9 SHA1 2e2018128532a2d2ba2fba67649ef2195529c17f SHA256 377397c9548a03c3c38eb150ceb7f540bc48e7924db9bd283308bd2897853074
 EBUILD ulogd-1.24.ebuild 1579 RMD160 a43c3223853321110078221a425e4fbc57e2c29d SHA1 e11d46e77a3a2226b286ed25aecc28888f586347 SHA256 3de1e2e702d07f650dc13378df373fda45600a79ce2a9d5029d5fccfdc907b2f
-EBUILD ulogd-2.0.0_beta2.ebuild 1909 RMD160 bf4ff0fa8bc02d02a65f1630182b6d67a3048487 SHA1 d57a7f29351149aa720e4a3bb2456c87bff4464a SHA256 53c20b6354f60cfc1ca1c8b334e7a1f3ddca2a98cd068b68e63424fd7a278b5c
-MISC ChangeLog 7456 RMD160 46cbcda9ca256b7a61497a15b49cdc292bfbd029 SHA1 4901e458eed6a33518b2129103fa2fa57da13d93 SHA256 b165ba051c702d25b46d1144f97693bef0186de3820eb0c882f8d79ee555d99e
+EBUILD ulogd-2.0.0_beta2.ebuild 1830 RMD160 cf1ba63d407e6af8f9a60e6bcf1435f71e20c4e7 SHA1 336287cbcad15c7f32094ad69b08085aaae66296 SHA256 9dce1ded1423a803cc39daa53c196ac327c2d977da87423f880b1b04d76d6ff6
+MISC ChangeLog 7639 RMD160 015f98a2abc98f4a54b319b2d3c34466c7f01812 SHA1 9247671a2fc16e1b3383c023d7384dcc76ccff38 SHA256 51dccc0d620e1dfed918c170553079f59c734cd87f40e3eaf04501b8184a1934
 MISC metadata.xml 530 RMD160 6751c2570475e3fc9786240f0e0dbbc0618064fc SHA1 de3d0666e165c177793ed65a1b5a325fba418fc9 SHA256 9838082a857cec15d1d3d0deac0f9b329ae6e3534c0cc591f813a17e73157ef2
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkmP+Q0ACgkQKhnDs22gwa+3fgCglXlrIHrXemMvxoyJqouk5r+Z
+6VoAn0h1xey3THBbiY3yl+WAZMiI5+Cg
+=c+Pq
+-----END PGP SIGNATURE-----
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
 }