version bump, made macos patch unconditional

(Portage version: 2.0.53)

5 files changed, 86 insertions, 27 deletions

diff --git a/dev-libs/libpcre/ChangeLog b/dev-libs/libpcre/ChangeLog
index 1dd7bb9580f9..50e79885f81e 100644
--- a/dev-libs/libpcre/ChangeLog
+++ b/dev-libs/libpcre/ChangeLog
@@ -1,6 +1,12 @@
 # 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.68 2005/08/23 19:39:54 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/ChangeLog,v 1.69 2005/12/31 16:25:38 carlo Exp $
+
+*libpcre-6.4 (31 Dec 2005)
+
+  31 Dec 2005; Carsten Lohrke <carlo@gentoo.org> +files/pcre-6.4-link.patch,
+  +libpcre-6.4.ebuild:
+  version bump, made macos patch unconditional
 
   23 Aug 2005; Fernando J. Pereda <ferdy@gentoo.org> libpcre-6.3.ebuild:
   Stable on alpha, wrt bug #103337
diff --git a/dev-libs/libpcre/Manifest b/dev-libs/libpcre/Manifest
index eef028f974eb..20f514dd2ad9 100644
--- a/dev-libs/libpcre/Manifest
+++ b/dev-libs/libpcre/Manifest
@@ -1,31 +1,24 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 82d42612ef743a584ee9f540227ceb89 libpcre-6.3.ebuild 1380
-MD5 c1e212329f9083e2405b16dd382d6632 metadata.xml 259
-MD5 47ad7fd446e1df9f7b55008a9aa8bbc1 libpcre-4.4.ebuild 1008
-MD5 e6a7a5e86e3dbcfed3918bf935a3ae9c libpcre-6.1.ebuild 1298
-MD5 59046451dd9a28a2a59c373b6b7f12c3 libpcre-4.2-r1.ebuild 852
-MD5 a588281f5693f0ab201655b0e19c75a7 libpcre-5.0.ebuild 1059
-MD5 611237f83988cc004444009adfd0582e ChangeLog 8372
-MD5 e11933575b142a8990bda3881545b63e libpcre-4.5.ebuild 1106
-MD5 17042ca451c3bcc9cefd3f3738b4c7f7 files/pcre-6.3-uclibc-tuple.patch 1606
-MD5 0e8194a0bf3adfbe3e1c95ec64a1ebf1 files/digest-libpcre-6.1 61
+MD5 35054648fe648a2d8eb3a91bbd280a31 ChangeLog 8548
+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 6f60a57bf3e47726ed16127d65ae834c files/digest-libpcre-5.0 61
+MD5 0e8194a0bf3adfbe3e1c95ec64a1ebf1 files/digest-libpcre-6.1 61
 MD5 7aefa27b2326ddccbebd14a6c845b726 files/digest-libpcre-6.3 61
+MD5 da1be09e82e5ac86b7e5b533fbce1b24 files/digest-libpcre-6.4 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 bf62625896b04a15d6ca53e66f2c3e1e files/pcre-5.0-uclibc-tuple.patch 1624
-MD5 785165d99d81b52418a5dc2d7a2708fa files/pcre-6.3-link.patch 1047
 MD5 7b7690bbbf7e1c6881aae2bc50f4d4e7 files/pcre-6.1-link.patch 832
