summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuca Longinotti <chtekk@gentoo.org>2007-05-12 03:10:55 +0000
committerLuca Longinotti <chtekk@gentoo.org>2007-05-12 03:10:55 +0000
commit94aedd0c1f93604e79ba969da388c3abdab51f91 (patch)
tree9c97a7332ef0b70785dacb22a43c2f59c617dc6c /dev-perl/HTML-Mason/HTML-Mason-1.35.ebuild
parentVersion bump. Fixes bugs #177042, #150831, #155372, #171739 thanks to Jesse F... (diff)
downloadgentoo-2-94aedd0c1f93604e79ba969da388c3abdab51f91.tar.gz
gentoo-2-94aedd0c1f93604e79ba969da388c3abdab51f91.tar.bz2
gentoo-2-94aedd0c1f93604e79ba969da388c3abdab51f91.zip
Apache 1.X masking (fix ebuilds to not require apache-1*).
(Portage version: 2.1.2.7)
Diffstat (limited to 'dev-perl/HTML-Mason/HTML-Mason-1.35.ebuild')
-rw-r--r--dev-perl/HTML-Mason/HTML-Mason-1.35.ebuild23
1 files changed, 6 insertions, 17 deletions
diff --git a/dev-perl/HTML-Mason/HTML-Mason-1.35.ebuild b/dev-perl/HTML-Mason/HTML-Mason-1.35.ebuild
index 7375d6e226d5..db4449ac0f8c 100644
--- a/dev-perl/HTML-Mason/HTML-Mason-1.35.ebuild
+++ b/dev-perl/HTML-Mason/HTML-Mason-1.35.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/HTML-Mason/HTML-Mason-1.35.ebuild,v 1.7 2007/03/05 11:59:40 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/HTML-Mason/HTML-Mason-1.35.ebuild,v 1.8 2007/05/12 03:10:55 chtekk Exp $
inherit perl-module
@@ -11,19 +11,14 @@ HOMEPAGE="http://www.masonhq.com/"
SLOT="0"
LICENSE="|| ( Artistic GPL-2 )"
KEYWORDS="~alpha amd64 ppc sparc x86"
-IUSE="apache2 modperl doc"
+IUSE="modperl doc"
SRC_TEST="do"
DEPEND="!modperl? ( virtual/perl-CGI )
modperl? (
- !apache2? (
- =net-www/apache-1*
- >=www-misc/libapreq-1.0-r2
- <www-apache/mod_perl-2 )
- apache2? (
- >=net-www/apache-2
- www-misc/libapreq2
- >=www-apache/mod_perl-2 )
+ >=net-www/apache-2
+ www-misc/libapreq2
+ >=www-apache/mod_perl-2
)
>=dev-perl/Params-Validate-0.7
>=dev-perl/module-build-0.28
@@ -46,13 +41,7 @@ perl-module_src_prep() {
sleep 5
fi
# rendhalver - needed to set an env var for the build script so it finds our apache.
- if use apache2; then
- APACHE="/usr/sbin/apache2"
- else
- APACHE="/usr/sbin/apache"
- fi
-
- APACHE="${APACHE}" perl ${S}/Build.PL installdirs=vendor destdir=${D} ${myconf}
+ APACHE="/usr/sbin/apache2" perl ${S}/Build.PL installdirs=vendor destdir=${D} ${myconf}
}
src_install () {