Fixed dirty hack.

Package-Manager: portage-2.0.51.19

4 files changed, 8 insertions, 29 deletions

diff --git a/dev-libs/libpcre/ChangeLog b/dev-libs/libpcre/ChangeLog
index 6f5d54306339..34489808ded1 100644
--- a/dev-libs/libpcre/ChangeLog
+++ b/dev-libs/libpcre/ChangeLog
@@ -1,6 +1,9 @@
 # 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.58 2005/06/10 20:40:29 j4rg0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/ChangeLog,v 1.59 2005/06/26 06:16:27 j4rg0n Exp $
+
+  26 Jun 2005; Lina Pezzella <j4rg0n@gentoo.org> libpcre-5.0.ebuild:
+  Fixed dirty dylib hack
 
   10 Jun 2005; Lina Pezzella <j4rg0n@gentoo.org> libpcre-5.0.ebuild:
   Removed elibtoolize for ppc-macos. Fixes Bug #95384. Thanks to kito and
diff --git a/dev-libs/libpcre/Manifest b/dev-libs/libpcre/Manifest
index 5b19d1ce0ebe..75ebe9d276b8 100644
--- a/dev-libs/libpcre/Manifest
+++ b/dev-libs/libpcre/Manifest
@@ -1,8 +1,8 @@
-MD5 b6bda7a8b5d2fe4a95aed9e7c4768d96 ChangeLog 7208
+MD5 b05482dbb8e347c19b7ecd4f685ac65f ChangeLog 7303
 MD5 59046451dd9a28a2a59c373b6b7f12c3 libpcre-4.2-r1.ebuild 852
 MD5 47ad7fd446e1df9f7b55008a9aa8bbc1 libpcre-4.4.ebuild 1008
 MD5 e11933575b142a8990bda3881545b63e libpcre-4.5.ebuild 1106
-MD5 d4eb635efb1f4d6c3c7cde9769b48a5b libpcre-5.0.ebuild 1432
+MD5 a588281f5693f0ab201655b0e19c75a7 libpcre-5.0.ebuild 1059
 MD5 c1e212329f9083e2405b16dd382d6632 metadata.xml 259
 MD5 9aa6aa1ebfe1906cfd3ce45e47a58873 files/digest-libpcre-4.2-r1 61
 MD5 e8b4b76c398da338c2c88e5321435d78 files/digest-libpcre-4.4 61
@@ -11,5 +11,4 @@ MD5 6f60a57bf3e47726ed16127d65ae834c files/digest-libpcre-5.0 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
-MD5 50222f90517286730bd924d2543a316b files/pcre-5.0-macos.patch 1041
 MD5 bf62625896b04a15d6ca53e66f2c3e1e files/pcre-5.0-uclibc-tuple.patch 1624
diff --git a/dev-libs/libpcre/files/pcre-5.0-macos.patch b/dev-libs/libpcre/files/pcre-5.0-macos.patch
deleted file mode 100644
index b51a2996cc12..000000000000
--- a/dev-libs/libpcre/files/pcre-5.0-macos.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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 c2b55f62921d..bdb0d93362d2 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.12 2005/06/10 20:40:29 j4rg0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/libpcre-5.0.ebuild,v 1.13 2005/06/26 06:16:27 j4rg0n Exp $
 
 inherit libtool flag-o-matic eutils
 
@@ -21,8 +21,7 @@ src_unpack() {
 	unpack ${A}
 	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
+	use ppc-macos || epatch "${FILESDIR}"/pcre-4.2-link.patch
 
 	# position-independent code must used for all shared objects.
 	append-flags -fPIC
@@ -38,17 +37,6 @@ 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 doc/Tech.Notes
 	dohtml -r doc/*