Revert logrotate useflag per popular demand...

Package-Manager: portage-2.2.0_alpha3/cvs/Linux x86_64

4 files changed, 17 insertions, 19 deletions

diff --git a/net-irc/quassel/ChangeLog b/net-irc/quassel/ChangeLog
index 54de0e96ed4f..c62a2470048d 100644
--- a/net-irc/quassel/ChangeLog
+++ b/net-irc/quassel/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-irc/quassel
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v 1.117 2010/11/04 14:41:57 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v 1.118 2010/11/04 14:44:52 scarabeus Exp $
+
+  04 Nov 2010; Tomáš Chvátal <scarabeus@gentoo.org> quassel-0.7.1.ebuild,
+  quassel-9999.ebuild:
+  Revert logrotate useflag per popular demand...
 
   04 Nov 2010; Tomáš Chvátal <scarabeus@gentoo.org> quassel-0.7.1.ebuild,
   quassel-9999.ebuild:
diff --git a/net-irc/quassel/Manifest b/net-irc/quassel/Manifest
index 8619040f6c75..08bccf13f4c0 100644
--- a/net-irc/quassel/Manifest
+++ b/net-irc/quassel/Manifest
@@ -2,7 +2,7 @@ AUX quassel.logrotate 105 RMD160 42bde4a3d8a899971037b1e2d0ddfb5b136f065e SHA1 c
 AUX quasselcore.conf 714 RMD160 96e0d621deb67f4901840f89aa483f42504ed675 SHA1 b75f8e5967aec6457cf20f8481c518eeeee16a35 SHA256 16cfaf919268ee3c3281fc4ad0dfc128b1c98f5edfc5cc522addd512f36d293c
 AUX quasselcore.init 1868 RMD160 1178e2879f88a828aba354893e2c6db2b68c1198 SHA1 c229a580b8a2f47ac922fd8807573b609ce723a1 SHA256 ee2dde641cd1e2d399313f2459f5e251960f35f093a73e8fde87f7a4782f2735
 DIST quassel-0.7.1.tar.bz2 2714990 RMD160 d82cbfafa9fe27119b1fa66cfa417b688b6e8e7e SHA1 791086da977033a1bbee3effa317668b3726bd7f SHA256 914a9cd21bfe4be1f78b2f6c96e54b52db7ed3c0adc4dce6bfabec38a30f7ecd
-EBUILD quassel-0.7.1.ebuild 4920 RMD160 b78b2ca77edcae5adc04af3cd94e87329c9ea173 SHA1 97fd11dfa37b625821eaaf18aa4a152bbdf609dd SHA256 bf20e506b66cae7b7722858cc1305610ce23923edee08a5bcd4252a73b35f79e
-EBUILD quassel-9999.ebuild 4898 RMD160 7e6f05d87b9bd64564d7a2f85a9df414baff19d2 SHA1 6fbec1ebed836b481900d15d1c638c1f445b42b3 SHA256 17ed713dfab490efbe41bfc2aa40d1401e6dac0bdc79fc1b3fd1902d8b988f1e
-MISC ChangeLog 19820 RMD160 1ceebcad772d5fe1108757eb5d2ad362210f22ef SHA1 49d3cd435ae3bc4d037326da02660a9246741944 SHA256 3003ec044f993bcb155558182425b5a531837bfca100c15f90d779e7931f6e43
+EBUILD quassel-0.7.1.ebuild 4841 RMD160 00030d6516c58a1fb2c8ae0adf59fd144eb2ea8f SHA1 f86b76873179a92d699c2334ee77e315230cc982 SHA256 6beb02e14ee0d567ac60ac1b1ec2224c6b6601e1a3d123b18a063c2ba2a3cf43
+EBUILD quassel-9999.ebuild 4820 RMD160 90780442c62dc60e86d48a7b45469085250c8494 SHA1 cf6fc0700a3e236c56d5b481b8a005bc47785665 SHA256 589c83bfcf00c643ef4093d6b98a00539dd4674503d8a43ce70c5bf29e75f8a2
+MISC ChangeLog 19970 RMD160 86a6b037fd2bdacc7911824cd39f15f31ba5cb32 SHA1 ffe018ee2693ecd43163a3b1d2fbcc0f78d8e83d SHA256 cfcd818c147392309d5764afc1f7ab278f07a9011ea93d483e39628b959401cd
 MISC metadata.xml 1863 RMD160 24a360c22d6b7a29af9dcbd4d56651cda06de040 SHA1 f65c7d0a2e417bf0577a808f9487f9062642d2c9 SHA256 08c85e44b8425fb64f59be351eff14f813a6cefd5d4d97c49a9f16324d261213
