Drop USE=pcre support since no one really uses it #102771.

Package-Manager: portage-2.0.53

4 files changed, 35 insertions, 35 deletions

diff --git a/sys-apps/grep/ChangeLog b/sys-apps/grep/ChangeLog
index dd1826a2ed3b..d5694fec8638 100644
--- a/sys-apps/grep/ChangeLog
+++ b/sys-apps/grep/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/grep
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/ChangeLog,v 1.55 2005/11/29 20:18:51 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/ChangeLog,v 1.56 2005/12/24 05:15:43 vapier Exp $
+
+  24 Dec 2005; Mike Frysinger <vapier@gentoo.org> grep-2.5.1-r8.ebuild,
+  grep-2.5.1-r9.ebuild:
+  Drop USE=pcre support since no one really uses it #102771.
 
   29 Nov 2005; Fabian Groffen <grobian@gentoo.org> grep-2.5.1-r9.ebuild:
   Marked ~ppc-macos
diff --git a/sys-apps/grep/Manifest b/sys-apps/grep/Manifest
index 54561a680e84..246d44cee7a6 100644
--- a/sys-apps/grep/Manifest
+++ b/sys-apps/grep/Manifest
@@ -1,18 +1,28 @@
-MD5 2f9a15117f0d8e6f6b74e007b40252d6 grep-2.5.1-r9.ebuild 2168
-MD5 4c998f6d8d6ee9690d26e2ff67138d4b grep-2.5.1-r8.ebuild 2097
-MD5 95208b5268b4fb11ecc57a9ef138d123 ChangeLog 8500
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 294f8a32ae3036ebbf393610a286d80e files/grep-2.5.1-gofast.patch.bz2 4389
-MD5 f2f8cec983dc49b399880ab8eae882cb files/grep-2.5.1-i18n.patch.bz2 2903
-MD5 b43c763953a7b7d3345fc0dd625f299c files/grep-2.5.1-fgrep.patch.bz2 1678
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 17f1d5653702c6309f4cf999f5c583a3 ChangeLog 8657
+MD5 792f6cb13959979de2b10537067603bb files/2.5.1-manpage-line-buffering.patch 477
+MD5 41f77ef6693dc91a37b5ec51ce5a3e2d files/2.5.1-manpage.patch 283
+MD5 16d6cd54c93041d4f4bef59a9e327d04 files/2.5.1-tests.patch 1786
+MD5 e39e9fd198a2c0a5984f2c7d188b3c49 files/2.5.1-utf8-case.patch 933
 MD5 5dcaa51f88b364134a43d60b661870ee files/digest-grep-2.5.1-r8 62
 MD5 5dcaa51f88b364134a43d60b661870ee files/digest-grep-2.5.1-r9 62
-MD5 41f77ef6693dc91a37b5ec51ce5a3e2d files/2.5.1-manpage.patch 283
-MD5 1eee743f3bf8a7926c07f9a0307a6b64 files/grep-2.5.1-restrict_arr.patch 410
-MD5 f108b43aae8b2abc6326efa8ab44e8dd files/grep-2.5.1-oi.patch 1695
+MD5 b43c763953a7b7d3345fc0dd625f299c files/grep-2.5.1-fgrep.patch.bz2 1678
 MD5 26b2ee006a2293540cadc27d9d41267a files/grep-2.5.1-fix-devices-skip.patch 1842
-MD5 b6da5288895ddd97074deb10f48b4364 files/grep-2.5.1-perl-segv.patch 410
-MD5 792f6cb13959979de2b10537067603bb files/2.5.1-manpage-line-buffering.patch 477
+MD5 294f8a32ae3036ebbf393610a286d80e files/grep-2.5.1-gofast.patch.bz2 4389
+MD5 f2f8cec983dc49b399880ab8eae882cb files/grep-2.5.1-i18n.patch.bz2 2903
 MD5 af3a45582aa7c857f0500c63c823bd52 files/grep-2.5.1-libintl.patch 2662
