Bump, remove old. Drop keywords for all except sh, arm, s390 and m68k on 7.4, since it's affected by a number of GLSAs.

(Portage version: 2.2_rc8/cvs/Linux 2.6.25.8 i686)

6 files changed, 14 insertions, 126 deletions

diff --git a/dev-libs/libpcre/ChangeLog b/dev-libs/libpcre/ChangeLog
index 161df3e7f65e..2acb41db1184 100644
--- a/dev-libs/libpcre/ChangeLog
+++ b/dev-libs/libpcre/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-libs/libpcre
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/ChangeLog,v 1.139 2008/06/30 21:03:05 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/ChangeLog,v 1.140 2008/09/07 13:28:55 loki_val Exp $
+
+*libpcre-7.8 (07 Sep 2008)
+
+  07 Sep 2008; Peter Alfredsen <loki_val@gentoo.org>
+  -files/libpcre-7.6-ABI_correction.patch, libpcre-7.4.ebuild,
+  -libpcre-7.4-r1.ebuild, -libpcre-7.6-r1.ebuild, -libpcre-7.7.ebuild,
+  +libpcre-7.8.ebuild:
+  Bump, remove old. Drop keywords for all except sh, arm, s390 and m68k on
+  7.4, since it's affected by a number of GLSAs.
 
 *libpcre-7.7-r1 (30 Jun 2008)
 
diff --git a/dev-libs/libpcre/files/libpcre-7.6-ABI_correction.patch b/dev-libs/libpcre/files/libpcre-7.6-ABI_correction.patch
deleted file mode 100644
index 99da95c7458a..000000000000
--- a/dev-libs/libpcre/files/libpcre-7.6-ABI_correction.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- pcrecpp.cc.orig	2008-02-13 09:04:56.000000000 +0100
-+++ pcrecpp.cc	2008-02-13 09:05:28.000000000 +0100
-@@ -57,6 +57,14 @@
- // Special object that stands-in for no argument
- Arg RE::no_arg((void*)NULL);
- 
-+// This is for ABI compatibility with old versions of pcre (pre-7.6),
-+// which defined a global no_arg variable instead of putting it in the
-+// RE class.  This works on GCC >= 3, at least.  We could probably have
-+// a more inclusive test if we ever needed it.
-+#if defined(__GNUC__) && __GNUC__ >= 3
-+  extern Arg no_arg __attribute__((alias("_ZN7pcrecpp2RE6no_argE")));
-+#endif
-+
- // If a regular expression has no error, its error_ field points here
- static const string empty_string;
- 
diff --git a/dev-libs/libpcre/libpcre-7.4-r1.ebuild b/dev-libs/libpcre/libpcre-7.4-r1.ebuild
deleted file mode 100644
index edf92f2ea7b5..000000000000
--- a/dev-libs/libpcre/libpcre-7.4-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/libpcre-7.4-r1.ebuild,v 1.4 2008/02/07 12:30:07 armin76 Exp $
-
-EAPI=1
-
-inherit libtool eutils
-
-MY_P="pcre-${PV}"
-
-DESCRIPTION="Perl-compatible regular expression library"
-HOMEPAGE="http://www.pcre.org/"
-SRC_URI="ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${MY_P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="3"
-KEYWORDS="alpha ~amd64 ~arm ~hppa ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh sparc ~sparc-fbsd x86 ~x86-fbsd"
-IUSE="doc unicode +cxx"
-
-DEPEND="dev-util/pkgconfig"
-RDEPEND=""
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	elibtoolize
-}
-
-src_compile() {
-	if use unicode; then
-		myconf="--enable-utf8 --enable-unicode-properties"
-	fi
-	myconf="${myconf} --with-match-limit-recursion=8192"
-	# Enable building of static libs too - grep and others
-	# depend on them being built: bug 164099
-	econf ${myconf} \
-		$(use_enable cxx cpp) \
-		--enable-static \
-		--htmldir=/usr/share/doc/${PF}/html \
-		--docdir=/usr/share/doc/${PF} \
-		|| die "econf failed"
-	emake all || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	dodoc doc/*.txt AUTHORS
-	use doc && dohtml doc/html/*
-}
diff --git a/dev-libs/libpcre/libpcre-7.4.ebuild b/dev-libs/libpcre/libpcre-7.4.ebuild
index aa4aaa0e7f02..2ac22d6bfe46 100644
--- a/dev-libs/libpcre/libpcre-7.4.ebuild
+++ b/dev-libs/libpcre/libpcre-7.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/libpcre-7.4.ebuild,v 1.8 2007/12/11 10:03:12 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/libpcre-7.4.ebuild,v 1.9 2008/09/07 13:28:55 loki_val Exp $
 
 inherit libtool eutils
 
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${MY_P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="3"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
+KEYWORDS="arm m68k s390 sh"
 IUSE="doc unicode"
 
 DEPEND="dev-util/pkgconfig"
diff --git a/dev-libs/libpcre/libpcre-7.6-r1.ebuild b/dev-libs/libpcre/libpcre-7.6-r1.ebuild
deleted file mode 100644
index 737d83aa62a5..000000000000
--- a/dev-libs/libpcre/libpcre-7.6-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/libpcre-7.6-r1.ebuild,v 1.1 2008/02/13 08:12:01 opfer Exp $
-
-EAPI=1
-
-inherit libtool eutils
-
-MY_P="pcre-${PV}"
-
-DESCRIPTION="Perl-compatible regular expression library"
-HOMEPAGE="http://www.pcre.org/"
-SRC_URI="ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${MY_P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="3"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc ~sparc-fbsd x86 ~x86-fbsd"
-IUSE="bzip2 +cxx doc unicode zlib"
-
-DEPEND="dev-util/pkgconfig"
-RDEPEND=""
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-ABI_correction.patch
-	elibtoolize
-}
-
-src_compile() {
-	# Enable building of static libs too - grep and others
-	# depend on them being built: bug 164099
-	econf --with-match-limit-recursion=8192 \
-		$(use_enable unicode utf8) $(use_enable unicode unicode-properties) \
-		$(use_enable cxx cpp) \
-		$(use_enable zlib pcregrep-libz) \
-		$(use_enable bzip2 pcregrep-libbz2) \
-		--enable-static \
-		--htmldir=/usr/share/doc/${PF}/html \
-		--docdir=/usr/share/doc/${PF} \
-		|| die "econf failed"
-	emake all || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	dodoc doc/*.txt AUTHORS
-	use doc && dohtml doc/html/*
-}
diff --git a/dev-libs/libpcre/libpcre-7.7.ebuild b/dev-libs/libpcre/libpcre-7.8.ebuild
index 8cdf6d587d65..90117bf5c6d3 100644
--- a/dev-libs/libpcre/libpcre-7.7.ebuild
+++ b/dev-libs/libpcre/libpcre-7.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/libpcre-7.7.ebuild,v 1.1 2008/05/26 14:16:24 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/libpcre-7.8.ebuild,v 1.1 2008/09/07 13:28:55 loki_val Exp $
 
 EAPI=1