| 1 |
mrness 07/09/24 20:40:54 |
| 2 |
|
| 3 |
Modified: dspam-web-3.8.0.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
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. |
| 6 |
(Portage version: 2.1.3.9) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.8 www-apps/dspam-web/dspam-web-3.8.0.ebuild |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apps/dspam-web/dspam-web-3.8.0.ebuild?rev=1.8&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apps/dspam-web/dspam-web-3.8.0.ebuild?rev=1.8&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apps/dspam-web/dspam-web-3.8.0.ebuild?r1=1.7&r2=1.8 |
| 14 |
|
| 15 |
Index: dspam-web-3.8.0.ebuild |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/www-apps/dspam-web/dspam-web-3.8.0.ebuild,v |
| 18 |
retrieving revision 1.7 |
| 19 |
retrieving revision 1.8 |
| 20 |
diff -u -r1.7 -r1.8 |
| 21 |
--- dspam-web-3.8.0.ebuild 24 Jun 2007 09:11:57 -0000 1.7 |
| 22 |
+++ dspam-web-3.8.0.ebuild 24 Sep 2007 20:40:54 -0000 1.8 |
| 23 |
@@ -1,21 +1,24 @@ |
| 24 |
# Copyright 1999-2007 Gentoo Foundation |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
-# $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 $ |
| 27 |
+# $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 $ |
| 28 |
|
| 29 |
inherit webapp eutils autotools |
| 30 |
|
| 31 |
DESCRIPTION="Web based administration and user controls for dspam" |
| 32 |
HOMEPAGE="http://dspam.nuclearelephant.com/" |
| 33 |
SRC_URI="http://dspam.nuclearelephant.com/sources/dspam-${PV}.tar.gz |
| 34 |
- mirror://gentoo/dspam-${PV}-patches-20070624.tar.gz" |
| 35 |
+ mirror://gentoo/dspam-${PV}-patches-20070909.tar.gz" |
| 36 |
|
| 37 |
LICENSE="GPL-2" |
| 38 |
KEYWORDS="~amd64 ~ppc sparc x86" |
| 39 |
IUSE="" |
| 40 |
|
| 41 |
-DEPEND=">=mail-filter/dspam-${PV}" |
| 42 |
+# These are really run-time dependencies, but we need to make sure they are installed |
| 43 |
+# before pkg_setup runs the built_with_use tests |
| 44 |
+DEPEND=">=mail-filter/dspam-${PV} |
| 45 |
+ dev-perl/GD" |
| 46 |
+ |
| 47 |
RDEPEND="${DEPEND} |
| 48 |
- >=dev-perl/GD-2.0 |
| 49 |
dev-perl/GD-Graph3d |
| 50 |
dev-perl/GDGraph |
| 51 |
dev-perl/GDTextUtil" |
| 52 |
@@ -27,11 +30,20 @@ |
| 53 |
S="${WORKDIR}/dspam-${PV}" |
| 54 |
|
| 55 |
pkg_setup() { |
| 56 |
- if built_with_use mail-filter/dspam user-homedirs; then |
| 57 |
- eerror "The DSPAM web interface requires that dspam be installed without user-homedirs USE flag." |
| 58 |
+ local use_errors=0 |
| 59 |
+ if built_with_use "mail-filter/dspam" user-homedirs; then |
| 60 |
+ echo |
| 61 |
+ eerror "The DSPAM web interface requires that mail-filter/dspam be installed without user-homedirs USE flag." |
| 62 |
eerror "Please disable this flag and re-emerge dspam." |
| 63 |
- die "Incompatible mail-filter/dspam installation" |
| 64 |
+ use_errors=$[${use_errors} + 1] |
| 65 |
+ fi |
| 66 |
+ if ! built_with_use "dev-perl/GD" png; then |
| 67 |
+ echo |
| 68 |
+ eerror "The DSPAM web interface requires that dev-perl/GD be installed with png USE flag." |
| 69 |
+ eerror "Please enable this flag and re-emerge GD." |
| 70 |
+ use_errors=$[${use_errors} + 1] |
| 71 |
fi |
| 72 |
+ [ ${use_errors} -gt 0 ] && die "Dependency installed with incompatible USE flags" |
| 73 |
|
| 74 |
webapp_pkg_setup |
| 75 |
} |
| 76 |
|
| 77 |
|
| 78 |
|
| 79 |
1.38 www-apps/dspam-web/ChangeLog |
| 80 |
|
| 81 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apps/dspam-web/ChangeLog?rev=1.38&view=markup |
| 82 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apps/dspam-web/ChangeLog?rev=1.38&content-type=text/plain |
| 83 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apps/dspam-web/ChangeLog?r1=1.37&r2=1.38 |
| 84 |
|
| 85 |
Index: ChangeLog |
| 86 |
=================================================================== |
| 87 |
RCS file: /var/cvsroot/gentoo-x86/www-apps/dspam-web/ChangeLog,v |
| 88 |
retrieving revision 1.37 |
| 89 |
retrieving revision 1.38 |
| 90 |
diff -u -r1.37 -r1.38 |
| 91 |
--- ChangeLog 24 Jun 2007 09:11:57 -0000 1.37 |
| 92 |
+++ ChangeLog 24 Sep 2007 20:40:54 -0000 1.38 |
| 93 |
@@ -1,6 +1,11 @@ |
| 94 |
# ChangeLog for www-apps/dspam-web |
| 95 |
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 |
| 96 |
-# $Header: /var/cvsroot/gentoo-x86/www-apps/dspam-web/ChangeLog,v 1.37 2007/06/24 09:11:57 mrness Exp $ |
| 97 |
+# $Header: /var/cvsroot/gentoo-x86/www-apps/dspam-web/ChangeLog,v 1.38 2007/09/24 20:40:54 mrness Exp $ |
| 98 |
+ |
| 99 |
+ 24 Sep 2007; Alin Năstac <mrness@g.o> dspam-web-3.8.0.ebuild: |
| 100 |
+ Die in pkg_setup if dev-perl/GD has been installed without png USE flag |
| 101 |
+ (#193662). Update patches tarball to match the one used in latest |
| 102 |
+ mail-filter/dspam version. |
| 103 |
|
| 104 |
24 Jun 2007; Alin Năstac <mrness@g.o> -dspam-web-3.6.8-r1.ebuild, |
| 105 |
dspam-web-3.8.0.ebuild: |
| 106 |
|
| 107 |
|
| 108 |
|
| 109 |
-- |
| 110 |
gentoo-commits@g.o mailing list |
Archives