diff options
| author |   Torsten Veller <tove@gentoo.org> | 2010-09-24 11:15:12 +0000 |
|---|---|---|
| committer | Torsten Veller <tove@gentoo.org> | 2010-09-24 11:15:12 +0000 |
| commit | f4267660c9f890ba437dd55f7fb9d65565239c3d (patch) | |
| tree | c88677d8eb2fdaa830fb61aa77de99c7cd56fac5 | |
| parent | alpha/ia64/m68k/s390/sh/sparc stable wrt #334165 (diff) | |
| download | gentoo-2-f4267660c9f890ba437dd55f7fb9d65565239c3d.tar.gz gentoo-2-f4267660c9f890ba437dd55f7fb9d65565239c3d.tar.bz2 gentoo-2-f4267660c9f890ba437dd55f7fb9d65565239c3d.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)
(Portage version: 2.2_rc86/cvs/Linux x86_64)
| -rw-r--r-- | dev-lang/perl/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-lang/perl/perl-5.12.2-r1.ebuild | 13 |
2 files changed, 13 insertions, 6 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/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 |