-MD5 42a3f4bf8ab591263bcc23343f99c035 files/pcre-4.4-uclibc-tuple.patch 1437
-MD5 6f60a57bf3e47726ed16127d65ae834c files/digest-libpcre-5.0 61
-MD5 0e2abdb46d4bf2a27fd55cf72358d465 files/pcre-4.2-macos.patch 1505
-MD5 e8b4b76c398da338c2c88e5321435d78 files/digest-libpcre-4.4 61
-MD5 9aa6aa1ebfe1906cfd3ce45e47a58873 files/digest-libpcre-4.2-r1 61
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDC7kBgIKl8Uu19MoRAu74AKCDSSzioYAuNvsQA9ohg9DaSexfCACePxN2
-WU25mqX7oz9K2frZ4DuWKIM=
-=rBqU
------END PGP SIGNATURE-----
+MD5 785165d99d81b52418a5dc2d7a2708fa files/pcre-6.3-link.patch 1047
+MD5 17042ca451c3bcc9cefd3f3738b4c7f7 files/pcre-6.3-uclibc-tuple.patch 1606
+MD5 f1cc98005a66bddd1311ea17034eb29c files/pcre-6.4-link.patch 924
+MD5 59046451dd9a28a2a59c373b6b7f12c3 libpcre-4.2-r1.ebuild 852
+MD5 47ad7fd446e1df9f7b55008a9aa8bbc1 libpcre-4.4.ebuild 1008
+MD5 e11933575b142a8990bda3881545b63e libpcre-4.5.ebuild 1106
+MD5 a588281f5693f0ab201655b0e19c75a7 libpcre-5.0.ebuild 1059
+MD5 e6a7a5e86e3dbcfed3918bf935a3ae9c libpcre-6.1.ebuild 1298
+MD5 82d42612ef743a584ee9f540227ceb89 libpcre-6.3.ebuild 1380
+MD5 d4e463811d0e52bfc60a7fb89f8776a4 libpcre-6.4.ebuild 1372
+MD5 c1e212329f9083e2405b16dd382d6632 metadata.xml 259
diff --git a/dev-libs/libpcre/files/digest-libpcre-6.4 b/dev-libs/libpcre/files/digest-libpcre-6.4
new file mode 100644
index 000000000000..91eea73ccf83
--- /dev/null
+++ b/dev-libs/libpcre/files/digest-libpcre-6.4
@@ -0,0 +1 @@
+MD5 c5c73e8767479e8a7751324b0aa32291 pcre-6.4.tar.bz2 566309
diff --git a/dev-libs/libpcre/files/pcre-6.4-link.patch b/dev-libs/libpcre/files/pcre-6.4-link.patch
new file mode 100644
index 000000000000..a7fda2c6d724
--- /dev/null
+++ b/dev-libs/libpcre/files/pcre-6.4-link.patch
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	2005-12-31 17:04:18.000000000 +0100
++++ Makefile.in	2005-12-31 17:04:29.000000000 +0100
+@@ -105,7 +105,7 @@
+ LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) -c $(CXXFLAGS) -I. -I$(top_srcdir) $(NEWLINE) $(LINK_SIZE) $(MATCH_LIMIT) $(NO_RECURSE) $(EBCDIC)
+ @ON_WINDOWS@LINK = $(CC) $(LDFLAGS) -I. -I$(top_srcdir) -L.libs
+ @NOT_ON_WINDOWS@LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -I. -I$(top_srcdir)
+-LINKLIB = $(LIBTOOL) --mode=link $(CC) -export-symbols-regex '^[^_]' $(LDFLAGS) -I. -I$(top_srcdir)
++LINKLIB = $(LIBTOOL) --mode=link $(CC) -export-symbols-regex '^[^_]' $(LDFLAGS) -I. -I$(top_srcdir) -L. -L.libs
+ LINK_FOR_BUILD = $(LIBTOOL) --mode=link $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -I. -I$(top_srcdir)
+ @ON_WINDOWS@CXXLINK = $(CXX) $(LDFLAGS) -I. -I$(top_srcdir) -L.libs
+ @NOT_ON_WINDOWS@CXXLINK = $(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -I. -I$(top_srcdir)
diff --git a/dev-libs/libpcre/libpcre-6.4.ebuild b/dev-libs/libpcre/libpcre-6.4.ebuild
new file mode 100644
index 000000000000..e4953809ea1f
--- /dev/null
+++ b/dev-libs/libpcre/libpcre-6.4.ebuild
@@ -0,0 +1,48 @@
+# 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-6.4.ebuild,v 1.1 2005/12/31 16:25:38 carlo Exp $
+
+inherit libtool flag-o-matic eutils
+
+DESCRIPTION="Perl-compatible regular expression library"
+HOMEPAGE="http://www.pcre.org/"
+SRC_URI="ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-${PV}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="doc"
+
+DEPEND="dev-util/pkgconfig"
+RDEPEND=""
+S=${WORKDIR}/pcre-${PV}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/pcre-6.3-uclibc-tuple.patch
+	epatch "${FILESDIR}"/pcre-6.4-link.patch
+
+	# TODO: Fix this.  Use -fPIC just for the shared objects.
+	# position-independent code must used for all shared objects.
+	ewarn "TODO: Fix this bad -fPIC handling"
+	append-flags -fPIC
+	
+	elibtoolize
+}
+
+src_compile() {
+	# How about the following flags?
+	# --enable-unicode-properties  enable Unicode properties support
+	# --disable-stack-for-recursion  disable use of stack recursion when matching
+	econf --enable-utf8 || die
+	emake all libpcrecpp.la || die
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+
+	dodoc AUTHORS INSTALL NON-UNIX-USE
+	dodoc doc/*.txt doc/Tech.Notes
+	use doc && dohtml doc/html/*
+}