diff options
| -rw-r--r-- | net-analyzer/sarg/ChangeLog | 7 | ||||
| -rw-r--r-- | net-analyzer/sarg/Manifest | 6 | ||||
| -rw-r--r-- | net-analyzer/sarg/sarg-2.2.4.ebuild | 72 | ||||
| -rw-r--r-- | net-analyzer/sarg/sarg-2.2.5.ebuild | 7 |
4 files changed, 12 insertions, 80 deletions
diff --git a/net-analyzer/sarg/ChangeLog b/net-analyzer/sarg/ChangeLog index ac0dc7d1388b..ea96f05c44fe 100644 --- a/net-analyzer/sarg/ChangeLog +++ b/net-analyzer/sarg/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-analyzer/sarg # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sarg/ChangeLog,v 1.43 2009/03/08 11:04:36 cla Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sarg/ChangeLog,v 1.44 2009/03/16 16:30:01 pva Exp $ + + 16 Mar 2009; Peter Volkov <pva@gentoo.org> -sarg-2.2.4.ebuild, + sarg-2.2.5.ebuild: + media-libs/gd need truetype support for lables, bug #261955, thank + Jean-Paul Bauer for report. Remove old. 08 Mar 2009; Dawid Węgliński <cla@gentoo.org> ChangeLog: Migrate to EAPI 2 diff --git a/net-analyzer/sarg/Manifest b/net-analyzer/sarg/Manifest index 13b412507ebd..808675d677b4 100644 --- a/net-analyzer/sarg/Manifest +++ b/net-analyzer/sarg/Manifest @@ -1,8 +1,6 @@ AUX sarg-2.2.3.1-rewind.patch 450 RMD160 02eb366d4dfef00bdeb1683de09f48d79c6206bc SHA1 4ab1874a13ad580a1074387ea78593672381c855 SHA256 5652fa70ac5f074f43fbabd4f4cbd1875a39924da6550f4a821b826e0efa0cc6 DIST sarg-2.2.3.1-lots-of-compiler-warnings.patch.gz 6237 RMD160 67353fb39434bb5af8ac4c620643da1baf9336d1 SHA1 25630404296156565489d506ddd09b3c0991a8a0 SHA256 d68a9cfddf4886714fe53c4264cbbd992c8f0780c488515af2a9e1fbad016f89 -DIST sarg-2.2.4.tar.gz 639369 RMD160 470a8d78890f92471c92cc08e83d61fb21d0a508 SHA1 74c0e62e3391dbfe6c0f249f9e944f2b816c8d4e SHA256 7859e47d0511f5f593d903fe71fbcbdfbaa4cefb63aeedc472dfb0cfc28a70b5 DIST sarg-2.2.5.tar.gz 639563 RMD160 df88b592b4425a4d2d4a79a13ed8a47a5dc1bc20 SHA1 ac885a617d8701c548267db0d12e7e56bb14ed90 SHA256 4798d8219c3d8e06fe122f0ae49754d18abfb901463e5edd71f4b7a529c1e81d -EBUILD sarg-2.2.4.ebuild 2123 RMD160 125b5effb2bab06ae5c81119f08a17f38f339723 SHA1 3f5615fb39a0196a241c04dd8087501cda1ae34a SHA256 a375b38db8bcbd879f86dd411e8c823863298a26cbd843bbf148507f323d521d -EBUILD sarg-2.2.5.ebuild 1992 RMD160 e739eb57b62ea7ebe7bc98942375b5c6379e9642 SHA1 5fa926bbd06ffe04c4a2abb2de98f03920805065 SHA256 7e7d15c74e5a6b971ba5d38440c90e0934f6c35b877852e8825237c85bc9e7d7 -MISC ChangeLog 5601 RMD160 5ac6ace61a75125d64ac01d2ff8447247a882d54 SHA1 77b8e0bb561bd488e991ca607648109925602c51 SHA256 bb34620c769ebc232a82f78cb76f22529482a45ad74aca2a01b320a36da8fca1 +EBUILD sarg-2.2.5.ebuild 2021 RMD160 bae6c2141111afa6c615ad91e0e0eef5b8a61e77 SHA1 8bee25106df1bd6afcffb8db677c6afec98f7bff SHA256 96b8b14276c93872fed571ebd7a09fa6ff7fdc25f8870006133275424ef9e0fd +MISC ChangeLog 5799 RMD160 6aeebe14f24a94b9369edb54d072b74491b07ff7 SHA1 341aa7347b33bb2f998e699f2604256911c4e28b SHA256 75eab0bbb70a95108029b6a1a002238148c2d6b39a4081a549c6f50de992be98 MISC metadata.xml 499 RMD160 e1d8c2429d6e6bd52372c29d5921a33d3751be8f SHA1 cbbf1d8a5bf9bcbeffc62ea41e8145a04b863a55 SHA256 73e57d3a1296fbef657981debed6854802edc051c1a4be60bfb37bdcbbb748a0 diff --git a/net-analyzer/sarg/sarg-2.2.4.ebuild b/net-analyzer/sarg/sarg-2.2.4.ebuild deleted file mode 100644 index df58897e7aea..000000000000 --- a/net-analyzer/sarg/sarg-2.2.4.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sarg/sarg-2.2.4.ebuild,v 1.4 2008/03/06 13:50:38 beandog Exp $ - -inherit eutils - -DESCRIPTION="Squid Analysis Report Generator" -HOMEPAGE="http://sarg.sourceforge.net/sarg.php" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz - mirror://gentoo/sarg-2.2.3.1-lots-of-compiler-warnings.patch.gz" - -LICENSE="GPL-2" -KEYWORDS="amd64 ppc x86" -SLOT="0" -IUSE="" - -DEPEND="media-libs/gd" - -pkg_setup() { - built_with_use -a media-libs/gd png || die \ - "Please recompile media-libs/gd with USE=\"png\"" -} - -src_unpack() { - unpack ${A} - cd "${S}" - - epatch "${WORKDIR}"/${PN}-2.2.3.1-lots-of-compiler-warnings.patch - epatch "${FILESDIR}"/${PN}-2.2.3.1-rewind.patch - - # Fixes bug #43132 - sed -i \ - -e 's:"/usr/local/squid/var/logs/access.log":"/var/log/squid/access.log":' \ - -e 's:"/var/www/html/squid-reports":"/var/www/localhost/htdocs/squid-reports":' \ - log.c || die "setting default for gentoo directories... failed" - - sed -i \ - -e 's:/usr/local/squid/var/logs/access.log:/var/log/squid/access.log:' \ - -e 's:/var/www/html/squid-reports:/var/www/localhost/htdocs/squid-reports:' \ - sarg.conf || die "setting default for gentoo directories... failed" - - # Fixes bug #64743 - sed -i -e 's:sarg_tmp:sarg:' email.c || die "fixing dir in email.c failed" - - sed -i \ - -e 's:/usr/local/sarg/sarg.conf:/etc/sarg/sarg.conf:' \ - -e 's:/usr/local/squid/logs/access.log:/var/log/squid/access.log:' \ - sarg.1 || die "Failed to fix man page." -} - -src_compile() { - econf \ - --enable-bindir=/usr/bin \ - --enable-mandir=/usr/share/man/man1 \ - --enable-sysconfdir=/etc/sarg/ || die "econf failed" - - emake || die "emake failed" -} - -src_install() { - # This is workaround for sarg installation script, which does not create dirs - dodir /etc/sarg /usr/sbin - - make \ - BINDIR="${D}"/usr/sbin \ - MANDIR="${D}"/usr/share/man/man1 \ - SYSCONFDIR="${D}"/etc/sarg \ - HTMLDIR="${D}"/var/www/html \ - install || die "sarg installation failed" - - dodoc BETA-TESTERS CONTRIBUTORS DONATIONS README ChangeLog htaccess -} diff --git a/net-analyzer/sarg/sarg-2.2.5.ebuild b/net-analyzer/sarg/sarg-2.2.5.ebuild index fc93eb043632..afb66cac6eb4 100644 --- a/net-analyzer/sarg/sarg-2.2.5.ebuild +++ b/net-analyzer/sarg/sarg-2.2.5.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/net-analyzer/sarg/sarg-2.2.5.ebuild,v 1.5 2009/03/08 11:03:33 cla Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sarg/sarg-2.2.5.ebuild,v 1.6 2009/03/16 16:30:01 pva Exp $ EAPI="2" @@ -16,7 +16,8 @@ KEYWORDS="amd64 ppc x86" SLOT="0" IUSE="" -DEPEND="media-libs/gd[png]" +DEPEND="media-libs/gd[png,truetype]" +RDEPEND="${DEPEND}" src_unpack() { unpack ${A} |