summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenedikt Boehm <hollow@gentoo.org>2008-02-06 21:22:02 +0000
committerBenedikt Boehm <hollow@gentoo.org>2008-02-06 21:22:02 +0000
commit8c275b79115b5e36a30faae6e7e067ebf0d72926 (patch)
treec94c088adb15aef268f194511dfe964784afc07f /www-apache
parentadd check_apache_threads_in; add APACHE_INCLUDEDIR; remove legacy APACHECTL (diff)
downloadhistorical-8c275b79115b5e36a30faae6e7e067ebf0d72926.tar.gz
historical-8c275b79115b5e36a30faae6e7e067ebf0d72926.tar.bz2
historical-8c275b79115b5e36a30faae6e7e067ebf0d72926.zip
use new depend.apache functions to simplify ebuild logic
Package-Manager: portage-2.1.4.1
Diffstat (limited to 'www-apache')
-rw-r--r--www-apache/mod_perl/ChangeLog5
-rw-r--r--www-apache/mod_perl/Manifest14
-rw-r--r--www-apache/mod_perl/mod_perl-2.0.3-r2.ebuild10
3 files changed, 19 insertions, 10 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/Manifest b/www-apache/mod_perl/Manifest
index 722ac9e5288b..08072205c4f6 100644
--- a/www-apache/mod_perl/Manifest
+++ b/www-apache/mod_perl/Manifest
@@ -1,9 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
AUX 2.0.3/75_mod_perl.conf 1221 RMD160 5fe4dee7d3123be5f3cd8cd41bb54fd1b63f0328 SHA1 068bf3f674a13e1db51046851a837ee7501353b7 SHA256 e7c2f4b84e9c9fc73e421740736f67674ebc7e7f13f8b2f71c9360f746fd441a
AUX 2.0.3/apache2-mod_perl-startup.pl 478 RMD160 ef12070dd5e5707286e3c714ec3aeae78ce5cfd4 SHA1 80ece64910771b6c36d7b2d30373287bc1bf4b87 SHA256 f77741fb3bb18928fb15f95c6908a17d8f06d7efbb6785e0732f201347e26544
AUX RegistryCooker.patch 1226 RMD160 21c434c214e1d6104a7aafd2330cbc70c717f768 SHA1 be4887aa6ba38a8cba5f1ceff1ccdd69e539a44c SHA256 f0d3e610cdac459de535143acf1f9a2a319327f9f956455a5279b02915e4a637
AUX mod_perl-2.0.1-sneak-tmpdir.patch 337 RMD160 56c6023dc46bb5531fa44730f52b68b8333155f0 SHA1 96b2a385e5934d99222de545836329ea359b8115 SHA256 1f319a15e3d12a349c46c0783c7ad840d81d01ed41adda55c47d4ac31595615d
DIST mod_perl-2.0.3.tar.gz 3714974 RMD160 29662a131c1bef6e4adc551d4467d12931a4d919 SHA1 e5d8b3cd7273c284cfbd79acb953ce179322bdc9 SHA256 df257f233ed6a5c9f8589d6e059563f816bf417f164fc3364a2a434de13045f2
EBUILD mod_perl-2.0.3-r1.ebuild 5297 RMD160 999a76d7bd87b18294fc8ee7e01abd54af8d08ae SHA1 82d5abb09b794256a89bf889690e8a86b3a45994 SHA256 8a503f3f1f9c8458f164257b60a79b1118f1c649c7d6c8d265d677a2af91b924
-EBUILD mod_perl-2.0.3-r2.ebuild 4645 RMD160 2778a9f564963073c2682a0857eb7fd43aefc6a1 SHA1 3566a8e9e1759608c94d4f5465eb27af41c4c90f SHA256 39c10c293289f4407b3432ed5572e287d2296d2ffa5d25fc2785f0499c3f6606
-MISC ChangeLog 17905 RMD160 8be70cbd30360a6f4ee3b64a4f606e0b13308f29 SHA1 01127b14b955be08dac5fdcdd72f3884e1b94651 SHA256 ab260b1714f043844045c3f4f7e89fb52a5b0695eeb416038657211d732c5611
+EBUILD mod_perl-2.0.3-r2.ebuild 4495 RMD160 16d262edfc13c1b9bb18ce65e085e3d2331f7ee8 SHA1 8360a4e495deb218b9fbe958a83a4045b40d76ef SHA256 32fb14f726dc72d9bd04a6cc15c033dcf9497ef747bf53bb714fcf379fa653df
+MISC ChangeLog 18041 RMD160 d24b5857e76c47512310aff4ff243dbbce12db61 SHA1 1d2ba37fb79be59887db8d06e29bfa7f22c3a061 SHA256 fe0ea2548c9731924ed5707c0b78f9c5803d09460c1061925833a916cf4698d4
MISC metadata.xml 289 RMD160 490c4256f14e1d9f37d432f700d4daea64a76b7c SHA1 e17d9d05b33898dddf745543d699ccb7348afc0a SHA256 a6c8f7ccb9eed3ab8dc936a39b96af61d48b48734852c78b80d85979508a13ce
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.8 (GNU/Linux)
+
+iEYEARECAAYFAkeqJQAACgkQmPFBzbX68WHCdQCfesIeUgqzVn0dJrN1e+VFu1Pz
+M8sAnjsqUM3Kpe/7yckF3gNkdHv7CWhV
+=wbHZ
+-----END PGP SIGNATURE-----
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