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.

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.25.8 i686

7 files changed, 18 insertions, 133 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/Manifest b/dev-libs/libpcre/Manifest
index f689a80c82c0..207aa9e7fe98 100644
--- a/dev-libs/libpcre/Manifest
+++ b/dev-libs/libpcre/Manifest
@@ -1,12 +1,9 @@
-AUX libpcre-7.6-ABI_correction.patch 701 RMD160 48c03a1c481ac8f2234cd30abd6148efe7beebe8 SHA1 10fe3f6874f94227bbfee451a945642f60e115e5 SHA256 93ce2941cc8ebce1dd552620a14321e4ba20a4e9b99656a76db2cef1f31b6892
 AUX libpcre-7.7-buffer-overflow.patch 636 RMD160 49538a7ec5a6defe4dbe56d0dee6ec645e823545 SHA1 5a69fb97f1fa547f9012082221a6b98d77b65277 SHA256 cb35a6f7b28f3d0525710a692066b0b4fedc8c31160ab6c7d322309ac68ce3f8
 DIST pcre-7.4.tar.bz2 783044 RMD160 42bc33e5592c23c7eb337f8fcfab77fb290aed61 SHA1 2092ff639da7694b47056f3f9abed285d4a840b3 SHA256 a5fb383fcc6d35e694950d203f9d7ef525165854dd4ac2c269e20e57a0d0b3e5
-DIST pcre-7.6.tar.bz2 802829 RMD160 d62ebef7828bbf135a80e55a5d69d12f02953506 SHA1 e1ed4d3c90d0657bb1967123e90a525744fd12f9 SHA256 362e4b4473f2f7a3bfa28ea73e80ec00a2fe525a1aceb5f66e1c528a900bd735
 DIST pcre-7.7.tar.bz2 818897 RMD160 fdf7785b982879ce91847130960fa1531caffaeb SHA1 f1f54d3e13e6cb427de962e62eaaee32c74cba38 SHA256 bada84f483b428bb45ee68899b62c996f03e8c9422408fc72e60ec854c9df640
-EBUILD libpcre-7.4-r1.ebuild 1287 RMD160 fc6f34a4f242d67bf8594c199c03c02990219b06 SHA1 b1044334ea4bdada723411f64f6154c4f25fa36c SHA256 492451e8f0dabbbe7a68f6c9166d85e483fd5702d0bbf4d50cb4e68c6fcdb24b
-EBUILD libpcre-7.4.ebuild 1154 RMD160 a1a5aa464f280ab3ed1fb16ff020e3ff321b2fa6 SHA1 f8aa2be344aa1645743ed6e4d94f4c4dfdf1e409 SHA256 3b661cd4d5facfb765e1529e01cfa248f3f8b0e63dfb1c0dfcf0b7a147d06997
-EBUILD libpcre-7.6-r1.ebuild 1386 RMD160 e5f3ec88ff89ce21ff1471712c8ce18ab906139e SHA1 c6570171a8709b36b223bfe968fb7cd3cef94f80 SHA256 411a99a966cc593306a74acd5f91edc8e0939ba3e0f4310601e25364ae8d525b
+DIST pcre-7.8.tar.bz2 840922 RMD160 f8cc336f984bce9bfebaef27e6376d84845bce8f SHA1 552909f9d18e1954eec639f926957a4cb2de1ec3 SHA256 795f3c2ae29339e633a4dac7b596d6cd4d86504befbe951c9d5ff42aca9858ff
+EBUILD libpcre-7.4.ebuild 1092 RMD160 c6f3d09410f106f4c6ebfabf97639bdf7915b4cd SHA1 515520fe0d203b537d86692ca4cadbc25b841177 SHA256 28357500837dd2c80401ac3d3d968ec97c9e7557ee48eb677aff216f91edac94
 EBUILD libpcre-7.7-r1.ebuild 1390 RMD160 dabb10590f22c5e9da9ed4889929e50a5944653f SHA1 17ae41f1539fef410c8add9c368578500170c61c SHA256 2863c6e6930431b22be7b34132e469664b69705e8f47f61d02b375fab264c8dd
-EBUILD libpcre-7.7.ebuild 1346 RMD160 2bcf9ff22129c551697db9892537c6cdaa5e3ec4 SHA1 f5c7bbe99103a7dc76ac9cd08083387906a827af SHA256 e141c061fe824e84f6942eb4e7602f9e713ac5e4776beacd9fac7afb02712c83
-MISC ChangeLog 17592 RMD160 9f63abc4f6e2570549cea09273e6ac4a77aacaaa SHA1 cc14f87d6820ab9b25be981892516b23fadd55fd SHA256 02e4ec1d9a1dcf5ab94032e94a7da003bfe80cda98bee1cdb7f34db0b1824868
+EBUILD libpcre-7.8.ebuild 1346 RMD160 87f7d75c188b69c13b3935b73a78c678945a7b23 SHA1 f5015f538a010170eba3a149b6316b7584ca17df SHA256 7efaf08b008a138635fd0fd8a70279c14d4384a6b22a6a1b2d37ff3d30a759c9
+MISC ChangeLog 17955 RMD160 ffeaca397d326cec67016a1dfad55602e73860c7 SHA1 6d6d8d4b8f75f4a515f28ba444eb7a422fde9418 SHA256 ad0391df419a2d6a8fed034a6ee3ac0e2d0507826e4e4c9e447e25b03896dd57
 MISC metadata.xml 306 RMD160 828e2a0aae05636e0341c95770549c8901e891d9 SHA1 a7ab5b463baa92c0540fb4f4013674a243ca922b SHA256 6c64b79712509179600cae5676df6460f166225ee0f9a10aafe494fde9a8ccb1
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