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

Package-Manager: portage-2.1.4.4

5 files changed, 18 insertions, 63 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/Manifest b/net-analyzer/squid-graph/Manifest
index 0e8f2d325796..a1c4b8fdd0ab 100644
--- a/net-analyzer/squid-graph/Manifest
+++ b/net-analyzer/squid-graph/Manifest
@@ -1,7 +1,4 @@
-DIST squid-graph-3.1.tar.gz 349135 RMD160 91ca3ca06847241d1b1f63ce56cd9f5b93c1beeb SHA1 b1be1bc1c52b0ca666359d3153471dd3c2728735 SHA256 74e93b739faafb6533465712d8352daad29e208e4a4bfbaaadf03ed0bb557798
 DIST squid-graph-3.2.tar.gz 20066 RMD160 ef9068fc9784952cc5330a2285f05d3cee3a50ae SHA1 949dce0d747930dbdacb4687f0ded294f3f28936 SHA256 f83a801e85f0adf74638b47306eca262f4a694d98fb89236ed133caff8dbdcfb
-EBUILD squid-graph-3.1-r1.ebuild 882 RMD160 48fadcdccca186f5de0a33964710f26584a27397 SHA1 8c75e84dd5d6129f41383c665bc84c4cff0a5953 SHA256 6ec5df18544c113fd43779e6fbf1a8c941be0526224a31835797602aac4b5e85
-EBUILD squid-graph-3.1.ebuild 747 RMD160 8d5abf786c22afa9c6b4822d4482bebd4672a077 SHA1 ce9fb8f2b2029ee810749b957c3e726f5be4e0dd SHA256 218176737c91d0bd63ee51d9b0606f8820f555fd0520282a9ae6f1690c45c230
-EBUILD squid-graph-3.2.ebuild 625 RMD160 def910bdd089d290bfc983efa4ef1379a7ef673e SHA1 54b06546fb35bb23495a91fbc26e4eb08622cc84 SHA256 fc6bdc2d9dad56055dc809dd533412e432184cdc54aa625998ee56b1bba2066a
-MISC ChangeLog 2404 RMD160 65c33b3b0861cd53f56df95347069c6e8ba62a72 SHA1 0f25f0a8391d7a645a127ebb033ac9a0702b5850 SHA256 b8b0339f5568aa1f4f3c386bdcbc1ac4323650cde1df42faa948c1cf7764be6f
+EBUILD squid-graph-3.2.ebuild 843 RMD160 592e09f7558ac02c2707bf831506bc690fb459d8 SHA1 4e52faf7f1503f92f752ba270e745f3b23629ae5 SHA256 5a98004a1d95679a511b7ec2097e270e03a2e0548a85953f82bc9f3ef90b3a46
+MISC ChangeLog 2646 RMD160 97bbd19b269668b5774ff2ebe81359888f6229d8 SHA1 2f088ebb1ceab598aa1281dbf6860bb57c934e3a SHA256 c8ec37214fee267050651481292678295b1113122a4ace73de488bcc5e1427b4
 MISC metadata.xml 237 RMD160 7051efa4985d65a0bebd5266710d69252ff251df SHA1 9a137e487e3b706c1551ba0abc9c7f842e75b571 SHA256 3d83309f3cfa053d9b03dd42796b6c68a0ddbaa6e3256d920ad83c9861cf1e69
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