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.

Package-Manager: portage-2.1.3.9

4 files changed, 44 insertions, 27 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/Manifest b/www-apps/dspam-web/Manifest
index b09f852a73af..3b0dfe9195db 100644
--- a/www-apps/dspam-web/Manifest
+++ b/www-apps/dspam-web/Manifest
@@ -17,27 +17,27 @@ AUX setperms 255 RMD160 4b29c87a2d1129c9aa9a7df9e2a6f412aeb029c8 SHA1 17f1bab636
 MD5 355cfc338e3f9e912ea954471b0bb458 files/setperms 255
 RMD160 4b29c87a2d1129c9aa9a7df9e2a6f412aeb029c8 files/setperms 255
 SHA256 85cfd1a8a6e322698c5e09573dfb4e04220e8642d1835e9a7eedbb809736e9ed files/setperms 255
-DIST dspam-3.8.0-patches-20070624.tar.gz 7808 RMD160 bc0d8d439e7a9a89bfc3dfb4bee3a72d116abb6a SHA1 1f95834dc06fa9a8ed402df015cf57aac957c7fe SHA256 6fcbb5b50d48d6aae716e88a52f4ed89debe93c0df875ff4c003c6147e2f8583
+DIST dspam-3.8.0-patches-20070909.tar.gz 7978 RMD160 7cc8d84fd74b7158a4b3d292f37b5cae5bb5fe43 SHA1 2f511ea80562ab6e4f81e4ad6db6a5c550cf5df5 SHA256 23401c5c85d50c48d4e7a286807d5bc45bd8afc78d9ca2c4816fb8aa746765d2
 DIST dspam-3.8.0.tar.gz 726160 RMD160 e7831e2415e30e819dd9cbc0ba3f269e113e2fb9 SHA1 d1de7ee2134522adaf52f49167accecf1589fa96 SHA256 84a227934a7aee73516bdb82c33ee7b359e955c8cd95a1544a9a13069f79bfc7
-EBUILD dspam-web-3.8.0.ebuild 2340 RMD160 6cc8cd02b5fdd4a754073a65080354cdc85135ce SHA1 df36261ba0cb2092072d298c1361b5228445993a SHA256 9cdd0d9a900c37503ad60c3d2421faa3618083f1de36cf20c9114492d15bd9fc
-MD5 5b2005243c7ddea0c1a156978eebec87 dspam-web-3.8.0.ebuild 2340
-RMD160 6cc8cd02b5fdd4a754073a65080354cdc85135ce dspam-web-3.8.0.ebuild 2340
-SHA256 9cdd0d9a900c37503ad60c3d2421faa3618083f1de36cf20c9114492d15bd9fc dspam-web-3.8.0.ebuild 2340
-MISC ChangeLog 6198 RMD160 2ff7fad12bd6a951dd59ebc89fc95e34c9f83bf0 SHA1 742fddb57904835b3426290a14824cc767d85f87 SHA256 bd6d309893086646a2a67d9835360f7a3b2ca406227787dedec49edeafacc7d8
-MD5 45eeb397e35852e83231dc48e9eecdeb ChangeLog 6198
-RMD160 2ff7fad12bd6a951dd59ebc89fc95e34c9f83bf0 ChangeLog 6198
-SHA256 bd6d309893086646a2a67d9835360f7a3b2ca406227787dedec49edeafacc7d8 ChangeLog 6198
+EBUILD dspam-web-3.8.0.ebuild 2812 RMD160 0c69af1c886e695f69e9cfd754670de3866f2fa4 SHA1 3ad0e5ecdeefab5d572cde85d694fa2b0e6ada23 SHA256 eeda19f5b44bd7c902b2593cc88be4f87cafc938a401beeae76de974ed2550ea
+MD5 7df12160fb867d1b61f86e54d82447ad dspam-web-3.8.0.ebuild 2812
+RMD160 0c69af1c886e695f69e9cfd754670de3866f2fa4 dspam-web-3.8.0.ebuild 2812
+SHA256 eeda19f5b44bd7c902b2593cc88be4f87cafc938a401beeae76de974ed2550ea dspam-web-3.8.0.ebuild 2812
+MISC ChangeLog 6442 RMD160 b0a64ccf311e72cd53b8a960d8487be8bb8468e2 SHA1 23c600a31ba12387aaddd4d89c0f4601448e6931 SHA256 6e1e046e747e88d22bfe3cb36ab18d7440ba97418a819f957c4c67aa941c3755
+MD5 225e13913e325a37937bd30273fb03bf ChangeLog 6442
+RMD160 b0a64ccf311e72cd53b8a960d8487be8bb8468e2 ChangeLog 6442
+SHA256 6e1e046e747e88d22bfe3cb36ab18d7440ba97418a819f957c4c67aa941c3755 ChangeLog 6442
 MISC metadata.xml 368 RMD160 47f34b035d0fc01757f976cb57a03373126f467f SHA1 ee7c74643fec7d1aba07021ad024bb71df713102 SHA256 7335198385eb9536d0b1b60080ca3336b70ea8defb53371d1e244249124a106e
 MD5 b3088113288dc10e76c2ab38a5ea3968 metadata.xml 368
 RMD160 47f34b035d0fc01757f976cb57a03373126f467f metadata.xml 368
 SHA256 7335198385eb9536d0b1b60080ca3336b70ea8defb53371d1e244249124a106e metadata.xml 368
-MD5 30005da33c9ae06bbb7c83273792965d files/digest-dspam-web-3.8.0 515
-RMD160 c3ac0383d6a11850312fe8090daefe8d8f7eee55 files/digest-dspam-web-3.8.0 515
-SHA256 562f52cb2ebee8c50c6371a547ffc10980268489f2f7c123cc9f5ea8311a26da files/digest-dspam-web-3.8.0 515
+MD5 364db534e85be932022e300e9ad47c28 files/digest-dspam-web-3.8.0 515
+RMD160 7a2f300c97ce96e6bcf349312f0beba622ca94f3 files/digest-dspam-web-3.8.0 515
+SHA256 a8d1bdbd27ebd9e7d663090bf7d0df5fda89db484a264bdf96d0b35dc012d615 files/digest-dspam-web-3.8.0 515
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.4 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFGfjVjJnxX6mF440QRAhXQAKC8S1jcBQD8MkZFJSR6Xbr/nXbtRgCcDaiA
-v1yE93p3VfmT+9ipCZYU/9s=
-=fmOK
+iD8DBQFG+CDgVSA5X31g7/gRAiZrAKCWj/ttKU+Mu6etzrzdLvro/ApTpgCgh78e
+5YOR3NiNTGN7Y0/KbUCr4I4=
+=0Sna
 -----END PGP SIGNATURE-----
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