Version cleanup. Get rid of logrotate USE flag - bug #198901.

Package-Manager: portage-2.1.3.18

6 files changed, 51 insertions, 111 deletions

diff --git a/net-mail/mailgraph/ChangeLog b/net-mail/mailgraph/ChangeLog
index f6e84279300a..05eb708e227e 100644
--- a/net-mail/mailgraph/ChangeLog
+++ b/net-mail/mailgraph/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-mail/mailgraph
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mailgraph/ChangeLog,v 1.25 2007/10/22 20:51:26 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mailgraph/ChangeLog,v 1.26 2007/11/14 19:29:51 ticho Exp $
+
+  14 Nov 2007; Andrej Kacian <ticho@gentoo.org> -mailgraph-1.12.ebuild,
+  mailgraph-1.13.ebuild, mailgraph-1.14.ebuild:
+  Version cleanup. Get rid of logrotate USE flag - bug #198901.
 
   22 Oct 2007; Raúl Porcel <armin76@gentoo.org> mailgraph-1.14.ebuild:
   Add ~sparc wrt #192992
diff --git a/net-mail/mailgraph/Manifest b/net-mail/mailgraph/Manifest
index b898fa8809fb..11855b801e68 100644
--- a/net-mail/mailgraph/Manifest
+++ b/net-mail/mailgraph/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX mailgraph.confd 476 RMD160 39bf249be23c1336f3ad3dc9eaefc7ce3e31b11b SHA1 4976af3176c38109ba9172dc0e043fd1b75c02d2 SHA256 9c26a668322a34d433a2a3e4ce250a8d78f51534e6b1d392263560887c17d88a
 MD5 fa47226fdde5601a3b0ae0d19377019f files/mailgraph.confd 476
 RMD160 39bf249be23c1336f3ad3dc9eaefc7ce3e31b11b files/mailgraph.confd 476
@@ -18,35 +21,34 @@ AUX mailgraph.logrotate-new 895 RMD160 62bac0366f91949747b2234b56d9a7bf61e5e47d
 MD5 eb4e3b1ab15a3d1a82b96b52efca4d08 files/mailgraph.logrotate-new 895
 RMD160 62bac0366f91949747b2234b56d9a7bf61e5e47d files/mailgraph.logrotate-new 895
 SHA256 3e1241e1d209a4679fe1f2f3d45716858acb1c0f1daac4b6709d9cb9d8564504 files/mailgraph.logrotate-new 895
-DIST mailgraph-1.12.tar.gz 20053 RMD160 37111b29e4519010f102c71306ba6b896082cb6f SHA1 08bbe7f6e66f1b14b40ce7da8caa716b6ee122e3 SHA256 7ff3b56654fef85180abcece7d4ae42ac173a0815d728ae1c406c8e48dc56e7c
 DIST mailgraph-1.13.tar.gz 21322 RMD160 8c4e393e548b99a49da4f35c8b8a104d5bf14339 SHA1 12a7aaca0c7819b2d617485a13832e4dcd706570 SHA256 f08476371b59b1e2313b388e962e6ff968432d4b66520c11e8b05ff7e968c6c8
 DIST mailgraph-1.14.tar.gz 22014 RMD160 928969a4bdc3b9ff39a7fe16b98789f07b02e5f8 SHA1 6a2ead01ffd8fe49e520057daf97072e106b6c69 SHA256 50ea6ea8a33f5015926edd8b70a4d954ac27df4863514bddc5e69c948a7aac81
