Die in pkg_setup if dev-perl/GD has been installed without png USE flag (#193662). Update patches tarball to match the one used in latest mail-filter/dspam version.

(Portage version: 2.1.3.9)

3 files changed, 28 insertions, 11 deletions

diff --git a/www-apps/dspam-web/ChangeLog b/www-apps/dspam-web/ChangeLog
index 2e2d3eeb6201..3c6be8e5a8fc 100644
--- a/www-apps/dspam-web/ChangeLog
+++ b/www-apps/dspam-web/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-apps/dspam-web
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/dspam-web/ChangeLog,v 1.37 2007/06/24 09:11:57 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/dspam-web/ChangeLog,v 1.38 2007/09/24 20:40:54 mrness Exp $
+
+  24 Sep 2007; Alin Năstac <mrness@gentoo.org> dspam-web-3.8.0.ebuild:
+  Die in pkg_setup if dev-perl/GD has been installed without png USE flag
+  (#193662). Update patches tarball to match the one used in latest
+  mail-filter/dspam version.
 
   24 Jun 2007; Alin Năstac <mrness@gentoo.org> -dspam-web-3.6.8-r1.ebuild,
   dspam-web-3.8.0.ebuild:
diff --git a/www-apps/dspam-web/dspam-web-3.8.0.ebuild b/www-apps/dspam-web/dspam-web-3.8.0.ebuild
index 33fef5b5898a..91af7bdc8efb 100644
--- a/www-apps/dspam-web/dspam-web-3.8.0.ebuild
+++ b/www-apps/dspam-web/dspam-web-3.8.0.ebuild
@@ -1,21 +1,24 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/dspam-web/dspam-web-3.8.0.ebuild,v 1.7 2007/06/24 09:11:57 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/dspam-web/dspam-web-3.8.0.ebuild,v 1.8 2007/09/24 20:40:54 mrness Exp $
 
 inherit webapp eutils autotools
 
 DESCRIPTION="Web based administration and user controls for dspam"
 HOMEPAGE="http://dspam.nuclearelephant.com/"
 SRC_URI="http://dspam.nuclearelephant.com/sources/dspam-${PV}.tar.gz
-	mirror://gentoo/dspam-${PV}-patches-20070624.tar.gz"
+	mirror://gentoo/dspam-${PV}-patches-20070909.tar.gz"
 
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~ppc sparc x86"
 IUSE=""
 
-DEPEND=">=mail-filter/dspam-${PV}"
+# These are really run-time dependencies, but we need to make sure they are installed
+# before pkg_setup runs the built_with_use tests
+DEPEND=">=mail-filter/dspam-${PV}
+	dev-perl/GD"
+
 RDEPEND="${DEPEND}
-	>=dev-perl/GD-2.0
 	dev-perl/GD-Graph3d
 	dev-perl/GDGraph
 	dev-perl/GDTextUtil"
@@ -27,11 +30,20 @@ CONFDIR="/etc/mail/dspam"
 S="${WORKDIR}/dspam-${PV}"
 
 pkg_setup() {
-	if built_with_use mail-filter/dspam user-homedirs; then
-		eerror "The DSPAM web interface requires that dspam be installed without user-homedirs USE flag."
+	local use_errors=0
+	if built_with_use "mail-filter/dspam" user-homedirs; then
+		echo
+		eerror "The DSPAM web interface requires that mail-filter/dspam be installed without user-homedirs USE flag."
 		eerror "Please disable this flag and re-emerge dspam."
-		die "Incompatible mail-filter/dspam installation"
+		use_errors=$[${use_errors} + 1]
+	fi
+	if ! built_with_use "dev-perl/GD" png; then
+		echo
+		eerror "The DSPAM web interface requires that dev-perl/GD be installed with png USE flag."
+		eerror "Please enable this flag and re-emerge GD."
+		use_errors=$[${use_errors} + 1]
 	fi
+	[ ${use_errors} -gt 0 ] && die "Dependency installed with incompatible USE flags"
 
 	webapp_pkg_setup
 }
diff --git a/www-apps/dspam-web/files/digest-dspam-web-3.8.0 b/www-apps/dspam-web/files/digest-dspam-web-3.8.0
index fffdde243e3b..50934f6b11de 100644
--- a/www-apps/dspam-web/files/digest-dspam-web-3.8.0
+++ b/www-apps/dspam-web/files/digest-dspam-web-3.8.0
@@ -1,6 +1,6 @@
-MD5 1cf935d3402eb896a4fbca9c52abd108 dspam-3.8.0-patches-20070624.tar.gz 7808
-RMD160 bc0d8d439e7a9a89bfc3dfb4bee3a72d116abb6a dspam-3.8.0-patches-20070624.tar.gz 7808
-SHA256 6fcbb5b50d48d6aae716e88a52f4ed89debe93c0df875ff4c003c6147e2f8583 dspam-3.8.0-patches-20070624.tar.gz 7808
+MD5 5e0e9a8641d622239c5a5dfcd73e77c6 dspam-3.8.0-patches-20070909.tar.gz 7978
+RMD160 7cc8d84fd74b7158a4b3d292f37b5cae5bb5fe43 dspam-3.8.0-patches-20070909.tar.gz 7978
+SHA256 23401c5c85d50c48d4e7a286807d5bc45bd8afc78d9ca2c4816fb8aa746765d2 dspam-3.8.0-patches-20070909.tar.gz 7978
 MD5 056b8c8b3ad9415a52c01b22ff1e64cf dspam-3.8.0.tar.gz 726160
 RMD160 e7831e2415e30e819dd9cbc0ba3f269e113e2fb9 dspam-3.8.0.tar.gz 726160
 SHA256 84a227934a7aee73516bdb82c33ee7b359e955c8cd95a1544a9a13069f79bfc7 dspam-3.8.0.tar.gz 726160