Version bump closes bug #75919.

11 files changed, 114 insertions, 92 deletions

diff --git a/dev-libs/libpcre/ChangeLog b/dev-libs/libpcre/ChangeLog
index 375828b27c6c..da593e6009f7 100644
--- a/dev-libs/libpcre/ChangeLog
+++ b/dev-libs/libpcre/ChangeLog
@@ -1,6 +1,13 @@
 # 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.46 2004/10/09 02:03:50 j4rg0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/ChangeLog,v 1.47 2004/12/28 17:29:15 eradicator Exp $
+
+*libpcre-5.0 (28 Dec 2004)
+
+  28 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/pcre-5.0-uclibc-tuple.patch, -libpcre-3.9-r1.ebuild,
+  -libpcre-3.9-r2.ebuild, -libpcre-3.9.ebuild, +libpcre-5.0.ebuild:
+  Version bump closes bug #75919.
 
   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.
diff --git a/dev-libs/libpcre/Manifest b/dev-libs/libpcre/Manifest
index 467afab12f71..9cca76ecbcc2 100644
--- a/dev-libs/libpcre/Manifest
+++ b/dev-libs/libpcre/Manifest
@@ -6,12 +6,14 @@ MD5 a8f68f5bf3fc2faaef1973b7c44a169f libpcre-4.2-r1.ebuild 855
 MD5 248b6d684b6819f97ef28116f8be4cd9 libpcre-4.4.ebuild 1006
 MD5 c1e212329f9083e2405b16dd382d6632 metadata.xml 259
 MD5 c660a885c062f50d24fe31b8ae7442c0 libpcre-4.5.ebuild 1106
+MD5 c660a885c062f50d24fe31b8ae7442c0 libpcre-5.0.ebuild 1106
 MD5 0baca84ddbe0223b3e71da8f829841bc files/digest-libpcre-3.9 61
 MD5 0baca84ddbe0223b3e71da8f829841bc files/digest-libpcre-3.9-r1 61
 MD5 0baca84ddbe0223b3e71da8f829841bc files/digest-libpcre-3.9-r2 61
 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 42a3f4bf8ab591263bcc23343f99c035 files/pcre-4.4-uclibc-tuple.patch 1437
+MD5 4e0522aaf9e2d5a196830b897f2341d2 files/digest-libpcre-4.5 61
 MD5 0e2abdb46d4bf2a27fd55cf72358d465 files/pcre-4.2-macos.patch 1505