-EBUILD mailgraph-1.12.ebuild 1410 RMD160 1da369b6d6761744f42b5d0962c29c6959e86d0b SHA1 ff1b1a6fc82f900a3764f08da171a5d46853034e SHA256 5c8f2b300b03b936be3e41239859985a70911299993a35cf63115b74084bbc7c
-MD5 7a86dbac9639c79b3df4bc1d17614f09 mailgraph-1.12.ebuild 1410
-RMD160 1da369b6d6761744f42b5d0962c29c6959e86d0b mailgraph-1.12.ebuild 1410
-SHA256 5c8f2b300b03b936be3e41239859985a70911299993a35cf63115b74084bbc7c mailgraph-1.12.ebuild 1410
-EBUILD mailgraph-1.13.ebuild 4194 RMD160 6a8273963e30946222707051eb06c87d248bab5f SHA1 9b4df2aeb53a44382a43f6da574d20ae80f5bc09 SHA256 20cec12fc80221aec42b8c713ef429f665af01d00cf3982af28b14cfc64233e8
-MD5 cb69a21ec58c0ea2b56bf9569ff2a85b mailgraph-1.13.ebuild 4194
-RMD160 6a8273963e30946222707051eb06c87d248bab5f mailgraph-1.13.ebuild 4194
-SHA256 20cec12fc80221aec42b8c713ef429f665af01d00cf3982af28b14cfc64233e8 mailgraph-1.13.ebuild 4194
-EBUILD mailgraph-1.14.ebuild 4170 RMD160 f17be4c16fe71ca369bb10cbc5da529e545ac674 SHA1 3816c86aea11607807f2907d5ec8ef156bb139ec SHA256 73f0bf91bd7abdcb8c2e545be092a45807712428c09f59d18cb85f838984a6bb
-MD5 6981530c1094de2449ea3c42fb19d8c0 mailgraph-1.14.ebuild 4170
-RMD160 f17be4c16fe71ca369bb10cbc5da529e545ac674 mailgraph-1.14.ebuild 4170
-SHA256 73f0bf91bd7abdcb8c2e545be092a45807712428c09f59d18cb85f838984a6bb mailgraph-1.14.ebuild 4170
-MISC ChangeLog 3729 RMD160 b9cc34e3a537cb9a1b279532ed99cc1c2d2efb62 SHA1 601ad7886d7d86979cfabea60e64fa99ba7ecd5c SHA256 8e2c36f5799bd6a221d6d6b5e0d66f3e9947e8dc4ba6616886099a2409cdf41f
-MD5 52a170ec4c7f0ad85ed42471169fc5b0 ChangeLog 3729
-RMD160 b9cc34e3a537cb9a1b279532ed99cc1c2d2efb62 ChangeLog 3729
-SHA256 8e2c36f5799bd6a221d6d6b5e0d66f3e9947e8dc4ba6616886099a2409cdf41f ChangeLog 3729
+EBUILD mailgraph-1.13.ebuild 4114 RMD160 6a2583c0a7d6c7f5478ec870f17d2abb7844c51d SHA1 768942d5ba4bed323c699b72d31acc9e66dd6ffc SHA256 dc36262634785dc8bcdf6582b1556191fae2b4d0a1fc42809c4d2915b60070a2
+MD5 c817f18392275aa5b83202c9f7d1fa73 mailgraph-1.13.ebuild 4114
+RMD160 6a2583c0a7d6c7f5478ec870f17d2abb7844c51d mailgraph-1.13.ebuild 4114
+SHA256 dc36262634785dc8bcdf6582b1556191fae2b4d0a1fc42809c4d2915b60070a2 mailgraph-1.13.ebuild 4114
+EBUILD mailgraph-1.14.ebuild 4080 RMD160 03f5c469f924613ed29dd781612ffd43c7f8c268 SHA1 a4eb657f680ceee421c906898d667a381cbfb7fa SHA256 98f0b825c80709425709796b85bd97e66643b3504cc1d33ee4a727300b1beea4
+MD5 f4f1160cb5ad8f91b92a486f3b9464b7 mailgraph-1.14.ebuild 4080
+RMD160 03f5c469f924613ed29dd781612ffd43c7f8c268 mailgraph-1.14.ebuild 4080
+SHA256 98f0b825c80709425709796b85bd97e66643b3504cc1d33ee4a727300b1beea4 mailgraph-1.14.ebuild 4080
+MISC ChangeLog 3912 RMD160 31e457bf86db86b1f59aa3f82df961ee46560b3b SHA1 77e5d904dd0a64915d9f6d0da88a4fad630ab7a0 SHA256 7799838b516e2aa3e990ec592c73cc99650b9e0d24b5d6df1e6053f2ff898463
+MD5 6dd2fe46404128cd8f10c2ccd6109b60 ChangeLog 3912
+RMD160 31e457bf86db86b1f59aa3f82df961ee46560b3b ChangeLog 3912
+SHA256 7799838b516e2aa3e990ec592c73cc99650b9e0d24b5d6df1e6053f2ff898463 ChangeLog 3912
 MISC metadata.xml 163 RMD160 9d7831690071ef6a890ce066c38c9c4e851a2107 SHA1 6dcd4fa8a9b5cfcc7c0ae80c09e43395fe8e71a7 SHA256 38427b537ef2f561a685876ae3a7799382a1bf7fabef6c2d8765ca9d05056aa2
 MD5 5da9e4b96f6f03e46d0e498b183b26de metadata.xml 163
 RMD160 9d7831690071ef6a890ce066c38c9c4e851a2107 metadata.xml 163
 SHA256 38427b537ef2f561a685876ae3a7799382a1bf7fabef6c2d8765ca9d05056aa2 metadata.xml 163
