dylib fix for ppc-macos

Package-Manager: portage-2.0.51-r15

4 files changed, 38 insertions, 20 deletions

diff --git a/dev-libs/libpcre/ChangeLog b/dev-libs/libpcre/ChangeLog
index 1c90f61cc1f1..2590043eac79 100644
--- a/dev-libs/libpcre/ChangeLog
+++ b/dev-libs/libpcre/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/libpcre
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/ChangeLog,v 1.53 2005/02/06 23:43:16 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/ChangeLog,v 1.54 2005/02/13 20:33:39 j4rg0n Exp $
+
+  13 Feb 2005; Lina Pezzella <j4rg0n@gentoo.org>
+  +files/pcre-5.0-macos.patch, libpcre-5.0.ebuild:
+  dylib fix for ppc-macos
 
   07 Feb 2005; Bryan Østergaard <kloeri@gentoo.org> libpcre-5.0.ebuild:
   Stable on alpha.
diff --git a/dev-libs/libpcre/Manifest b/dev-libs/libpcre/Manifest
index 78f380ec3c56..17fe5821fe91 100644
--- a/dev-libs/libpcre/Manifest
+++ b/dev-libs/libpcre/Manifest
@@ -1,24 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 dc1959c19bf7a747559612d246527ef8 ChangeLog 6631
-MD5 47ad7fd446e1df9f7b55008a9aa8bbc1 libpcre-4.4.ebuild 1008
-MD5 42f44328776fc78276ac117ef396ce15 libpcre-5.0.ebuild 1054
-MD5 c1e212329f9083e2405b16dd382d6632 metadata.xml 259
+MD5 92a621cc4a62c715e8e0a4638c7e1bd0 ChangeLog 6758
+MD5 26b55861089b859f2eea2b9af15e653a libpcre-5.0.ebuild 1440
 MD5 59046451dd9a28a2a59c373b6b7f12c3 libpcre-4.2-r1.ebuild 852
+MD5 47ad7fd446e1df9f7b55008a9aa8bbc1 libpcre-4.4.ebuild 1008
 MD5 e11933575b142a8990bda3881545b63e libpcre-4.5.ebuild 1106
-MD5 0e2abdb46d4bf2a27fd55cf72358d465 files/pcre-4.2-macos.patch 1505
-MD5 1af02e35bc7fb89c7884027ff3a2a555 files/pcre-4.2-link.patch 717
-MD5 4e0522aaf9e2d5a196830b897f2341d2 files/digest-libpcre-4.5 61
-MD5 e8b4b76c398da338c2c88e5321435d78 files/digest-libpcre-4.4 61
+MD5 c1e212329f9083e2405b16dd382d6632 metadata.xml 259
 MD5 6f60a57bf3e47726ed16127d65ae834c files/digest-libpcre-5.0 61
 MD5 bf62625896b04a15d6ca53e66f2c3e1e files/pcre-5.0-uclibc-tuple.patch 1624
+MD5 50222f90517286730bd924d2543a316b files/pcre-5.0-macos.patch 1041
 MD5 9aa6aa1ebfe1906cfd3ce45e47a58873 files/digest-libpcre-4.2-r1 61
+MD5 e8b4b76c398da338c2c88e5321435d78 files/digest-libpcre-4.4 61
+MD5 4e0522aaf9e2d5a196830b897f2341d2 files/digest-libpcre-4.5 61
+MD5 1af02e35bc7fb89c7884027ff3a2a555 files/pcre-4.2-link.patch 717
+MD5 0e2abdb46d4bf2a27fd55cf72358d465 files/pcre-4.2-macos.patch 1505
 MD5 42a3f4bf8ab591263bcc23343f99c035 files/pcre-4.4-uclibc-tuple.patch 1437
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCBquaugEuf3OQ0akRAkFzAJ9zNN6mpyTonOQ6Wf/YSsZ/b+QNdgCdGtT2
-lyCf9nltt7pkqcetk0pO1aE=
-=v+Nx
------END PGP SIGNATURE-----
diff --git a/dev-libs/libpcre/files/pcre-5.0-macos.patch b/dev-libs/libpcre/files/pcre-5.0-macos.patch
new file mode 100644
index 000000000000..b51a2996cc12
--- /dev/null
+++ b/dev-libs/libpcre/files/pcre-5.0-macos.patch
@@ -0,0 +1,11 @@
+--- pcre-5.0/configure.orig	Sun Feb 13 15:07:14 2005
++++ pcre-5.0/configure	Sun Feb 13 15:09:10 2005
+@@ -6799,7 +6799,7 @@
+       link_all_deplibs=yes
+     if test "$GCC" = yes ; then
+     	output_verbose_link_cmd='echo'
+-        archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
++        archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname.dylib $verstring'
+       module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+       # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+       archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
diff --git a/dev-libs/libpcre/libpcre-5.0.ebuild b/dev-libs/libpcre/libpcre-5.0.ebuild
index dacc372b4100..cc01b9310225 100644
--- a/dev-libs/libpcre/libpcre-5.0.ebuild
+++ b/dev-libs/libpcre/libpcre-5.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/libpcre-5.0.ebuild,v 1.5 2005/02/06 23:43:16 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/libpcre-5.0.ebuild,v 1.6 2005/02/13 20:33:39 j4rg0n Exp $
 
 IUSE=""
 
@@ -23,6 +23,7 @@ src_unpack() {
 	cd ${S}
 	epatch ${FILESDIR}/pcre-5.0-uclibc-tuple.patch
 	epatch ${FILESDIR}/pcre-4.2-link.patch
+	use ppc-macos && epatch ${FILESDIR}/pcre-5.0-macos.patch
 	# position-independent code must used for all shared objects.
 	append-flags -fPIC
 	elibtoolize
@@ -37,6 +38,17 @@ src_compile() {
 src_install() {
 	make DESTDIR="${D}" install || die
 
+	if use ppc-macos; then
+		cd ${D}/usr/lib
+		for i in libpcre{,.0.0.1,.0} libpcreposix{,.0.0.0,.0}; do
+			mv $i $i.dylib
+		done
+		ln -sf libpcre.0.0.1.dylib libpcre.dylib
+		ln -sf libpcre.0.0.1.dylib libpcre.0.dylib
+		ln -sf libpcreposix.0.0.0.dylib libpcreposix.dylib
+		ln -sf libpcreposix.0.0.0.dylib libpcreposix.0.dylib
+	fi
+
 	dodoc AUTHORS INSTALL NON-UNIX-USE
 	dodoc doc/*.txt
 	dodoc doc/Tech.Notes