diff options
author | Michael Sterrett <mr_bones_@gentoo.org> | 2004-02-23 17:52:53 +0000 |
---|---|---|
committer | Michael Sterrett <mr_bones_@gentoo.org> | 2004-02-23 17:52:53 +0000 |
commit | 4e03898e014a6c15c9076466c54565d0adf66d5d (patch) | |
tree | 57f5270b2863448161f4b33ff679278dcd21bf37 /app-misc | |
parent | Version bumped. Closes 40767 (Manifest recommit) (diff) | |
download | gentoo-2-4e03898e014a6c15c9076466c54565d0adf66d5d.tar.gz gentoo-2-4e03898e014a6c15c9076466c54565d0adf66d5d.tar.bz2 gentoo-2-4e03898e014a6c15c9076466c54565d0adf66d5d.zip |
move webapp-detect into pkg_setup(); mips and amd64 need deps first
Diffstat (limited to 'app-misc')
-rw-r--r-- | app-misc/gallery/ChangeLog | 6 | ||||
-rw-r--r-- | app-misc/gallery/gallery-1.4.1_p1.ebuild | 6 | ||||
-rw-r--r-- | app-misc/gallery/gallery-1.4.2.ebuild | 7 |
3 files changed, 11 insertions, 8 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/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}." } |