-MD5 1d903a523a8691ab7f4dffe7125597a3 files/digest-mailgraph-1.12 241
-RMD160 74abc20a412bd909219eaa99d6f7a3c2bb514ad0 files/digest-mailgraph-1.12 241
-SHA256 467847851dcbd9451fce80a4f8e7b20200503c3c51d98afa1d896e960247e00f files/digest-mailgraph-1.12 241
 MD5 31657b3cd95ddb86f2e045fc5437547f files/digest-mailgraph-1.13 241
 RMD160 8512864ac0006c8811f63396f4752b3cbd752bc6 files/digest-mailgraph-1.13 241
 SHA256 fbbfbe00e02a107e35ed58d2ff51efd799afa13820c1662e602a77e037da2ea4 files/digest-mailgraph-1.13 241
 MD5 88421808d929760fb111a097cc0d43d4 files/digest-mailgraph-1.14 241
 RMD160 8ebe9fb009d4c9e62d06db475d4ec91ffc9ca00c files/digest-mailgraph-1.14 241
 SHA256 45bad62b0fb441e958f9912a4b4f223eb8f40f4f5a53776305aee2105c4de5ca files/digest-mailgraph-1.14 241
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.7 (GNU/Linux)
+
+iD8DBQFHO0y1QlM6RnzZP+IRAlZpAKCF8iMbJiCJza6aZJt7yyaowIFekgCeLRuw
+PbMDQ7pRiv+zxXRUXIJoDhs=
+=dwOF
+-----END PGP SIGNATURE-----
diff --git a/net-mail/mailgraph/files/digest-mailgraph-1.12 b/net-mail/mailgraph/files/digest-mailgraph-1.12
deleted file mode 100644
index b34354358f0f..000000000000
--- a/net-mail/mailgraph/files/digest-mailgraph-1.12
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 e3c88ee9ff6e423942ff8ce7038449c4 mailgraph-1.12.tar.gz 20053
-RMD160 37111b29e4519010f102c71306ba6b896082cb6f mailgraph-1.12.tar.gz 20053
-SHA256 7ff3b56654fef85180abcece7d4ae42ac173a0815d728ae1c406c8e48dc56e7c mailgraph-1.12.tar.gz 20053
diff --git a/net-mail/mailgraph/mailgraph-1.12.ebuild b/net-mail/mailgraph/mailgraph-1.12.ebuild
deleted file mode 100644
index 020f4f6abe0c..000000000000
--- a/net-mail/mailgraph/mailgraph-1.12.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mailgraph/mailgraph-1.12.ebuild,v 1.7 2007/04/01 18:27:52 ticho Exp $
-
-inherit eutils webapp
-
-DESCRIPTION="A mail statistics RRDtool frontend for Postfix"
-HOMEPAGE="http://people.ee.ethz.ch/~dws/software/mailgraph/"
-SRC_URI="http://people.ee.ethz.ch/~dws/software/${PN}/pub/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ppc64 x86"
-IUSE=""
-
-RDEPEND="dev-lang/perl
-	dev-perl/File-Tail
-	>=net-analyzer/rrdtool-1.2.2"
-DEPEND=">=sys-apps/sed-4
-	>=net-analyzer/rrdtool-1.2.2"
-
-pkg_setup() {
-	webapp_pkg_setup
-	built_with_use net-analyzer/rrdtool perl \
-		|| die "net-analyzer/rrdtool must be built with USE=perl"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	sed -i \
-		-e "s|\(my \$rrd = '\).*'|\1/var/lib/mailgraph/mailgraph.rrd'|" \
-		-e "s|\(my \$rrd_virus = '\).*'|\1/var/lib/mailgraph/mailgraph_virus.rrd'|" \
-		mailgraph.cgi || die "sed mailgraph.cgi failed"
-}
-
-src_install() {
-	webapp_src_preinst
-
-	# for the RRDs
-	keepdir /var/lib/mailgraph
-
-	# mailgraph daemon
-	newbin mailgraph.pl mailgraph
-
-	# mailgraph CGI script
-	exeinto ${MY_CGIBINDIR}
-	doexe mailgraph.cgi
-
-	# init/conf files for mailgraph daemon
-	newinitd ${FILESDIR}/mailgraph.initd mailgraph
-	newconfd ${FILESDIR}/mailgraph.confd mailgraph
-
-	# docs
-	dodoc README CHANGES
-
-	webapp_src_install
-}
diff --git a/net-mail/mailgraph/mailgraph-1.13.ebuild b/net-mail/mailgraph/mailgraph-1.13.ebuild
index 5ac046cc4d34..92b0e33d3f5f 100644
--- a/net-mail/mailgraph/mailgraph-1.13.ebuild
+++ b/net-mail/mailgraph/mailgraph-1.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mailgraph/mailgraph-1.13.ebuild,v 1.5 2007/10/15 14:44:23 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mailgraph/mailgraph-1.13.ebuild,v 1.6 2007/11/14 19:29:51 ticho Exp $
 
 inherit eutils webapp
 