diff --git a/net-irc/quassel/quassel-0.7.1.ebuild b/net-irc/quassel/quassel-0.7.1.ebuild
index e0690fd89c7a..e79072a3b41f 100644
--- a/net-irc/quassel/quassel-0.7.1.ebuild
+++ b/net-irc/quassel/quassel-0.7.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-0.7.1.ebuild,v 1.5 2010/11/04 14:41:58 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-0.7.1.ebuild,v 1.6 2010/11/04 14:44:52 scarabeus Exp $
 
 EAPI=3
 
@@ -20,11 +20,10 @@ HOMEPAGE="http://quassel-irc.org/"
 LICENSE="GPL-3"
 KEYWORDS="amd64 x86 ~amd64-linux"
 SLOT="0"
-IUSE="ayatana crypt dbus debug kde +logrotate monolithic phonon postgres +server +ssl webkit X"
+IUSE="ayatana crypt dbus debug kde monolithic phonon postgres +server +ssl webkit X"
 
 SERVER_RDEPEND="
 	crypt? ( app-crypt/qca:2 )
-	logrotate? ( app-admin/logrotate )
 	!postgres? ( >=x11-libs/qt-sql-${QT_MINIMAL}:4[sqlite] dev-db/sqlite[threadsafe,-secure-delete] )
 	postgres? ( >=x11-libs/qt-sql-${QT_MINIMAL}:4[postgres] )
 	>=x11-libs/qt-script-${QT_MINIMAL}:4
@@ -123,10 +122,8 @@ src_install() {
 		newconfd "${FILESDIR}"/quasselcore.conf quasselcore || die "newconfd failed"
 
 		# logrotate
-		if use logrotate; then
-			insinto /etc/logrotate.d
-			newins "${FILESDIR}/quassel.logrotate" quassel || die "newins failed"
-		fi
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}/quassel.logrotate" quassel || die "newins failed"
 	fi
 }
 
diff --git a/net-irc/quassel/quassel-9999.ebuild b/net-irc/quassel/quassel-9999.ebuild
index 78f738ae5b67..750d2f0fcdcf 100644
--- a/net-irc/quassel/quassel-9999.ebuild
+++ b/net-irc/quassel/quassel-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+g# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-9999.ebuild,v 1.53 2010/11/04 14:41:57 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-9999.ebuild,v 1.54 2010/11/04 14:44:52 scarabeus Exp $
 
 EAPI=3
 
@@ -20,11 +20,10 @@ HOMEPAGE="http://quassel-irc.org/"
 LICENSE="GPL-3"
 KEYWORDS=""
 SLOT="0"
-IUSE="ayatana crypt dbus debug kde +logrotate monolithic phonon postgres +server +ssl webkit X"
+IUSE="ayatana crypt dbus debug kde monolithic phonon postgres +server +ssl webkit X"
 
 SERVER_RDEPEND="
 	crypt? ( app-crypt/qca:2 )
-	logrotate? ( app-admin/logrotate )
 	!postgres? ( >=x11-libs/qt-sql-${QT_MINIMAL}:4[sqlite] dev-db/sqlite[threadsafe,-secure-delete] )
 	postgres? ( >=x11-libs/qt-sql-${QT_MINIMAL}:4[postgres] )
 	>=x11-libs/qt-script-${QT_MINIMAL}:4
@@ -123,10 +122,8 @@ src_install() {
 		newconfd "${FILESDIR}"/quasselcore.conf quasselcore || die "newconfd failed"
 
 		# logrotate
-		if use logrotate; then
-			insinto /etc/logrotate.d
-			newins "${FILESDIR}/quassel.logrotate" quassel || die "newins failed"
-		fi
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}/quassel.logrotate" quassel || die "newins failed"
 	fi
 }