diff options
| author |   Michael Cummings <mcummings@gentoo.org> | 2006-06-07 02:04:29 +0000 |
|---|---|---|
| committer | Michael Cummings <mcummings@gentoo.org> | 2006-06-07 02:04:29 +0000 |
| commit | aad75cc477824a6cb5cf331a5a547a091ad7b506 (patch) | |
| tree | 1dd73918c437c80be04e39f9cc8be059876bef37 /dev-lang | |
| parent | fixed digest problem with partial commit failure (diff) | |
| download | gentoo-2-aad75cc477824a6cb5cf331a5a547a091ad7b506.tar.gz gentoo-2-aad75cc477824a6cb5cf331a5a547a091ad7b506.tar.bz2 gentoo-2-aad75cc477824a6cb5cf331a5a547a091ad7b506.zip | |
Following a conversation with agaffney, removed code that is dup'd from libperl that was causing a loop in catalyst building - fixes help2man bugs
(Portage version: 2.1_rc2-r2)
Diffstat (limited to 'dev-lang')
| -rw-r--r-- | dev-lang/perl/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-lang/perl/perl-5.8.8-r2.ebuild | 32 |
2 files changed, 7 insertions, 31 deletions
diff --git a/dev-lang/perl/ChangeLog b/dev-lang/perl/ChangeLog index 5a27b6b2ae2b..bbe20a32f84c 100644 --- a/dev-lang/perl/ChangeLog +++ b/dev-lang/perl/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-lang/perl # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/ChangeLog,v 1.217 2006/06/03 18:08:15 gmsoft Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/ChangeLog,v 1.218 2006/06/07 02:04:29 mcummings Exp $ + + 07 Jun 2006; <mcummings@gentoo.org> perl-5.8.8-r2.ebuild: + Following a conversation with agaffney, removed code that is dup'd from + libperl that was causing a loop in catalyst building - fixes help2man bugs 03 Jun 2006; Guy Martin <gmsoft@gentoo.org> +files/perl-hppa-pa7200-configure.patch, perl-5.8.8-r2.ebuild: diff --git a/dev-lang/perl/perl-5.8.8-r2.ebuild b/dev-lang/perl/perl-5.8.8-r2.ebuild index a0ec4f3117ca..1380986bf92e 100644 --- a/dev-lang/perl/perl-5.8.8-r2.ebuild +++ b/dev-lang/perl/perl-5.8.8-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.8-r2.ebuild,v 1.11 2006/06/03 18:08:15 gmsoft Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.8-r2.ebuild,v 1.12 2006/06/07 02:04:29 mcummings Exp $ inherit eutils flag-o-matic toolchain-funcs multilib @@ -28,8 +28,7 @@ DEPEND="berkdb? ( sys-libs/db ) <sys-devel/libperl-5.9 !<perl-core/ExtUtils-MakeMaker-6.17 !<perl-core/File-Spec-0.87 - !<perl-core/Test-Simple-0.47-r1 - || ( sys-apps/coreutils app-admin/realpath sys-freebsd/freebsd-bin )" + !<perl-core/Test-Simple-0.47-r1" RDEPEND="~sys-devel/libperl-${PV} berkdb? ( sys-libs/db ) @@ -565,33 +564,6 @@ src_remove_extra_files() } pkg_postinst() { - # Make sure we do not have stale/invalid libperl.so 's ... - if [ -f "${ROOT}usr/$(get_libdir)/libperl$(get_libname)" -a ! -L "${ROOT}usr/$(get_libdir)/libperl$(get_libname)" ] - then - mv -f ${ROOT}usr/$(get_libdir)/libperl$(get_libname) ${ROOT}usr/$(get_libdir)/libperl$(get_libname).old - fi - - local perllib - if [[ -z $(type -p realpath) ]]; then - perllib="`readlink -f ${ROOT}usr/$(get_libdir)/libperl$(get_libname) | sed -e 's:^.*/::'`" - else - perllib="`realpath ${ROOT}usr/$(get_libdir)/libperl$(get_libname) | sed -e 's:^.*/::'`" - fi - - # If we are installing perl, we need the /usr/lib/libperl.so symlink to - # point to the version of perl we are running, else builing something - # against libperl.so will break ... - if [ "${perllib}" != "${LIBPERL}" ] - then - # Delete stale symlinks - rm -f ${ROOT}usr/$(get_libdir)/libperl$(get_libname) - rm -f ${ROOT}usr/$(get_libdir)/libperl$(get_libname ${PERLSLOT}) - # Regenerate libperl.so.${PERLSLOT} - ln -snf ${LIBPERL} ${ROOT}usr/$(get_libdir)/libperl$(get_libname).${PERLSLOT} - # Create libperl.so (we use the *soname* versioned lib here ..) - ln -snf libperl$(get_libname ${PERLSLOT}) ${ROOT}usr/$(get_libdir)/libperl$(get_libname) - fi - INC=$(perl -e 'for $line (@INC) { next if $line eq "."; next if $line =~ m/'${MY_PV}'|etc|local|perl$/; print "$line\n" }') if [ "${ROOT}" = "/" ] then |