media-libs/gd need truetype support for lables, bug #261955, thank Jean-Paul Bauer for report. Remove old.

(Portage version: 2.2_rc23/cvs/Linux i686)

3 files changed, 10 insertions, 76 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/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}