Bug #58165 fix. Keyword ~ppc-macos.

3 files changed, 41 insertions, 3 deletions

diff --git a/dev-libs/libpcre/ChangeLog b/dev-libs/libpcre/ChangeLog
index 976e72a6b767..375828b27c6c 100644
--- a/dev-libs/libpcre/ChangeLog
+++ b/dev-libs/libpcre/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/libpcre
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/ChangeLog,v 1.45 2004/10/08 19:05:12 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/ChangeLog,v 1.46 2004/10/09 02:03:50 j4rg0n Exp $
+
+  08 Oct 2004; Lina Pezzella <j4rg0n@gentoo.org> libpcre-4.5.ebuild:
+  Added patch for creation of dylibs on ppc-macos. Bug #58165. Thanks to Robin Munn for the submission.
+  Testing on ppc-macos.
 
   08 Oct 2004; Guy Martin <gmsoft@gentoo.org> libpcre-4.5.ebuild:
   Marked stable on hppa.
diff --git a/dev-libs/libpcre/files/pcre-4.2-macos.patch b/dev-libs/libpcre/files/pcre-4.2-macos.patch
new file mode 100644
index 000000000000..64675604d68b
--- /dev/null
+++ b/dev-libs/libpcre/files/pcre-4.2-macos.patch
@@ -0,0 +1,33 @@
+diff -urN pcre-4.5.orig/configure pcre-4.5/configure
+--- pcre-4.5.orig/configure	Sun Aug 15 15:29:25 2004
++++ pcre-4.5/configure	Sun Aug 15 15:26:54 2004
+@@ -5122,11 +5122,11 @@
+     # FIXME: Relying on posixy $() will cause problems for
+     #        cross-compilation, but unfortunately the echo tests do not
+     #        yet detect zsh echo's removal of \ escapes.
+-    archive_cmds='$CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linkopts -install_name $rpath/$soname $(test -n "$verstring" -a x$verstring != x0.0 && echo $verstring)'
++    archive_cmds='$CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linkopts -install_name $rpath/$soname $tmp_verstring'
+     # We need to add '_' to the symbols in $export_symbols first
+     #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
+-    hardcode_direct=yes
+-    hardcode_shlibpath_var=no
++    hardcode_direct=no
++    hardcode_shlibpath_var=yes
+     whole_archive_flag_spec='-all_load $convenience'
+     ;;
+
+diff -urN pcre-4.5.orig/ltmain.sh pcre-4.5/ltmain.sh
+--- pcre-4.5.orig/ltmain.sh	Sun Aug 15 15:30:00 2004
++++ pcre-4.5/ltmain.sh	Sun Aug 15 15:32:43 2004
+@@ -2990,6 +2990,11 @@
+ 	    done
+ 	    deplibs="$tmp_deplibs"
+ 	  done
++	  if test "x$verstring" = "x0.0"; then
++	    tmp_verstring=
++	  else
++	    tmp_verstring="$verstring"
++	  fi
+ 	  eval cmds=\"$archive_cmds\"
+ 	  deplibs="$save_deplibs"
+ 	fi
diff --git a/dev-libs/libpcre/libpcre-4.5.ebuild b/dev-libs/libpcre/libpcre-4.5.ebuild
index b5e438bf3403..d3b021b75702 100644
--- a/dev-libs/libpcre/libpcre-4.5.ebuild
+++ b/dev-libs/libpcre/libpcre-4.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/libpcre-4.5.ebuild,v 1.7 2004/10/08 19:05:12 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/libpcre-4.5.ebuild,v 1.8 2004/10/09 02:03:50 j4rg0n Exp $
 
 inherit libtool flag-o-matic eutils gnuconfig
 
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-${PV}.tar.bz
 
 LICENSE="as-is"
 SLOT="3"
-KEYWORDS="x86 ~ppc sparc alpha ~arm hppa amd64 ~ia64 ~ppc64 ~s390 mips"
+KEYWORDS="x86 ~ppc sparc alpha ~arm hppa amd64 ~ia64 ~ppc64 ~s390 mips ~ppc-macos"
 IUSE=""
 
 DEPEND="virtual/libc"
@@ -22,6 +22,7 @@ src_unpack() {
 	cd ${S}
 	epatch ${FILESDIR}/pcre-4.4-uclibc-tuple.patch
 	epatch ${FILESDIR}/pcre-4.2-link.patch
+	use ppc-macos && epatch ${FILESDIR}/pcre-4.2-macos.patch
 	# position-independent code must used for all shared objects.
 	append-flags -fPIC
 	elibtoolize