+MD5 6f60a57bf3e47726ed16127d65ae834c files/digest-libpcre-5.0 61
diff --git a/dev-libs/libpcre/files/digest-libpcre-3.9 b/dev-libs/libpcre/files/digest-libpcre-3.9
deleted file mode 100644
index 0163671b4fe9..000000000000
--- a/dev-libs/libpcre/files/digest-libpcre-3.9
+++ /dev/null
@@ -1 +0,0 @@
-MD5 26b918bfab43cd16d173460354ab9442 pcre-3.9.tar.bz2 261609
diff --git a/dev-libs/libpcre/files/digest-libpcre-3.9-r1 b/dev-libs/libpcre/files/digest-libpcre-3.9-r1
deleted file mode 100644
index 0163671b4fe9..000000000000
--- a/dev-libs/libpcre/files/digest-libpcre-3.9-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 26b918bfab43cd16d173460354ab9442 pcre-3.9.tar.bz2 261609
diff --git a/dev-libs/libpcre/files/digest-libpcre-3.9-r2 b/dev-libs/libpcre/files/digest-libpcre-3.9-r2
deleted file mode 100644
index 0163671b4fe9..000000000000
--- a/dev-libs/libpcre/files/digest-libpcre-3.9-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 26b918bfab43cd16d173460354ab9442 pcre-3.9.tar.bz2 261609
diff --git a/dev-libs/libpcre/files/digest-libpcre-5.0 b/dev-libs/libpcre/files/digest-libpcre-5.0
new file mode 100644
index 000000000000..4561070db67c
--- /dev/null
+++ b/dev-libs/libpcre/files/digest-libpcre-5.0
@@ -0,0 +1 @@
+MD5 813850808894d99fb5b1c41ec6335d4f pcre-5.0.tar.bz2 465738
diff --git a/dev-libs/libpcre/files/pcre-5.0-uclibc-tuple.patch b/dev-libs/libpcre/files/pcre-5.0-uclibc-tuple.patch
new file mode 100644
index 000000000000..7be77b9fe6db
--- /dev/null
+++ b/dev-libs/libpcre/files/pcre-5.0-uclibc-tuple.patch
@@ -0,0 +1,57 @@
+diff -Naur pcre-5.0.orig/configure pcre-5.0/configure
+--- pcre-5.0.orig/configure	2004-09-13 07:20:00.000000000 -0700
++++ pcre-5.0/configure	2004-12-28 09:24:34.707790654 -0800
+@@ -3047,7 +3047,7 @@
+   ;;
+ 
+ # This must be Linux ELF.
+-linux*)
++linux-gnu*)
+   case $host_cpu in
+   alpha*|hppa*|i*86|ia64*|m68*|mips*|powerpc*|sparc*|s390*|sh*)
+     lt_cv_deplibs_check_method=pass_all ;;
+@@ -3060,6 +3060,11 @@
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
++linux-uclibc*)
++  lt_cv_deplibs_check_method=pass_all
++  lt_cv_file_magic_test_file=`echo /lib/uClibc-*.so`
++  ;;
++
+ netbsd*)
+   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+     lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+@@ -7554,7 +7559,7 @@
+   ;;
+ 
+ # This must be Linux ELF.
+-linux*)
++linux-gnu*)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+@@ -7583,6 +7588,23 @@
+   dynamic_linker='GNU/Linux ld.so'
+   ;;
+ 
++linux-uclibc*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
++  soname_spec='${libname}${release}.so$major'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  # This implies no fast_install, which is unacceptable.
++  # Some rework will be needed to allow for fast_install
++  # before this can be enabled.
++  hardcode_into_libs=yes
++  # Assume using the uClibc dynamic linker is in use.
++  dynamic_linker='uClibc ld.so'
++  ;;
++
+ knetbsd*-gnu)
+   version_type=linux
+   need_lib_prefix=no
diff --git a/dev-libs/libpcre/libpcre-3.9-r1.ebuild b/dev-libs/libpcre/libpcre-3.9-r1.ebuild
deleted file mode 100644
index dd180a749d7a..000000000000
--- a/dev-libs/libpcre/libpcre-3.9-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# 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-3.9-r1.ebuild,v 1.18 2004/07/14 14:46:07 agriffis Exp $
-
-S=${WORKDIR}/pcre-${PV}
-DESCRIPTION="Perl-compatible regular expression library"
-SRC_URI="ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-${PV}.tar.bz2"
-HOMEPAGE="http://www.pcre.org/"
-
-SLOT="3"
-LICENSE="as-is"
-KEYWORDS="x86 ppc sparc alpha mips hppa amd64"
-IUSE=""
-
-DEPEND="virtual/libc"
-
-src_compile() {
-	econf || die
-	emake || die
-}
-
-src_install () {
-	make DESTDIR=${D} install || die
-
-	dodoc AUTHORS COPYING INSTALL LICENCE NON-UNIX-USE
-	dodoc doc/*.txt
-	dodoc doc/Tech.Notes
-	dohtml -r doc
-}
diff --git a/dev-libs/libpcre/libpcre-3.9-r2.ebuild b/dev-libs/libpcre/libpcre-3.9-r2.ebuild
deleted file mode 100644
index d838d7727a6d..000000000000
--- a/dev-libs/libpcre/libpcre-3.9-r2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# 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-3.9-r2.ebuild,v 1.11 2004/07/14 14:46:07 agriffis Exp $
-
-S=${WORKDIR}/pcre-${PV}
-DESCRIPTION="Perl-compatible regular expression library"
-SRC_URI="ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-${PV}.tar.bz2"
-HOMEPAGE="http://www.pcre.org/"
-
-SLOT="3"
-LICENSE="as-is"
-KEYWORDS="x86 ~ppc ~sparc ~alpha hppa amd64"
-IUSE=""
-
-DEPEND="virtual/libc"
-
-src_compile() {
-	econf --enable-utf8 || die
-	emake || die
-}
-
-src_install () {
-	make DESTDIR=${D} install || die
-
-	dodoc AUTHORS COPYING INSTALL LICENCE NON-UNIX-USE
-	dodoc doc/*.txt
-	dodoc doc/Tech.Notes
-	dohtml -r doc
-}
diff --git a/dev-libs/libpcre/libpcre-3.9.ebuild b/dev-libs/libpcre/libpcre-3.9.ebuild
deleted file mode 100644
index a88c9db9df59..000000000000
--- a/dev-libs/libpcre/libpcre-3.9.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# 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-3.9.ebuild,v 1.16 2004/08/07 21:55:25 slarti Exp $
-
-S=${WORKDIR}/pcre-${PV}
-DESCRIPTION="Perl-compatible regular expression library"
-SRC_URI="ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-${PV}.tar.bz2"
-HOMEPAGE="http://www.pcre.org/"
-
-SLOT="3"
-LICENSE="as-is"
-KEYWORDS="x86 ppc sparc"
-IUSE=""
-
-DEPEND="virtual/libc"
-
-src_compile() {
-	econf || die
-	emake || die
-}
-
-src_install () {
-	make DESTDIR=${D} install || die
-
-	dodoc AUTHORS COPYING INSTALL LICENCE NON-UNIX-USE
-	dodoc doc/*.txt
-	dodoc doc/Tech.Notes
-	dohtml =r doc
-}
diff --git a/dev-libs/libpcre/libpcre-5.0.ebuild b/dev-libs/libpcre/libpcre-5.0.ebuild
new file mode 100644
index 000000000000..a907813a621c
--- /dev/null
+++ b/dev-libs/libpcre/libpcre-5.0.ebuild
@@ -0,0 +1,45 @@
+# 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-5.0.ebuild,v 1.1 2004/12/28 17:29:15 eradicator Exp $
+
+IUSE=""
+
+inherit libtool flag-o-matic eutils gnuconfig
+
+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 ~mips ~ppc ~ppc64 ~ppc-macos ~s390 ~sh ~sparc ~x86"
+
+DEPEND="virtual/libc"
+
+S=${WORKDIR}/pcre-${PV}
+
+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-4.2-macos.patch
+	# position-independent code must used for all shared objects.
+	append-flags -fPIC
+	elibtoolize
+	gnuconfig_update
+}
+
+src_compile() {
+	econf --enable-utf8 || die
+	make || die
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+
+	dodoc AUTHORS INSTALL NON-UNIX-USE
+	dodoc doc/*.txt
+	dodoc doc/Tech.Notes
+	dohtml -r doc
+}