Use system libpcre instead of bundled one #105138.

Package-Manager: portage-2.0.51.22-r2

5 files changed, 156 insertions, 7 deletions

diff --git a/dev-lang/wml/ChangeLog b/dev-lang/wml/ChangeLog
index a2be33c92b1b..8f4bb257ec1d 100644
--- a/dev-lang/wml/ChangeLog
+++ b/dev-lang/wml/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/wml
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/wml/ChangeLog,v 1.18 2005/05/04 12:59:00 herbs Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/wml/ChangeLog,v 1.19 2005/09/10 06:51:30 vapier Exp $
+
+*wml-2.0.9-r1 (10 Sep 2005)
+
+  10 Sep 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/wml-2.0.9-autotools-update.patch, +wml-2.0.9-r1.ebuild:
+  Use system libpcre instead of bundled one #105138.
 
   04 May 2005; Herbie Hopkins <herbs@gentoo.org> wml-2.0.9.ebuild:
   Fixed bug #90401
diff --git a/dev-lang/wml/Manifest b/dev-lang/wml/Manifest
index 7e4ad649c6fa..d678c6396711 100644
--- a/dev-lang/wml/Manifest
+++ b/dev-lang/wml/Manifest
@@ -1,15 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 664f75065d8dda0d19a0c2fccd223abe ChangeLog 1920
 MD5 1652522405f5936eb29776ef8d5ffa5b metadata.xml 310
+MD5 820a5f1d6cf3412bbe92972ddc4a9bdf wml-2.0.9-r1.ebuild 1119
 MD5 68d3173aab21e04ddc33145dbf24de70 wml-2.0.9.ebuild 1189
+MD5 4e5fbce5a425abe603441abdb15e99f4 ChangeLog 2119
 MD5 ea584f051a470445242165526961b55d files/digest-wml-2.0.9 62
