squid-graph does not works with dev-perl/GD built without png USE flag, bug #222425, thank Mike Weissman for report.

(Portage version: 2.1.4.4)

4 files changed, 16 insertions, 58 deletions

diff --git a/net-analyzer/squid-graph/ChangeLog b/net-analyzer/squid-graph/ChangeLog
index ebb79a64cb63..ba61d3438813 100644
--- a/net-analyzer/squid-graph/ChangeLog
+++ b/net-analyzer/squid-graph/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/squid-graph
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/squid-graph/ChangeLog,v 1.19 2008/01/21 14:08:25 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/squid-graph/ChangeLog,v 1.20 2008/05/24 15:11:55 pva Exp $
+
+  24 May 2008; Peter Volkov <pva@gentoo.org> -squid-graph-3.1.ebuild,
+  -squid-graph-3.1-r1.ebuild, squid-graph-3.2.ebuild:
+  squid-graph does not works with dev-perl/GD built without png USE flag,
+  bug #222425, thank Mike Weissman for report.
 
   21 Jan 2008; Raúl Porcel <armin76@gentoo.org> squid-graph-3.2.ebuild:
   sparc/x86 stable
diff --git a/net-analyzer/squid-graph/squid-graph-3.1-r1.ebuild b/net-analyzer/squid-graph/squid-graph-3.1-r1.ebuild
deleted file mode 100644
index 8e1ea1ef04ab..000000000000
--- a/net-analyzer/squid-graph/squid-graph-3.1-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/squid-graph/squid-graph-3.1-r1.ebuild,v 1.4 2007/07/11 23:49:24 mr_bones_ Exp $
-
-DESCRIPTION="Squid logfile analyzer and traffic grapher"
-HOMEPAGE="http://squid-graph.securlogic.com/"
-SRC_URI="http://squid-graph.securlogic.com/files/stable/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
-
-DEPEND="dev-perl/GD"
-
-src_install () {
-	dobin bin/apacheconv bin/generate.cgi bin/squid-graph bin/timeconv || \
-		die "dobin failed"
-	dodoc docs/CHANGELOG docs/README
-	dohtml docs/html/*
-
-	# install logo.png to a static location - bug 92668
-	insinto /usr/share/${PN}
-	doins docs/html/logo.png
-}
-
-pkg_postinst () {
-	elog
-	elog "Remember to copy /usr/share/${PN}/logo.png to your output directory"
-	elog
-}
diff --git a/net-analyzer/squid-graph/squid-graph-3.1.ebuild b/net-analyzer/squid-graph/squid-graph-3.1.ebuild
deleted file mode 100644
index 1b4bc2b11f5a..000000000000
--- a/net-analyzer/squid-graph/squid-graph-3.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/squid-graph/squid-graph-3.1.ebuild,v 1.10 2007/07/11 23:49:24 mr_bones_ Exp $
-
-DESCRIPTION="Squid logfile analyzer and traffic grapher"
-HOMEPAGE="http://squid-graph.securlogic.com/"
-SRC_URI="http://squid-graph.securlogic.com/files/stable/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="ppc x86 sparc"
-IUSE=""
-
-DEPEND="dev-perl/GD"
-
-src_install () {
-	dobin bin/apacheconv bin/generate.cgi bin/squid-graph bin/timeconv
-	dodoc docs/CHANGELOG docs/README
-	dohtml docs/html/*
-	prepalldocs
-}
-
-pkg_postinst () {
-	elog "Remember to copy /usr/share/doc/${P}/html/logo.png to your output directory"
-}
diff --git a/net-analyzer/squid-graph/squid-graph-3.2.ebuild b/net-analyzer/squid-graph/squid-graph-3.2.ebuild
index e1796b56c842..6d721e53e06c 100644
--- a/net-analyzer/squid-graph/squid-graph-3.2.ebuild
+++ b/net-analyzer/squid-graph/squid-graph-3.2.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/squid-graph/squid-graph-3.2.ebuild,v 1.2 2008/01/21 14:08:25 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/squid-graph/squid-graph-3.2.ebuild,v 1.3 2008/05/24 15:11:55 pva Exp $
+
+inherit eutils
 
 DESCRIPTION="Squid logfile analyzer and traffic grapher"
 HOMEPAGE="http://squid-graph.sourceforge.net/"
@@ -16,6 +18,13 @@ RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/${PN}
 
+pkg_setup() {
+	if ! built_with_use dev-perl/GD png; then
+		eerror "${CATEGORY}/${PN} requires dev-perl/GD be built with png USE flag."
+		die "Please, reemerge dev-perl/GD with png USE flag enabled."
+	fi
+}
+
 src_install () {
 	dobin apacheconv generate.cgi squid-graph timeconv || die "dobin failed"
 	dodoc docs