summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrandon Low <lostlogic@gentoo.org>2003-01-08 20:53:16 +0000
committerBrandon Low <lostlogic@gentoo.org>2003-01-08 20:53:16 +0000
commitb8c36d359ea8c9e47eb6358d395f5df19efa395d (patch)
tree88b49b956af37fa1a75a83bec6f6b7e95c2f45cc
parentfix comment (diff)
downloadgentoo-2-b8c36d359ea8c9e47eb6358d395f5df19efa395d.tar.gz
gentoo-2-b8c36d359ea8c9e47eb6358d395f5df19efa395d.tar.bz2
gentoo-2-b8c36d359ea8c9e47eb6358d395f5df19efa395d.zip
fix thread sed stuff
-rw-r--r--sys-devel/perl/ChangeLog12
-rw-r--r--sys-devel/perl/perl-5.8.0-r8.ebuild21
2 files changed, 22 insertions, 11 deletions
diff --git a/sys-devel/perl/ChangeLog b/sys-devel/perl/ChangeLog
index 5e2f8ae8faeb..c6733c1b5329 100644
--- a/sys-devel/perl/ChangeLog
+++ b/sys-devel/perl/ChangeLog
@@ -1,6 +1,14 @@
# ChangeLog for sys-devel/perl
# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/perl/ChangeLog,v 1.41 2003/01/08 20:43:02 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/perl/ChangeLog,v 1.42 2003/01/08 20:53:16 lostlogic Exp $
+
+* perl-5.8.0-r8 (06 Jan 2003)
+
+ 08 Jan 2003; Brandon Low <lostlogic@gentoo.org> perl-5.8.0-r8:
+ Later that day: dosed smells funny, switch some of it
+ to use just sed and a for loop, this smells better
+ to me, and fixed the problems I was having with
+ ${D} staying in the files.
08 Jan 2003; Martin Schlemmer <azarah@gentoo.org> perl-5.8.0-r8:
Remove a wild 'test' from comments =)
@@ -8,8 +16,6 @@
08 Jan 2003; Michael Cummings <mcummings@gentoo.org> perl-5.8.0-r8:
Unmasking for x86.
-* perl-5.8.0-r8 (06 Jan 2003)
-
08 Jan 2003; Brandon Low <lostlogic@gentoo.org> perl-5.8.0-r8:
Updated ewarn at the top so that it makes sense (was telling a user
they could use threads when they already were)
diff --git a/sys-devel/perl/perl-5.8.0-r8.ebuild b/sys-devel/perl/perl-5.8.0-r8.ebuild
index 914ee00b02f1..88e667ab70c3 100644
--- a/sys-devel/perl/perl-5.8.0-r8.ebuild
+++ b/sys-devel/perl/perl-5.8.0-r8.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2002 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/perl/perl-5.8.0-r8.ebuild,v 1.4 2003/01/08 20:43:02 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/perl/perl-5.8.0-r8.ebuild,v 1.5 2003/01/08 20:53:16 lostlogic Exp $
# The basic theory based on comments from Daniel Robbins <drobbins@gentoo.org>.
#
@@ -302,10 +302,12 @@ wait.h
EOF
# This is to fix a missing c flag for backwards compat
- dosed "s:ccflags=':ccflags='-DPERL5 :" \
- /usr/lib/perl5/${PV}/${myarch}${mythreading}/Config.pm
- dosed "s:cppflags=':cppflags='-DPERL5 :" \
- /usr/lib/perl5/${PV}/${myarch}${mythreading}/Config.pm
+ for i in `find ${D}/usr/lib/perl5 -iname "Config.pm"`;do
+ sed -e "s:ccflags=':ccflags='-DPERL5 :" \
+ -e "s:cppflags=':cppflags='-DPERL5 :" \
+ ${i} > ${i}.new &&\
+ mv ${i}.new ${i} || die "Sed failed"
+ done
# A poor fix for the miniperl issues
dosed 's:./miniperl:/usr/bin/perl:' /usr/lib/perl5/${PV}/ExtUtils/xsubpp
@@ -318,9 +320,12 @@ EOF
--man1dir="${D}/usr/share/man/man1" --man1ext='1' \
--man3dir="${D}/usr/share/man/man3" --man3ext='3'
- # This removes ${D} from Config.pm
- dosed /usr/lib/perl5/${PV}/${myarch}${mythreading}/Config.pm
- dosed /usr/lib/perl5/${PV}/${myarch}${mythreading}/.packlist
+ # This removes ${D} from Config.pm and .packlist
+ for i in `find ${D} -iname "Config.pm"` `find ${D} -iname ".packlist"`;do
+ einfo "Removing ${D} from ${i}..."
+ sed -e "s:${D}::" ${i} > ${i}.new &&\
+ mv ${i}.new ${i} || die "Sed failed"
+ done
fi
dodoc Changes* Artistic Copying README Todo* AUTHORS