Drop webapps eclass - bug #379535

Package-Manager: portage-2.1.10.11/cvs/Linux x86_64

diff --git a/net-mail/mailgraph/ChangeLog b/net-mail/mailgraph/ChangeLog
index d518eb30d22c614e76e60cafdaeeabc9e14aecd9..0ac29c6f8fd7a75e453bb6f9fb2b7f4222777017 100644 (file)
--- a/net-mail/mailgraph/ChangeLog
+++ b/net-mail/mailgraph/ChangeLog
@@ -1,8 +1,8 @@
 # ChangeLog for net-mail/mailgraph
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mailgraph/ChangeLog,v 1.37 2011/08/19 18:54:44 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mailgraph/ChangeLog,v 1.38 2011/08/19 19:00:53 eras Exp $
 
-  19 Aug 2011; Eray Aslan <eras@gentoo.org> mailgraph-1.14-r1.ebuild:
+  19 Aug 2011; Eray Aslan <eras@gentoo.org> +mailgraph-1.14-r2.ebuild:
   Drop webapps eclass - bug #379535
 
 *mailgraph-1.14-r1 (07 Jul 2011)

diff --git a/net-mail/mailgraph/Manifest b/net-mail/mailgraph/Manifest
index 62f59e360451c68d018d577928af0557d1e49686..f220805d8bda88b0c900a127cd96ee480e59278b 100644 (file)
--- a/net-mail/mailgraph/Manifest
+++ b/net-mail/mailgraph/Manifest
@@ -5,24 +5,25 @@ AUX mailgraph.confd-new 764 RMD160 579dd58dd2c2a2103236ed3b5b3dccdbdd8d3ba7 SHA1
 AUX mailgraph.initd-new 1100 RMD160 f055e723d7435805632ce5244d39828494f3923a SHA1 fcf531447a84b465d3fde75993e0dd83b7e41b4b SHA256 53b1fc00835bf377caf354611065a03c7318fe7fc35774adc6543e3f397073dc
 AUX mailgraph.logrotate-new 895 RMD160 62bac0366f91949747b2234b56d9a7bf61e5e47d SHA1 b7e4741bfac3021b6fcf5ce8911ec5a25b11c7f8 SHA256 3e1241e1d209a4679fe1f2f3d45716858acb1c0f1daac4b6709d9cb9d8564504
 DIST mailgraph-1.14.tar.gz 22014 RMD160 928969a4bdc3b9ff39a7fe16b98789f07b02e5f8 SHA1 6a2ead01ffd8fe49e520057daf97072e106b6c69 SHA256 50ea6ea8a33f5015926edd8b70a4d954ac27df4863514bddc5e69c948a7aac81
-EBUILD mailgraph-1.14-r1.ebuild 4010 RMD160 ecef6d26524a91ca353b97cfb67a0132e2ae23b3 SHA1 5138e4c7c3885f3b2643e2da222a323f71f67dd0 SHA256 d429c5caa3bd6305787c32f461633268894618dea30b67a481230589dcf7472f
+EBUILD mailgraph-1.14-r1.ebuild 3870 RMD160 abe0e8b805d2846ffa34da2ee9f057269a00a070 SHA1 b1a3acd1a6f9e2d3ddd706a5223fdd86f4a1f43d SHA256 54e8c70e18fd3fa3bc2697b107e2f15b2dfe38e22bfe2cb5969b524849a12824
+EBUILD mailgraph-1.14-r2.ebuild 3850 RMD160 f5e8e263de316e0819faf82b7df6a7120b388f52 SHA1 69837e0016a789a8a18d1819af91737dd9f7a5c5 SHA256 88147186e9851cabebd08268989a21ff1089416b24da9e95646efda320d4c0f5
 EBUILD mailgraph-1.14.ebuild 4174 RMD160 82025cc4d8ced0e7a1e62d43add6dc80c8a40186 SHA1 c11da4c6e8ae425ff0be27b87fc0dee6bcfde174 SHA256 1ab3656eb424a0c332c5246c53e8f923231eb0bf9e3b25078b20880eb3014dd6
