summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTorsten Veller <tove@gentoo.org>2010-09-24 11:15:12 +0000
committerTorsten Veller <tove@gentoo.org>2010-09-24 11:15:12 +0000
commit90f99ef633f47238259e38df7cb363606c300a71 (patch)
tree984ec57df0301008c0cd9657ba742d5a97a943ac /dev-lang
parentalpha/ia64/m68k/s390/sh/sparc stable wrt #334165 (diff)
downloadhistorical-90f99ef633f47238259e38df7cb363606c300a71.tar.gz
historical-90f99ef633f47238259e38df7cb363606c300a71.tar.bz2
historical-90f99ef633f47238259e38df7cb363606c300a71.zip
Disable tests if run as root until there is a solution (#328793). Don't try to create a link for missing cpan-run-perl manpage (#307179)
Package-Manager: portage-2.2_rc86/cvs/Linux x86_64
Diffstat (limited to 'dev-lang')
-rw-r--r--dev-lang/perl/ChangeLog6
-rw-r--r--dev-lang/perl/Manifest4
-rw-r--r--dev-lang/perl/perl-5.12.2-r1.ebuild13
3 files changed, 15 insertions, 8 deletions
diff --git a/dev-lang/perl/ChangeLog b/dev-lang/perl/ChangeLog
index 7bb4ae59d6e9..a818539796a8 100644
--- a/dev-lang/perl/ChangeLog
+++ b/dev-lang/perl/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-lang/perl
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/ChangeLog,v 1.324 2010/09/21 14:26:08 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/ChangeLog,v 1.325 2010/09/24 11:15:12 tove Exp $
+
+ 24 Sep 2010; Torsten Veller <tove@gentoo.org> perl-5.12.2-r1.ebuild:
+ Disable tests if run as root until there is a solution (#328793). Don't
+ try to create a link for missing cpan-run-perl manpage (#307179)
*perl-5.12.2-r1 (21 Sep 2010)
diff --git a/dev-lang/perl/Manifest b/dev-lang/perl/Manifest
index 829d66966d1a..87ac302c74fd 100644
--- a/dev-lang/perl/Manifest
+++ b/dev-lang/perl/Manifest
@@ -36,8 +36,8 @@ DIST perl-5.8.8.tar.bz2 10123359 RMD160 e78f26d9b96e6db35f946ad4ff55e3a69385c71b
EBUILD perl-5.10.1.ebuild 18185 RMD160 0e3b9ab08c0466a9de90151af365197c6bc4c17f SHA1 b426fe6fb590fa43b86d1058e1b90cc7b4f02b44 SHA256 a895a1b9398fd9f2573930e53d12ce75d12e0d7e581fdd62d699417ab548086d
EBUILD perl-5.12.1-r1.ebuild 18793 RMD160 8ee9ccb69fc6bbda036b3fb46b2dee7db36a5cef SHA1 7afff5d0eb57ffed194bde64710b66c885a5ce53 SHA256 765c5c9a13d6314080488f5ef5343817ce6d174827ace2c0ac58fe342bb89a45
EBUILD perl-5.12.1-r2.ebuild 18918 RMD160 e161192272782e588ed187ec2abf96b7a8505c2c SHA1 af24062a30e5b0dc6890efbaa12013a422e962e3 SHA256 87a7df5062a9df47b048bf7067e50b11efc04dc167a18129732748646deff9ae
-EBUILD perl-5.12.2-r1.ebuild 19086 RMD160 e54d0c1c42e65508b39b67a3ed0fd342e0ce9522 SHA1 5aa58ae9c27253c3d763afcf6f87a1702dff6ed7 SHA256 6af7b72908a2157af1ebdeda1161eba25ecd34d39b9ad7b4e4d668773e10351e
+EBUILD perl-5.12.2-r1.ebuild 19190 RMD160 88e5a6215e47d6ff299be5db5b9a68ee2d5940c2 SHA1 78d2f6baa92f80db2c313ff98e47278138348fe4 SHA256 f263c9c65e4ef043ba42c8a0f19bc9cdbe939dc021f4c2cc6aabb8c419d6a574
EBUILD perl-5.12.2.ebuild 19056 RMD160 4047ee053e967b69f21a0315325adaf7871f9861 SHA1 615717bbce400317d04a85953b9fad97bc810561 SHA256 2e6c4f716ac01a8779b0cbd0a9b735fa6b6ab63ea01298bd99c896e283978597
EBUILD perl-5.8.8-r8.ebuild 20741 RMD160 387b31d0dc009abe64da05b927805dabde836ed3 SHA1 5db4fd908882140e56f6b385c28cdb6047b62bfc SHA256 b8e94ef00fadabccc97547611e9216b60b880f7896cefc713436c797565118ad
-MISC ChangeLog 66004 RMD160 8187dc82eaeda31ab020206330edfd476ca89693 SHA1 1fd5c58034ed68d2efed3996364fccd2a1ad1c66 SHA256 2fcb6a7a56bb95023664a618b451efe08d6212d673560f7c1ff6616c4c7cf311
+MISC ChangeLog 66217 RMD160 99f9c34a95bd92093abd1c63feed83836bd542f7 SHA1 af3a361ff7d7f382ae15d521e66f7667e850de0f SHA256 87b97263499321c80212566ccfa0d7778c0e14bbe650e9b2c6ec19f721b2971d
MISC metadata.xml 451 RMD160 8424230d79d13df7462c454050058b3526a78e92 SHA1 1ae85db5c1c1fc6413ca324ebc93b6894831b437 SHA256 49e06011c113616fa1f618cf58d42c2d6abbce5f71936f109b6ae3a5dfff587c
diff --git a/dev-lang/perl/perl-5.12.2-r1.ebuild b/dev-lang/perl/perl-5.12.2-r1.ebuild
index 5e926bae661b..b430097754eb 100644
--- a/dev-lang/perl/perl-5.12.2-r1.ebuild
+++ b/dev-lang/perl/perl-5.12.2-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.12.2-r1.ebuild,v 1.1 2010/09/21 14:26:08 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.12.2-r1.ebuild,v 1.2 2010/09/24 11:15:12 tove Exp $
EAPI=3
@@ -271,9 +271,10 @@ src_compile() {
}
src_test() {
-# if [[ ${EUID} == 0 ]] ; then
-# mv t/op/filetest{.t,.disable} || die
-# fi
+ if [[ ${EUID} == 0 ]] ; then
+ ewarn "Test fails with a sandbox error (#328793) if run as root. Skipping tests..."
+ return 0
+ fi
use elibc_uclibc && export MAKEOPTS+=" -j1"
TEST_JOBS=$(echo -j1 ${MAKEOPTS} | sed -r 's/.*(-j[[:space:]]*|--jobs=)([[:digit:]]+).*/\2/' ) \
make test_harness || die "test failed"
@@ -423,7 +424,9 @@ src_remove_dual_scripts() {
ff=`echo ${ROOT}/usr/share/man/man1/${i}-${ver}-${P}.1*`
ff=${ff##*.1}
alternatives_auto_makesym "/usr/bin/${i}" "/usr/bin/${i}-[0-9]*"
- alternatives_auto_makesym "/usr/share/man/man1/${i}.1${ff}" "/usr/share/man/man1/${i}-[0-9]*"
+ if [[ ${i} != cpanp-run-perl ]] ; then
+ alternatives_auto_makesym "/usr/share/man/man1/${i}.1${ff}" "/usr/share/man/man1/${i}-[0-9]*"
+ fi
done
elif has "${EBUILD_PHASE:-none}" "setup" ; then
for i in "$@" ; do