diff options
| author |   Benedikt Boehm <hollow@gentoo.org> | 2010-01-11 07:53:52 +0000 |
|---|---|---|
| committer | Benedikt Boehm <hollow@gentoo.org> | 2010-01-11 07:53:52 +0000 |
| commit | 568db56be0560ae18dfed565299df18e8fde3b53 (patch) | |
| tree | 39af9c77c25f9e49b16aab50aa6fb9394bdf9078 /www-apache/mod_perl | |
| parent | add Net-CIDR dependency wrt #287718 (diff) | |
| download | historical-568db56be0560ae18dfed565299df18e8fde3b53.tar.gz historical-568db56be0560ae18dfed565299df18e8fde3b53.tar.bz2 historical-568db56be0560ae18dfed565299df18e8fde3b53.zip | |
convert to EAPI2 wrt #296219
Package-Manager: portage-2.2_rc61/cvs/Linux i686
Diffstat (limited to 'www-apache/mod_perl')
| -rw-r--r-- | www-apache/mod_perl/ChangeLog | 7 | ||||
| -rw-r--r-- | www-apache/mod_perl/Manifest | 4 | ||||
| -rw-r--r-- | www-apache/mod_perl/mod_perl-2.0.4-r1.ebuild | 25 |
3 files changed, 20 insertions, 16 deletions
diff --git a/www-apache/mod_perl/ChangeLog b/www-apache/mod_perl/ChangeLog index fdcd67460d1d..2249b17b90e4 100644 --- a/www-apache/mod_perl/ChangeLog +++ b/www-apache/mod_perl/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for www-apache/mod_perl -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_perl/ChangeLog,v 1.83 2009/09/18 14:05:07 hollow Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_perl/ChangeLog,v 1.84 2010/01/11 07:53:52 hollow Exp $ + + 11 Jan 2010; Benedikt Böhm <hollow@gentoo.org> mod_perl-2.0.4-r1.ebuild: + convert to EAPI2 wrt #296219 18 Sep 2009; Benedikt Böhm <hollow@gentoo.org> -mod_perl-2.0.3-r2.ebuild, -mod_perl-2.0.4.ebuild, -files/RegistryCooker.patch: diff --git a/www-apache/mod_perl/Manifest b/www-apache/mod_perl/Manifest index 436a42f117ac..5b71f1550b54 100644 --- a/www-apache/mod_perl/Manifest +++ b/www-apache/mod_perl/Manifest @@ -3,6 +3,6 @@ AUX 2.0.3/apache2-mod_perl-startup.pl 478 RMD160 ef12070dd5e5707286e3c714ec3aeae AUX CVE-2009-0796.patch 1284 RMD160 b46e62380f82f7a05d62e9b65ae4c7d72a03aa8a SHA1 b4d79f705d6148b4cae34f05a4e01248839f8e72 SHA256 2ef34be0541cf9866d0af551e54d062c9c62d0e0f155d206bc710a3d125004d5 AUX mod_perl-2.0.1-sneak-tmpdir.patch 337 RMD160 56c6023dc46bb5531fa44730f52b68b8333155f0 SHA1 96b2a385e5934d99222de545836329ea359b8115 SHA256 1f319a15e3d12a349c46c0783c7ad840d81d01ed41adda55c47d4ac31595615d DIST mod_perl-2.0.4.tar.gz 3727717 RMD160 111b8f33e2dcc43ef7a0a7d557ceb467f0c55c6d SHA1 65299a16ec414a690a48a2bbe63acaa3c6bb897b SHA256 7da2046aa65dbef64ff5b71400bed4b6b82441e6313c8ca4becb85fb4a89a0f0 -EBUILD mod_perl-2.0.4-r1.ebuild 4328 RMD160 665833c5642cc69bcc787fa5faaa23bacb576f15 SHA1 d15e156d6ab5dd0346bd29143f191630e86a8e4b SHA256 77a33dddde195a551a2bae595541bf2e260b628a3ebfcb1fa5ac62bcc4ec16d9 -MISC ChangeLog 21200 RMD160 266b5cadf0f45e8b69c11e673a9753dd8b0fbb04 SHA1 d5ef9ba0f3d4b355b20771049475c567c1b8237c SHA256 b554a0f820eaf9308e4ae75bda088a69de980c28eb420260caa0fdc5f09b441e +EBUILD mod_perl-2.0.4-r1.ebuild 4398 RMD160 26331352b2bf65e0219b7ce9ef79716aac084199 SHA1 4e55813ed43551dd7a729c0ff18665b4f53c5d9b SHA256 e352434b6151d4e9755e4e73c983d8dfe6d50f3ed8d49aa7e9249ac55b54a0ad +MISC ChangeLog 21308 RMD160 97a0d9634ad5fbde28842afd83bb945e31348c3d SHA1 86a3de85652ae6b00361643fd891ba998ee4a3a7 SHA256 35c0192c51a9f33be2e1220b44ad1b8b00a09bf66b9e83e1d1c9100b38222a97 MISC metadata.xml 289 RMD160 490c4256f14e1d9f37d432f700d4daea64a76b7c SHA1 e17d9d05b33898dddf745543d699ccb7348afc0a SHA256 a6c8f7ccb9eed3ab8dc936a39b96af61d48b48734852c78b80d85979508a13ce diff --git a/www-apache/mod_perl/mod_perl-2.0.4-r1.ebuild b/www-apache/mod_perl/mod_perl-2.0.4-r1.ebuild index 7a99071d6ecc..3d4239b03416 100644 --- a/www-apache/mod_perl/mod_perl-2.0.4-r1.ebuild +++ b/www-apache/mod_perl/mod_perl-2.0.4-r1.ebuild @@ -1,6 +1,8 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 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.4-r1.ebuild,v 1.12 2009/07/22 14:04:15 josejx Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_perl/mod_perl-2.0.4-r1.ebuild,v 1.13 2010/01/11 07:53:52 hollow Exp $ + +EAPI="2" inherit apache-module perl-module eutils multilib @@ -16,7 +18,11 @@ SLOT="1" DEPEND=">=dev-perl/Apache-Test-1.27 >=virtual/perl-CGI-3.08 >=virtual/perl-IO-Compress-1.09 - !=www-servers/apache-2.2.11-r1" + !=www-servers/apache-2.2.11-r1 + || ( + ( www-servers/apache[threads] dev-lang/perl[ithreads] ) + ( www-servers/apache[-threads] dev-lang/perl[-ithreads] ) + )" RDEPEND="${DEPEND}" PDEPEND="dev-perl/Apache-Reload" @@ -28,14 +34,7 @@ DOCFILES="Changes INSTALL LICENSE README STATUS" need_apache2 -pkg_setup() { - has_apache_threads_in dev-lang/perl ithreads -} - -src_unpack() { - unpack ${A} - cd "${S}" - +src_prepare() { # I am not entirely happy with this solution, but here's what's # going on here if someone wants to take a stab at another # approach. When userpriv compilation is off, then the make @@ -73,7 +72,7 @@ src_unpack() { epatch "${FILESDIR}"/CVE-2009-0796.patch } -src_compile() { +src_configure() { perl Makefile.PL \ PREFIX="${D}"/usr \ MP_TRACE=1 \ @@ -81,7 +80,9 @@ src_compile() { MP_USE_DSO=1 \ MP_APXS=${APXS} \ INSTALLDIRS=vendor </dev/null || die +} +src_compile() { # reported that parallel make is broken in bug 30257 emake -j1 || die } |