-MISC ChangeLog 5267 RMD160 3c2f6054865d84dfe2a28b5da6cecf9720f69f26 SHA1 d5c60df3a2a5da81c1a0d1ca8e68d05edf0bb288 SHA256 d6ad3da0715e987bbb232272d7e97953cd494ba19cd16f87024eb7418cecb1c4
+MISC ChangeLog 5375 RMD160 fd428b5c597dec55a9b248895866b54b81b9dfaf SHA1 4fe427afc739bfd5d1fd643b99ca52b48bafce09 SHA256 c4be9425ebb57d83cfe5d0e857e82770c73d4d79471e326ab5f762668c697187
 MISC metadata.xml 163 RMD160 9d7831690071ef6a890ce066c38c9c4e851a2107 SHA1 6dcd4fa8a9b5cfcc7c0ae80c09e43395fe8e71a7 SHA256 38427b537ef2f561a685876ae3a7799382a1bf7fabef6c2d8765ca9d05056aa2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCAAGBQJOFcvsAAoJEHfx8XVYajsfqR0P/2cOPi1imHz61UPLqsbULZYb
-WcB8aVNywp2wGWXHdpU1jDBUSEUBtSC/d4TQsj6nm7E6Jm+pjIkn8fSeBFJBGnSU
-bnlEUAUkpjNoQxOAKQrBm3FCE7+lI5ywPQyBDY5Xr46XdYuQsh+qU1EXkBPpLJCF
-LisqdWzJqk+syISL7vTNHPwOupNsMlddhqnKW7QRAw5wZ9/skNxJifbsMf/ZQFlE
-/esbfYJCN+7bAg9rW0m+oiM0FOz00Bgvk5l2L2GYbj9EnYO2gsgUdtfwzC1rFedP
-eiygXdymrkiVW4BtrXu6sZdHT26ROJVHGakNVbBJYpCdQ42lJmLCdo1M76kbruPk
-CkG8Jt7iStvtWLPMnVgtMKPf+57HJGuueYY1n1dRa/55R9wS/RfiUa4YhuH33/lr
-lcv94cdoT929TY4GYoE16S4jwWOhq5UTtk/2SCTGAf2OdIiLH4diS2YHMr6lWNqu
-gFKFUKpktednmtQDd4ya2OkGiC9oley/wV2CGd3X59XHnjlk4v4SuJ9F4ueQxRR+
-05AZebQruGmGhUtYTkTMBgFVIoUgxwZx7HoN1A9DRHRAAseYlcZUCtwQsyf+1r8x
-xN2t5UiZqoNo9BPzJqSc9AyGEyJ7AodU91Qk4TBpsDW78P2Kjwft5BxZGqmALHFl
-gUZwo4nz288rcCUcJi/x
-=H6iX
+iQIcBAEBCAAGBQJOTrLyAAoJEHfx8XVYajsfvM0QAKLvGK/W9yzkiPsNPu7UloOT
+6zJFttNUfgHZEVrYIOkW6kODlZc9MYSje/lgPtFD4GKE2lFg8a+8mQeZ1Z3YDv0E
+fxGO+IDiOMt55s1rhuyKhnSyrRwCp94IiMDkRmsLdD18BcHGlYpVrcyQmR/Kz4+c
+wimFZIF3KVudZenVzncwThv0nrBa4vE36ZR26vulKWScter/oixqOVF5i6Ika8VM
+lkqMoI6DFuKaT8+xdrygsEyB9KTxvxuEpa1EasVP0dVqxRfolXaU2n8xNEaooz1Q
+MElr2FA1Fw0TvC9E1AQx+3j5Ckt5be1Y/JI5zuX0AWIN/AbTHLfycETa7PIYcgrj
+5ef23QByH53uCsO44i6pzQplrUsETRUtkgDBYkRmvei9itpZHuBvHuaf7iSDlLB3
+fMC4M3hnHS0Z/M9qb0R8yTCGYhQiLtRLVpaGVPhmLOGH46V2RrOTPkwdPpwGwu2z
+EFapMgjASlfMK54jlgTnk8Wt7cIsTBgY8+dFKFWEDrdYnODnMU/frikOdCWSfxHY
+/bjDlulYXgOow2COd6OzM+TpT/NZJgbsiD0oV2PtY0GQWWlQVKcd5FEY4tlSrsG8
+yWVGYIN5Qswk/y3nrGTH/XGMoNIYOdHZBloDpysZGXf2sPsPvABxhYOosyi5arQL
+yaCUcY1yPz7f8PNDzpvV
+=zo9w
 -----END PGP SIGNATURE-----

