move webapp-detect into pkg_setup(); mips and amd64 need deps first

4 files changed, 14 insertions, 11 deletions

diff --git a/app-misc/gallery/ChangeLog b/app-misc/gallery/ChangeLog
index 375d9b78fc7b..b1da36892e7f 100644
--- a/app-misc/gallery/ChangeLog
+++ b/app-misc/gallery/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-misc/gallery
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gallery/ChangeLog,v 1.22 2004/02/12 18:57:33 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gallery/ChangeLog,v 1.23 2004/02/23 17:52:53 mr_bones_ Exp $
+
+  23 Feb 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  gallery-1.4.1_p1.ebuild, gallery-1.4.2.ebuild:
+  move webapp-detect into pkg_setup(); mips and amd64 need deps first
 
 *gallery-1.4.2 (12 Feb 2004)
 
diff --git a/app-misc/gallery/Manifest b/app-misc/gallery/Manifest
index 4b0506ef31f2..c31c35884878 100644
--- a/app-misc/gallery/Manifest
+++ b/app-misc/gallery/Manifest
@@ -1,6 +1,6 @@
-MD5 217775c150772669405a8494b6b674e0 ChangeLog 2450
-MD5 c6c997a7aa63ea661001cd1dd03845c3 gallery-1.4.2.ebuild 1752
+MD5 a0ad1468f317f7cbe7c13912962b9d04 ChangeLog 2627
+MD5 e0a5025568093700e2e4ad9bc3733817 gallery-1.4.2.ebuild 1748
+MD5 d44d8e7cfa6592b84023a8044f15fb3c gallery-1.4.1_p1.ebuild 1791
 MD5 c339473e0ff43da76eb2f2607c441921 metadata.xml 280
-MD5 848684248a6ded33e710628847fc2cba gallery-1.4.1_p1.ebuild 1792
 MD5 44bf6fed00843f0654d7cfcb988beb36 files/digest-gallery-1.4.2 66
 MD5 d4812c8c0c1fad4c00cda3e8ad7bbe8a files/digest-gallery-1.4.1_p1 69
diff --git a/app-misc/gallery/gallery-1.4.1_p1.ebuild b/app-misc/gallery/gallery-1.4.1_p1.ebuild
index 0c4cb8dd0977..f9edb8e69f06 100644
--- a/app-misc/gallery/gallery-1.4.1_p1.ebuild
+++ b/app-misc/gallery/gallery-1.4.1_p1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gallery/gallery-1.4.1_p1.ebuild,v 1.1 2004/01/25 18:46:47 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gallery/gallery-1.4.1_p1.ebuild,v 1.2 2004/02/23 17:52:53 mr_bones_ Exp $
 
 inherit webapp-apache
 
@@ -12,7 +12,7 @@ RESTRICT="nomirror"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
-KEYWORDS="x86 ppc sparc alpha mips hppa amd64"
+KEYWORDS="x86 ppc sparc alpha hppa ~amd64"
 DEPEND=">=net-www/apache-1.3.24-r1
 	>=dev-php/mod_php-4.1.2-r5
 	>=media-gfx/jhead-1.6
@@ -21,9 +21,9 @@ DEPEND=">=net-www/apache-1.3.24-r1
 
 S=${WORKDIR}/${PN}
 
-webapp-detect || NO_WEBSERVER=1
 
 pkg_setup() {
+	webapp-detect || NO_WEBSERVER=1
 	webapp-pkg_setup "${NO_WEBSERVER}"
 	einfo "Installing into ${ROOT}${HTTPD_ROOT}."
 }
diff --git a/app-misc/gallery/gallery-1.4.2.ebuild b/app-misc/gallery/gallery-1.4.2.ebuild
index f495b61500b3..9aab9ada6351 100644
--- a/app-misc/gallery/gallery-1.4.2.ebuild
+++ b/app-misc/gallery/gallery-1.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gallery/gallery-1.4.2.ebuild,v 1.1 2004/02/12 18:57:33 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gallery/gallery-1.4.2.ebuild,v 1.2 2004/02/23 17:52:53 mr_bones_ Exp $
 
 inherit webapp-apache
 
@@ -12,7 +12,7 @@ RESTRICT="nomirror"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~amd64"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64"
 DEPEND=">=net-www/apache-1.3.24-r1
 	>=dev-php/mod_php-4.1.2-r5
 	>=media-gfx/jhead-1.6
@@ -21,9 +21,8 @@ DEPEND=">=net-www/apache-1.3.24-r1
 
 S=${WORKDIR}/${PN}
 
-webapp-detect || NO_WEBSERVER=1
-
 pkg_setup() {
+	webapp-detect || NO_WEBSERVER=1
 	webapp-pkg_setup "${NO_WEBSERVER}"
 	einfo "Installing into ${ROOT}${HTTPD_ROOT}."
 }