X-Git-Url: http://gitweb.michael.orlitzky.com/?p=mjo-overlay.git;a=blobdiff_plain;f=www-apache%2Fmod_perl%2Fmod_perl-2.0.9.ebuild;fp=www-apache%2Fmod_perl%2Fmod_perl-2.0.8-r2.ebuild;h=fa8aa3f1f3b1f3557dc8e4a7477f0a243c4956f0;hp=b4b85c96c06529d656520e70916414bff6a6b51d;hb=8823aae73b70a9edf3722ebbdfd6423d113c2d0c;hpb=f56b949a280e3bab62716891d40d924c2523fca6

diff --git a/www-apache/mod_perl/mod_perl-2.0.8-r2.ebuild b/www-apache/mod_perl/mod_perl-2.0.9.ebuild
similarity index 85%
rename from www-apache/mod_perl/mod_perl-2.0.8-r2.ebuild
rename to www-apache/mod_perl/mod_perl-2.0.9.ebuild
index b4b85c9..fa8aa3f 100644
--- a/www-apache/mod_perl/mod_perl-2.0.8-r2.ebuild
+++ b/www-apache/mod_perl/mod_perl-2.0.9.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="5"
+EAPI=5
 
 inherit depend.apache apache-module perl-module eutils
 
@@ -21,7 +21,6 @@ IUSE="debug"
 # We need both, apache and perl but either apache without threads or perl with
 # ithreads, bug 373943
 DEPEND="
-	>=dev-perl/Apache-Test-1.360
 	>=dev-perl/CGI-3.08
 	dev-lang/perl[ithreads]
 	www-servers/apache
@@ -34,7 +33,7 @@ APACHE2_MOD_FILE="${S}/src/modules/perl/mod_perl.so"
 APACHE2_MOD_CONF="2.0.3/75_${PN}"
 APACHE2_MOD_DEFINE="PERL"
 
-SRC_TEST="do"
+RESTRICT=test
 
 DOCFILES="Changes INSTALL README STATUS"
 
@@ -78,8 +77,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-2.0.4-inline.patch #550244
 
 	# bug 352724
-	epatch "${FILESDIR}/${P}-bundled-Apache-Test.patch"
-	rm -rf Apache-{Test,Reload,SizeLimit}/ lib/Bundle/
+	rm -rf Apache-{Reload,SizeLimit}/ lib/Bundle/ || die
 	sed -i \
 		-e 's:^Apache-\(Reload\|SizeLimit\|Test\).*::' \
 		-e 's:^lib/Bundle/Apache2.pm::' \
@@ -103,21 +101,6 @@ src_configure() {
 		|| die
 }
 
-src_test() {
-	# make test notes whether it is running as root, and drops
-	# privileges all the way to "nobody" if so, so we must adjust
-	# write permissions accordingly in this case.
-
-	# IF YOU SUDO TO EMERGE AND HAVE !env_reset set testing will fail!
-	if [[ "$(id -u)" == "0" ]]; then
-		chown nobody:nobody "${WORKDIR}" "${T}"
-	fi
-
-	# this does not || die because of bug 21325. kudos to smark for
-	# the idea of setting HOME.
-	TMPDIR="${T}" HOME="${T}/" perl-module_src_test
-}
-
 src_install() {
 	apache-module_src_install
 
@@ -150,8 +133,7 @@ src_install() {
 		"${D}/${VENDOR_ARCH}/Apache2/BuildConfig.pm" || die
 
 	for fname in $(find "${D}" -type f -not -name '*.so'); do
-		grep -q "\(${D}\|${S}\)" "${fname}" && ewarn "QA: File contains a temporary path ${fname}"
-		sed -i -e "s:\(${D}\|${S}\):/:g" ${fname}
+		sed -i -e "s:\(${D}\|${S}\):/:g" ${fname} || die
 	done
 	# All the rest
 	perl_remove_temppath