@@ -10,12 +10,11 @@ SRC_URI="http://mailgraph.schweikert.ch//pub/${P}.tar.gz"
 
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~ppc ppc64 x86"
-IUSE="logrotate"
+IUSE=""
 
 RDEPEND="dev-lang/perl
 	dev-perl/File-Tail
-	>=net-analyzer/rrdtool-1.2.2
-	logrotate? ( app-admin/logrotate )"
+	>=net-analyzer/rrdtool-1.2.2"
 DEPEND=">=sys-apps/sed-4"
 
 user_group_setup() {
@@ -36,7 +35,7 @@ pkg_setup() {
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 	sed -i \
 		-e "s|\(my \$rrd = '\).*'|\1/var/lib/mailgraph/mailgraph.rrd'|" \
 		-e "s|\(my \$rrd_virus = '\).*'|\1/var/lib/mailgraph/mailgraph_virus.rrd'|" \
@@ -69,28 +68,26 @@ src_install() {
 	dodir /var/run/mailgraph
 	keepdir /var/run/mailgraph
 
-	if use logrotate ; then
-		# logrotate config for mailgraph log
-		diropts ""
-		dodir /etc/logrotate.d
-		insopts -m0644
-		insinto /etc/logrotate.d
-		newins ${FILESDIR}/mailgraph.logrotate-new mailgraph
-	fi
+	# logrotate config for mailgraph log
+	diropts ""
+	dodir /etc/logrotate.d
+	insopts -m0644
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/mailgraph.logrotate-new mailgraph
 
 	# mailgraph daemon
 	newbin mailgraph.pl mailgraph
 
 	# mailgraph CGI script
-	exeinto ${MY_CGIBINDIR}
+	exeinto "${MY_CGIBINDIR}"
 	doexe mailgraph.cgi
 
 	# init/conf files for mailgraph daemon
-	newinitd ${FILESDIR}/mailgraph.initd-new mailgraph
-	newconfd ${FILESDIR}/mailgraph.confd-new mailgraph
+	newinitd "${FILESDIR}"/mailgraph.initd-new mailgraph
+	newconfd "${FILESDIR}"/mailgraph.confd-new mailgraph
 
 	# docs
-	dodoc README CHANGES COPYING
+	dodoc README CHANGES
 }
 
 pkg_postinst() {
diff --git a/net-mail/mailgraph/mailgraph-1.14.ebuild b/net-mail/mailgraph/mailgraph-1.14.ebuild
index f3f5b0a2362f..11379f74d634 100644
--- a/net-mail/mailgraph/mailgraph-1.14.ebuild
+++ b/net-mail/mailgraph/mailgraph-1.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mailgraph/mailgraph-1.14.ebuild,v 1.3 2007/10/22 20:51:26 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mailgraph/mailgraph-1.14.ebuild,v 1.4 2007/11/14 19:29:51 ticho Exp $
 
 inherit eutils webapp
 
@@ -10,12 +10,11 @@ SRC_URI="http://mailgraph.schweikert.ch//pub/${P}.tar.gz"
 
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="logrotate"
+IUSE=""
 
 RDEPEND="dev-lang/perl
 	dev-perl/File-Tail
-	>=net-analyzer/rrdtool-1.2.2
-	logrotate? ( app-admin/logrotate )"
+	>=net-analyzer/rrdtool-1.2.2"
 DEPEND=">=sys-apps/sed-4"
 
 user_group_setup() {
@@ -65,14 +64,12 @@ src_install() {
 	dodir /var/run/mailgraph
 	keepdir /var/run/mailgraph
 
-	if use logrotate ; then
-		# logrotate config for mailgraph log
-		diropts ""
-		dodir /etc/logrotate.d
-		insopts -m0644
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}"/mailgraph.logrotate-new mailgraph
-	fi
+	# logrotate config for mailgraph log
+	diropts ""
+	dodir /etc/logrotate.d
+	insopts -m0644
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/mailgraph.logrotate-new mailgraph
 
 	# mailgraph daemon
 	newbin mailgraph.pl mailgraph
@@ -86,7 +83,7 @@ src_install() {
 	newconfd "${FILESDIR}"/mailgraph.confd-new mailgraph
 
 	# docs
-	dodoc README CHANGES COPYING
+	dodoc README CHANGES
 }
 
 pkg_postinst() {