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

(Portage version: 2.1.3.18)

5 files changed, 29 insertions, 91 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/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() {