-MD5 e39e9fd198a2c0a5984f2c7d188b3c49 files/2.5.1-utf8-case.patch 933
-MD5 16d6cd54c93041d4f4bef59a9e327d04 files/2.5.1-tests.patch 1786
+MD5 f108b43aae8b2abc6326efa8ab44e8dd files/grep-2.5.1-oi.patch 1695
+MD5 b6da5288895ddd97074deb10f48b4364 files/grep-2.5.1-perl-segv.patch 410
+MD5 1eee743f3bf8a7926c07f9a0307a6b64 files/grep-2.5.1-restrict_arr.patch 410
+MD5 c8c3f59f3fd000c41915a97ab0a5f2c5 grep-2.5.1-r8.ebuild 1884
+MD5 8ddf6132165b4575afd41a588663f3d0 grep-2.5.1-r9.ebuild 1954
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDrNmJ2+ySkm8kpY0RApSpAKDCCyOuxxqHYnN45+4xVXn/CR6bswCeK6ls
+UipX9GnNOYRpRhQvQSa4Uxk=
+=s/io
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/grep/grep-2.5.1-r8.ebuild b/sys-apps/grep/grep-2.5.1-r8.ebuild
index 9d11e5d4112b..73c36a7c931c 100644
--- a/sys-apps/grep/grep-2.5.1-r8.ebuild
+++ b/sys-apps/grep/grep-2.5.1-r8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/grep-2.5.1-r8.ebuild,v 1.10 2005/11/29 02:24:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/grep-2.5.1-r8.ebuild,v 1.11 2005/12/24 05:15:43 vapier Exp $
 
 inherit flag-o-matic eutils
 
@@ -12,11 +12,10 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ~ppc-macos ppc64 s390 sh sparc x86"
-IUSE="build nls pcre static"
+IUSE="build nls static"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
-	pcre? (	dev-libs/libpcre )
 	nls? ( sys-devel/gettext )"
 
 src_unpack() {
@@ -50,14 +49,8 @@ src_compile() {
 	econf \
 		--bindir=/bin \
 		$(use_enable nls) \
-		$(use_enable pcre perl-regexp) \
+		--disable-perl-regexp \
 		|| die "econf failed"
-
-	# force static linking so we dont have to move it into /
-	sed -i \
-		-e 's:-lpcre:-Wl,-Bstatic -lpcre -Wl,-Bdynamic:g' \
-		src/Makefile || die "sed static pcre failed"
-
 	emake || die "emake failed"
 }
 
diff --git a/sys-apps/grep/grep-2.5.1-r9.ebuild b/sys-apps/grep/grep-2.5.1-r9.ebuild
index d35e44a17ce1..2edf387d7a0f 100644
--- a/sys-apps/grep/grep-2.5.1-r9.ebuild
+++ b/sys-apps/grep/grep-2.5.1-r9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/grep-2.5.1-r9.ebuild,v 1.2 2005/11/29 20:18:51 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/grep-2.5.1-r9.ebuild,v 1.3 2005/12/24 05:15:43 vapier Exp $
 
 inherit flag-o-matic eutils
 
@@ -12,11 +12,10 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="build nls pcre static"
+IUSE="build nls static"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
-	pcre? (	dev-libs/libpcre )
 	nls? ( sys-devel/gettext )"
 
 src_unpack() {
@@ -51,14 +50,8 @@ src_compile() {
 	econf \
 		--bindir=/bin \
 		$(use_enable nls) \
-		$(use_enable pcre perl-regexp) \
+		--disable-perl-regexp \
 		|| die "econf failed"
-
-	# force static linking so we dont have to move it into /
-	sed -i \
-		-e 's:-lpcre:-Wl,-Bstatic -lpcre -Wl,-Bdynamic:g' \
-		src/Makefile || die "sed static pcre failed"
-
 	emake || die "emake failed"
 }