+MD5 ea584f051a470445242165526961b55d files/digest-wml-2.0.9-r1 62
+MD5 63a4be7e9b23a8dad09660e70f9e11ac files/wml-2.0.9-autotools-update.patch 2720
 MD5 aefa456b69c01c50eca3fe8b497c1f59 files/2.0.9-fix-configure.in.patch 1411
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
+Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFCeMct2G5bA0cA/ScRAj3nAKDjzPhcCNsIlgyq9PRZ2NC9iJ1L9ACfQk06
-aTwRtvgwx6dSPOAc8IQSc7k=
-=nkoa
+iD8DBQFDIoKNgIKl8Uu19MoRAkbLAJ978cV0scsG0kglx1Syh3F8TNZgCwCfW8YQ
+bmpvkzjQU246TL4thwz0IpM=
+=UdxH
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/wml/files/digest-wml-2.0.9-r1 b/dev-lang/wml/files/digest-wml-2.0.9-r1
new file mode 100644
index 000000000000..acfa71a7d557
--- /dev/null
+++ b/dev-lang/wml/files/digest-wml-2.0.9-r1
@@ -0,0 +1 @@
+MD5 a7c9da3b58f7e40706e3c29c37b4822b wml-2.0.9.tar.gz 2570742
diff --git a/dev-lang/wml/files/wml-2.0.9-autotools-update.patch b/dev-lang/wml/files/wml-2.0.9-autotools-update.patch
new file mode 100644
index 000000000000..bbb0956dfbef
--- /dev/null
+++ b/dev-lang/wml/files/wml-2.0.9-autotools-update.patch
@@ -0,0 +1,97 @@
+Use system libpcre and make iselect not blow up
+
+--- wml_backend/p2_mp4h/Makefile.am
++++ wml_backend/p2_mp4h/Makefile.am
+@@ -1,15 +1,15 @@
+ 
+ AUTOMAKE_OPTIONS = foreign
+ 
+-DIST_SUBDIRS = intl pcre lib src po doc modules tests
++DIST_SUBDIRS = intl lib src po doc modules tests
+ 
+ if LOADABLE_MODULES
+-SUBDIRS = intl pcre lib src po doc modules tests
++SUBDIRS = intl lib src po doc modules tests
+ else
+-SUBDIRS = intl pcre lib src po doc tests
++SUBDIRS = intl lib src po doc tests
+ endif
+ 
+-EXTRA_DIST = CREDITS README README.pcre bootstrap.sh shtool
++EXTRA_DIST = CREDITS README bootstrap.sh shtool
+ 
+ deb:
+ 	if test -f ../mp4h_$(VERSION).orig.tar.gz; then \
+--- wml_backend/p2_mp4h/configure.ac
++++ wml_backend/p2_mp4h/configure.ac
+@@ -179,7 +179,6 @@ AC_SUBST(CFLAGS)
+ AC_CONFIG_FILES([
+    Makefile
+    intl/Makefile
+-   pcre/Makefile
+    lib/Makefile
+    src/Makefile
+    po/Makefile.in
+--- wml_backend/p2_mp4h/src/Makefile.am
++++ wml_backend/p2_mp4h/src/Makefile.am
+@@ -1,5 +1,5 @@
+ 
+-INCLUDES = -I$(top_srcdir)/pcre -I$(top_srcdir)/lib @INTLINCL@
++INCLUDES = -I$(top_srcdir)/lib @INTLINCL@
+ 
+ bin_PROGRAMS = mp4h
+ 
+@@ -16,7 +16,7 @@ mp4h_SOURCES = builtin.c debug.c devel.c
+ if LOADABLE_MODULES
+ mp4h_LDFLAGS = -export-dynamic
+ endif
+-mp4h_LDADD   = -lm $(top_builddir)/lib/libmp4h.a $(top_builddir)/pcre/libpcre.a @INTLLIBS@
++mp4h_LDADD   = -lm $(top_builddir)/lib/libmp4h.a -lpcre @INTLLIBS@
+ 
+ include_HEADERS = mp4h.h
+ noinst_HEADERS  = builtin.h ltdl.h
+--- wml_aux/iselect/configure.in
++++ wml_aux/iselect/configure.in
+@@ -3,6 +3,7 @@
+ dnl ##  Copyright (c) Ralf S. Engelschall, <rse@engelschall.com>
+ dnl ##
+ 
++AC_INIT(README)
+ AC_PREREQ(2.10)dnl
+ AC_REVISION($Revision: 1.1 $)
+ SHTOOL="./etc/shtool"
+@@ -11,7 +12,6 @@
+ echo "${T_MD}Configuring for iSelect `./etc/shtool version -l c -d long iselect_version.c`${T_ME}"
+ echo "Copyright (c) 1996-1999 Ralf S. Engelschall, All Rights Reserved."
+ 
+-AC_INIT(README)
+ AC_CONFIG_HEADER(config_ac.h)dnl
+ AC_PREFIX_DEFAULT(/usr/local)
+ 
+--- wml_aux/iselect/aclocal.m4
++++ wml_aux/iselect/aclocal.m4
+@@ -186,24 +186,6 @@
+ dnl ##
+ dnl ##########################################################
+ dnl
+-AC_DEFUN(AC_C_PROTOTYPES,
+-[AC_MSG_CHECKING([for function prototypes])
+-AC_CACHE_VAL(ac_cv_c_prototypes,
+-[AC_TRY_LINK([#ifndef __STDC__
+-Syntax Error
+-#endif], [extern int test (int i, double x);
+-struct s1 {int (*f) (int a);};
+-struct s2 {int (*f) (double a);};],
+-  ac_cv_c_prototypes=yes, ac_cv_c_prototypes=no)])dnl
+-AC_MSG_RESULT([$ac_cv_c_prototypes])
+-if test $ac_cv_c_prototypes = yes; then
+-  AC_DEFINE(HAVE_PROTOTYPES)
+-  ANSI_CC=yes
+-else
+-  ANSI_CC=no
+-fi
+-AC_SUBST(ANSI_CC)
+-])dnl
+ dnl
+ dnl
+ dnl ##########################################################
diff --git a/dev-lang/wml/wml-2.0.9-r1.ebuild b/dev-lang/wml/wml-2.0.9-r1.ebuild
new file mode 100644
index 000000000000..939b9ff9ee68
--- /dev/null
+++ b/dev-lang/wml/wml-2.0.9-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/wml/wml-2.0.9-r1.ebuild,v 1.1 2005/09/10 06:51:30 vapier Exp $
+
+inherit fixheadtails eutils
+
+DESCRIPTION="Website META Language"
+HOMEPAGE="http://www.engelschall.com/sw/wml/"
+SRC_URI="http://www.engelschall.com/sw/wml/distrib/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~s390 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="dev-libs/libpcre
+	dev-lang/perl"
+DEPEND="${RDEPEND}
+	>=sys-devel/autoconf-2.58"
+
+src_unpack() {
+	unpack ${A}
+	ht_fix_all
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-autotools-update.patch
+	export WANT_AUTOCONF='2.5'
+	for d in $(find "${S}" -mindepth 2 -name configure -printf '%h ') ; do
+		cd "${d}"
+		autoconf || die "autoconf in ${d}"
+	done
+	(cd "${S}"/wml_backend/p2_mp4h && automake) || die "automake failed in wml_backend/p2_mp4h"
+}
+
+src_compile() {
+	econf --libdir=/usr/lib/wml || die "./configure failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	einstall || die
+	dodoc ANNOUNCE BUGREPORT C* INSTALL MANIFEST README* SUPPORT VERSION*
+}