diff options
| author |   Benedikt Boehm <hollow@gentoo.org> | 2008-02-06 21:22:02 +0000 |
|---|---|---|
| committer | Benedikt Boehm <hollow@gentoo.org> | 2008-02-06 21:22:02 +0000 |
| commit | 98b5b75c50870410c59ec185e86566e77d6619fc (patch) | |
| tree | 732e6ad488518c3dfa466f746dfd20ee108a0bdf /www-apache | |
| parent | add check_apache_threads_in; add APACHE_INCLUDEDIR; remove legacy APACHECTL (diff) | |
| download | gentoo-2-98b5b75c50870410c59ec185e86566e77d6619fc.tar.gz gentoo-2-98b5b75c50870410c59ec185e86566e77d6619fc.tar.bz2 gentoo-2-98b5b75c50870410c59ec185e86566e77d6619fc.zip | |
use new depend.apache functions to simplify ebuild logic
(Portage version: 2.1.4.1)
Diffstat (limited to 'www-apache')
| -rw-r--r-- | www-apache/mod_perl/ChangeLog | 5 | ||||
| -rw-r--r-- | www-apache/mod_perl/mod_perl-2.0.3-r2.ebuild | 10 |
2 files changed, 7 insertions, 8 deletions
diff --git a/www-apache/mod_perl/ChangeLog b/www-apache/mod_perl/ChangeLog index 159ffe8305e2..cb055f8fa860 100644 --- a/www-apache/mod_perl/ChangeLog +++ b/www-apache/mod_perl/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for www-apache/mod_perl # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_perl/ChangeLog,v 1.55 2008/01/29 17:59:31 hollow Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_perl/ChangeLog,v 1.56 2008/02/06 21:22:02 hollow Exp $ + + 06 Feb 2008; Benedikt Böhm <hollow@gentoo.org> mod_perl-2.0.3-r2.ebuild: + use new depend.apache functions to simplify ebuild logic 29 Jan 2008; Benedikt Böhm <hollow@gentoo.org> mod_perl-2.0.3-r2.ebuild: fix depend.apache usage wrt #208033 diff --git a/www-apache/mod_perl/mod_perl-2.0.3-r2.ebuild b/www-apache/mod_perl/mod_perl-2.0.3-r2.ebuild index b944a345da28..0786ed574bb8 100644 --- a/www-apache/mod_perl/mod_perl-2.0.3-r2.ebuild +++ b/www-apache/mod_perl/mod_perl-2.0.3-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_perl/mod_perl-2.0.3-r2.ebuild,v 1.3 2008/01/29 17:59:31 hollow Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_perl/mod_perl-2.0.3-r2.ebuild,v 1.4 2008/02/06 21:22:02 hollow Exp $ inherit apache-module perl-module eutils multilib @@ -29,11 +29,7 @@ DOCFILES="Changes INSTALL LICENSE README STATUS" need_apache2 pkg_setup() { - if built_with_use www-servers/apache threads \ - && ! built_with_use dev-lang/perl ithreads; then - eerror "threaded MPMs require threaded perl" - die "emerge dev-lang/perl with USE=ithreads" - fi + check_apache_threads_in dev-lang/perl ithreads apache-module_pkg_setup } @@ -115,7 +111,7 @@ src_install() { dodir "${APACHE_MODULESDIR}" make install \ MODPERL_AP_LIBEXECDIR="${D}${APACHE_MODULESDIR}" \ - MODPERL_AP_INCLUDEDIR="${D}/usr/include/apache2" \ + MODPERL_AP_INCLUDEDIR="${D}${APACHE_INCLUDEDIR}" \ MP_INST_APACHE2=1 \ INSTALLDIRS=vendor || die |