diff options
author | Luca Longinotti <chtekk@gentoo.org> | 2007-05-12 04:30:35 +0000 |
---|---|---|
committer | Luca Longinotti <chtekk@gentoo.org> | 2007-05-12 04:30:35 +0000 |
commit | b71ce6c6d925929cd3cd6492c316778cd71c3bcd (patch) | |
tree | cd9892463adb5e9b9f3ae0ca1bb6b753b1e3b376 /www-apps/mod_survey | |
parent | Apache 1.X masking (fix ebuilds to not require apache-1*). (diff) | |
download | gentoo-2-b71ce6c6d925929cd3cd6492c316778cd71c3bcd.tar.gz gentoo-2-b71ce6c6d925929cd3cd6492c316778cd71c3bcd.tar.bz2 gentoo-2-b71ce6c6d925929cd3cd6492c316778cd71c3bcd.zip |
Apache 1.X masking (fix ebuilds to not require apache-1*).
(Portage version: 2.1.2.7)
Diffstat (limited to 'www-apps/mod_survey')
-rw-r--r-- | www-apps/mod_survey/ChangeLog | 5 | ||||
-rw-r--r-- | www-apps/mod_survey/mod_survey-3.2.4.ebuild | 11 |
2 files changed, 7 insertions, 9 deletions
diff --git a/www-apps/mod_survey/ChangeLog b/www-apps/mod_survey/ChangeLog index 8f5e37d373f7..31753f42fb8c 100644 --- a/www-apps/mod_survey/ChangeLog +++ b/www-apps/mod_survey/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for www-apps/mod_survey # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-apps/mod_survey/ChangeLog,v 1.1 2007/01/15 20:28:53 chtekk Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apps/mod_survey/ChangeLog,v 1.2 2007/05/12 04:30:35 chtekk Exp $ + + 12 May 2007; Luca Longinotti <chtekk@gentoo.org> mod_survey-3.2.4.ebuild: + Apache 1.X masking (fix ebuilds to not require apache-1*). 15 Jan 2007; Luca Longinotti <chtekk@gentoo.org> +files/language-list.txt, +files/postinstall-en.txt, +files/reconfig, +metadata.xml, diff --git a/www-apps/mod_survey/mod_survey-3.2.4.ebuild b/www-apps/mod_survey/mod_survey-3.2.4.ebuild index 34ee7dd75f89..21220739821b 100644 --- a/www-apps/mod_survey/mod_survey-3.2.4.ebuild +++ b/www-apps/mod_survey/mod_survey-3.2.4.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/www-apps/mod_survey/mod_survey-3.2.4.ebuild,v 1.1 2007/01/15 20:28:53 chtekk Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apps/mod_survey/mod_survey-3.2.4.ebuild,v 1.2 2007/05/12 04:30:35 chtekk Exp $ inherit webapp @@ -11,7 +11,7 @@ DESCRIPTION="XML-defined web questionnaires as a plug-in module using Apache." HOMEPAGE="http://www.modsurvey.org" KEYWORDS="~amd64 ~ppc ~x86" -IUSE="apache2 doc mysql nls postgres" +IUSE="doc mysql nls postgres" MY_PN=${PN/_/} MY_PV=${PV/_/-} S=${WORKDIR}/${PN} @@ -20,8 +20,7 @@ doc? ( http://www.modsurvey.org/download/tarballs/${MY_PN}-docs-${MY_PV}.tgz )" DEPEND=">=dev-lang/perl-5.6.1" RDEPEND="${DEPEND} - apache2? ( >=net-www/apache-2 >=www-apache/mod_perl-1.99 ) - !apache2? ( >=net-www/apache-1 <www-apache/mod_perl-1.99 ) + >=net-www/apache-2 >=www-apache/mod_perl-1.99 postgres? ( >=dev-perl/DBI-1.38 dev-perl/DBD-Pg ) mysql? ( >=dev-perl/DBI-1.38 dev-perl/DBD-mysql ) >=virtual/perl-CGI-3.0.0" @@ -58,10 +57,6 @@ src_unpack() { sed "s|\$lang = \"en\"|\$lang = \"${locallang}\"|" -i installer.pl fi fi - - if ! use apache2 ; then - sed "s|\$isa2 = \"Off\"|\$isa2 = \"On\"|" -i installer.pl - fi } src_install() { |