www-apache/mod_perl: Better flag handling, force threading support on/off, bug 522698

Package-Manager: portage-2.3.2

diff --git a/www-apache/mod_perl/metadata.xml b/www-apache/mod_perl/metadata.xml
index f75208ced862f47cf9a681ff3097f26974bf9bc9..28acd8c809370b453093499546ebf516ffda3fbf 100644 (file)
--- a/www-apache/mod_perl/metadata.xml
+++ b/www-apache/mod_perl/metadata.xml
@@ -5,8 +5,11 @@
                <email>idl0r@gentoo.org</email>
                <name>Christian Ruppert</name>
        </maintainer>
-<maintainer type="project">
+       <maintainer type="project">
                <email>perl@gentoo.org</email>
                <name>Gentoo Perl Project</name>
        </maintainer>
+       <use>
+               <flag name="ithreads">Build for use with thread-capable perl, needs same setting as in dev-lang/perl</flag>
+       </use>
 </pkgmetadata>

diff --git a/www-apache/mod_perl/mod_perl-2.0.10_rc1.ebuild b/www-apache/mod_perl/mod_perl-2.0.10_rc1-r1.ebuild
similarity index 92%
rename from www-apache/mod_perl/mod_perl-2.0.10_rc1.ebuild
rename to www-apache/mod_perl/mod_perl-2.0.10_rc1-r1.ebuild
index f1db3195b4da30385ceed4961c50f42ea84f4189..3036d9f7fc57a1fcc447cd7006f3d7125dac843e 100644 (file)
--- a/www-apache/mod_perl/mod_perl-2.0.10_rc1.ebuild
+++ b/www-apache/mod_perl/mod_perl-2.0.10_rc1-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://dist.apache.org/repos/dist/dev/perl/mod_perl-2.0.10-rc1.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="1"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug test apache2_mpms_event apache2_mpms_worker apache2_mpms_prefork"
+IUSE="debug ithreads test"
 
 S=${WORKDIR}/${P/_rc1/-rc1}
 
@@ -29,11 +29,10 @@ SRC_TEST=do
 # default one, which will likely need threading...
 
 RDEPEND="
+       dev-lang/perl[ithreads=]
        >=dev-perl/Apache-Test-1.400.0
        >=www-servers/apache-2.0.47
-       apache2_mpms_event? ( dev-lang/perl[ithreads] )
-       apache2_mpms_worker? ( dev-lang/perl[ithreads] )
-       !apache2_mpms_event? ( !apache2_mpms_worker? ( !apache2_mpms_prefork? ( dev-lang/perl[ithreads] ) ) )
+       !ithreads? ( www-servers/apache[-apache2_mpms_event,-apache2_mpms_worker,apache2_mpms_prefork] )
 "
 DEPEND="${RDEPEND}
        dev-perl/Module-Build
@@ -74,12 +73,14 @@ src_prepare() {
 
 src_configure() {
        local debug=$(usex debug 1 0)
+       local nothreads=$(usex ithreads 0 1)
        myconf=(
                MP_USE_DSO=1
                MP_APXS=${APXS}
                MP_APR_CONFIG=/usr/bin/apr-1-config
                MP_TRACE=${debug}
                MP_DEBUG=${debug}
+               MP_NO_THREADS=${nothreads}
        )
 
        perl-module_src_configure