diff --git a/net-mail/mailgraph/mailgraph-1.14-r2.ebuild b/net-mail/mailgraph/mailgraph-1.14-r2.ebuild
new file mode 100644 (file)
index 0000000..58bd00a
--- /dev/null
+++ b/net-mail/mailgraph/mailgraph-1.14-r2.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mailgraph/mailgraph-1.14-r2.ebuild,v 1.1 2011/08/19 19:00:53 eras Exp $
+
+EAPI=4
+inherit eutils
+
+DESCRIPTION="A mail statistics RRDtool frontend for Postfix"
+HOMEPAGE="http://mailgraph.schweikert.ch/"
+SRC_URI="http://mailgraph.schweikert.ch//pub/${P}.tar.gz"
+
+LICENSE="GPL-2"
+# Change SLOT to 0 when appropriate
+SLOT="1.14"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="dev-lang/perl
+       dev-perl/File-Tail
+       >=net-analyzer/rrdtool-1.2.2[perl]"
+DEPEND=">=sys-apps/sed-4"
+
+pkg_setup() {
+       # add user and group for mailgraph daemon
+       # also add mgraph to the group adm so it's able to
+       # read syslog logfile /var/log/messages (should be owned by
+       # root:adm with permission 0640)
+       enewgroup mgraph
+       enewuser mgraph -1 -1 /var/empty mgraph,adm
+}
+
+src_prepare() {
+       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() {
+       # for the RRDs
+       dodir /var/lib
+       diropts -omgraph -gmgraph -m0750
+       dodir /var/lib/mailgraph
+       keepdir /var/lib/mailgraph
+
+       # log and pid file
+       diropts ""
+       dodir /var/log
+       dodir /var/run
+       diropts -omgraph -gadm -m0750
+       dodir /var/log/mailgraph
+       keepdir /var/log/mailgraph
+
+       # 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 /usr/share/${PN}
+       doexe mailgraph.cgi
+       insinto  /usr/share/${PN}
+       doins mailgraph.css
+
+       # init/conf files for mailgraph daemon
+       newinitd "${FILESDIR}"/mailgraph.initd-new mailgraph
+       newconfd "${FILESDIR}"/mailgraph.confd-new mailgraph
+
+       # docs
+       dodoc README CHANGES
+}
+
+pkg_postinst() {
+       # Fix ownerships - previous versions installed these with
+       # root as owner
+       if [[ ${REPLACING_VERSIONS} < 1.13 ]] ; then
+               if [[ -d /var/lib/mailgraph ]] ; then
+                       chown mgraph:mgraph /var/lib/mailgraph
+               fi
+               if [[ -d /var/log/mailgraph ]] ; then
+                       chown mgraph:adm /var/log/mailgraph
+               fi
+               if [[ -d /var/run/mailgraph ]] ; then
+                       chown mgraph:adm /var/run/mailgraph
+               fi
+       fi
+       elog "Mailgraph will run as user mgraph with group adm by default."
+       elog "This can be changed in /etc/conf.d/mailgraph if it doesn't fit."
+       elog "Remember to adjust MG_DAEMON_LOG, MG_DAEMON_PID and MG_DAEMON_RRD"
+       elog "as well!"
+       ewarn "Please make sure the MG_LOGFILE (default: /var/log/messages) is readable"
+       ewarn "by group adm or change MG_DAEMON_GID in /etc/conf.d/mailgraph accordingly!"
+       ewarn
+       ewarn "Please make sure *all* mail related logs (MTA, spamfilter, virus scanner)"
+       ewarn "go to the file /var/log/messages or change MG_LOGFILE in"
+       ewarn "/etc/conf.d/mailgraph accordingly! Otherwise mailgraph won't get to know"
+       ewarn "the corresponding events (virus/spam mail found etc.)."
+       elog
+       elog "Checking for user apache:"
+       if egetent passwd apache >&/dev/null; then
+               elog "Adding user apache to group mgraph so the included"
+               elog "CGI script is able to read the mailgraph RRD files"
+               if ! gpasswd -a apache mgraph >&/dev/null; then
+                       eerror "Failed to add user apache to group mgraph!"
+                       eerror "Please check manually."
+               fi
+       else
+               elog
+               elog "User apache not found, maybe we will be running a"
+               elog "webserver with a different UID?"
+               elog "If that's the case, please add that user to the"
+               elog "group mgraph manually to enable the included"
+               elog "CGI script to read the mailgraph RRD files:"
+               elog
+               elog "\tgpasswd -a <user> mgraph"
+       fi
+       ewarn
+       ewarn "mailgraph.cgi is installed in /usr/share/${PN}/"
+       ewarn "You need to put it somewhere accessible though a web-server."
+}