Revision bump for new libpcre. We can now use libpcre.so since it's in /lib - bug 1638 and bug 53627. Change DEPENDS of previous versions to reflect this, since new libpcre no longer includes .a archives.

Package-Manager: portage-2.2_rc28/cvs/Linux x86_64

6 files changed, 62 insertions, 22 deletions

diff --git a/sys-apps/grep/ChangeLog b/sys-apps/grep/ChangeLog
index 558ba201d405..88587a82361e 100644
--- a/sys-apps/grep/ChangeLog
+++ b/sys-apps/grep/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-apps/grep
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/ChangeLog,v 1.83 2009/03/12 15:51:07 drizzt Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/ChangeLog,v 1.84 2009/04/09 16:09:35 loki_val Exp $
+
+*grep-2.5.4-r1 (09 Apr 2009)
+
+  09 Apr 2009; Peter Alfredsen <loki_val@gentoo.org> grep-2.5.1a-r1.ebuild,
+  grep-2.5.3-r1.ebuild, grep-2.5.4.ebuild, +grep-2.5.4-r1.ebuild:
+  Revision bump for new libpcre. We can now use libpcre.so since it's in
+  /lib - bug 1638 and bug 53627. Change DEPENDS of previous versions to
+  reflect this, since new libpcre no longer includes .a archives.
 
   11 Mar 2009; Timothy Redaelli <drizzt@gentoo.org> grep-2.5.4.ebuild:
   Add ~amd64-fbsd keyword.
diff --git a/sys-apps/grep/Manifest b/sys-apps/grep/Manifest
index 44ab615fab18..72a6340b1677 100644
--- a/sys-apps/grep/Manifest
+++ b/sys-apps/grep/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 2.5.1-utf8-case.patch 933 RMD160 1619e4b6710047049e5776a45732b2709b117cfa SHA1 51c9ea9363370041b2c0a9b7dcc83bfd739a4723 SHA256 4f48ab49da2ec948f329dea2a133cc6f0e602e265958cf09efd554510640ae1e
 AUX grep-2.5.1-bracket.patch 339 RMD160 0333e5113b7285ce92b4a68d89d25ff7b81211f0 SHA1 7882dc95b6cb69d64e4c68425c3a44f0c324aa71 SHA256 1a0a64ce2cfaaeef687f5d2131d12358d4c8ae3dfeceb81cf6abf6ccf17d085c
 AUX grep-2.5.1-color.patch 313 RMD160 b4c787993fc05065bb8ec4f7b3007778650c8958 SHA1 623c25f3686adc40287ea244dd079c1e50c55c64 SHA256 f628a2a1800c9374eeece94c39b561dffd80b7f8ec587f25d00bd6301b32321d
@@ -20,15 +17,9 @@ DIST grep-2.5.1a.tar.bz2 527386 RMD160 f02c36c5a1efe805eafb0b4c0171ddb7ff15fbeb
 DIST grep-2.5.3.tar.bz2 618184 RMD160 dafa692fd67dfcd1c94115e9831d291b29fa7729 SHA1 53227ca9a01d5548448372f9b2e9111adf159f3b SHA256 d22dd8d626e557271aa555e7a06884a0114968845400ce1e7ab6f82b1f44b8fd
 DIST grep-2.5.4.tar.bz2 723181 RMD160 52abf25681bc6830f372ea7607480da69eaa06fd SHA1 9bbd4f02b18bb264e0fcb17293b6f0445c8694d2 SHA256 0abec64e01458fbd032e33351d8071602a959529ea796965e98338ee83a40020
 DIST grep_2.5.3~dfsg-6.diff.gz 17449 RMD160 88e13b03b661924b5a85bb783f9e936a3a5cfeab SHA1 d700ecdc27d45ba195e2c2d05c25365920788f71 SHA256 cd1253d672bcda0b530a0ac0ece8c4953353018a8a9d4dd0395333fc30a12cd9
-EBUILD grep-2.5.1a-r1.ebuild 1987 RMD160 1cfee753db688fb73ec637c3130cc0ee95e786d1 SHA1 f9f924b92d8f5e6fa9a654320d19626e0c7f2a43 SHA256 189e58f579c4bb4a689b650c352eb022cdc9df1d66355d9590ba5b570658cc11
-EBUILD grep-2.5.3-r1.ebuild 1589 RMD160 b44460c2195efce835aa03e4c624daf57821246d SHA1 94a03a5c8451a6ca1e91e4890de00715aa250255 SHA256 94e5ed06db2c0d9b48f4b52d92f910e503cce69f08a9b9d8ab26d6eaab2e409d
-EBUILD grep-2.5.4.ebuild 1242 RMD160 65b5cc5c5b563deb3b4f05e43c3fe6ddaab64ad8 SHA1 4bb65c2957716f1f7d3ea3b74b79019098eeb7cc SHA256 23049fc2c127ec1454582fe106b3ce9983ddbd0512962de7152d550b3963395e
-MISC ChangeLog 11897 RMD160 ec4a25ef7bd6ca18b77de48005817243bdfe070b SHA1 1ff5a0f0060383c0493d0a45f2d6231b9d82b159 SHA256 61b919f4596063856a998523bc0328e0cf122200a63a2d28c05cfd9a3624854a
+EBUILD grep-2.5.1a-r1.ebuild 1996 RMD160 02c5c4cd2cd4de953152b52fce10cc720892307f SHA1 fe96bf17c85b78320c896050aa9f8ddfee9d042d SHA256 c8a72f3a6080e1635f45f3d0d2156c140658a786c5e962418504a5fa67dd4b12
+EBUILD grep-2.5.3-r1.ebuild 1595 RMD160 2b03a171bd3460f2ec9362cd143ef60f5f67629f SHA1 f9e24db0a727e3ba9ab2df114a7a6b111e8374d1 SHA256 e49dad87a7cdb4bf582d9d6d3791e97b60075cbca166a34eda93c0d283b3e271
+EBUILD grep-2.5.4-r1.ebuild 1123 RMD160 2c6d2d6db9ecf30c0f787f0863ac6fe81c1ddfee SHA1 fd0aeec3b7db910f80707242495d6aa285426f45 SHA256 3e4fd4006e81082bfb4ce6b7457425bcc366b16db1f3d9835a41f56c36993078
+EBUILD grep-2.5.4.ebuild 1250 RMD160 4b34d11af68c9cd44556ad94a1f36a0a86795f48 SHA1 1cda64703a58fe715449f3a470998f38798781c1 SHA256 ef82309c8a7af49b244eadf8e9de8b18c9a28b3e10ef394dcffca82e8cd9977c
+MISC ChangeLog 12283 RMD160 92e1132bc1290ca853e77779a8dd63aed242e716 SHA1 232d2fb320ec0d6b040783f60d2bb4e9f646745c SHA256 678eb85dfc4d8159b9beec4c358833143e45d7f2a4c4fae7b82dde74e980db4f
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.10 (GNU/Linux)
-
-iEYEARECAAYFAkm5L3YACgkQl4DfQEcjpw06SACgnunASAEQz7m0GGJIVHM1PW30
-+J4AoKadwCZmvpLPvVpc41SullfKVVDy
-=DjGC
------END PGP SIGNATURE-----
diff --git a/sys-apps/grep/grep-2.5.1a-r1.ebuild b/sys-apps/grep/grep-2.5.1a-r1.ebuild
index 3d4daf6e4083..509c487a28bb 100644
--- a/sys-apps/grep/grep-2.5.1a-r1.ebuild
+++ b/sys-apps/grep/grep-2.5.1a-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/grep-2.5.1a-r1.ebuild,v 1.8 2007/03/14 10:50:40 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/grep-2.5.1a-r1.ebuild,v 1.9 2009/04/09 16:09:35 loki_val Exp $
 
 inherit flag-o-matic eutils
 
@@ -16,7 +16,7 @@ IUSE="nls pcre static"
 
 RDEPEND="nls? ( virtual/libintl )"
 DEPEND="${RDEPEND}
-	pcre? ( dev-libs/libpcre )
+	pcre? ( <=dev-libs/libpcre-7.8 )
 	nls? ( sys-devel/gettext )"
 
 src_unpack() {
diff --git a/sys-apps/grep/grep-2.5.3-r1.ebuild b/sys-apps/grep/grep-2.5.3-r1.ebuild
index 13266a028a95..98780986e10f 100644
--- a/sys-apps/grep/grep-2.5.3-r1.ebuild
+++ b/sys-apps/grep/grep-2.5.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/grep-2.5.3-r1.ebuild,v 1.4 2009/01/04 21:07:46 the_paya Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/grep-2.5.3-r1.ebuild,v 1.5 2009/04/09 16:09:35 loki_val Exp $
 
 inherit flag-o-matic eutils
 
@@ -18,7 +18,7 @@ IUSE="nls pcre static"
 
 RDEPEND="nls? ( virtual/libintl )"
 DEPEND="${RDEPEND}
-	pcre? ( dev-libs/libpcre )
+	pcre? ( <=dev-libs/libpcre-7.8 )
 	nls? ( sys-devel/gettext )"
 
 src_unpack() {
diff --git a/sys-apps/grep/grep-2.5.4-r1.ebuild b/sys-apps/grep/grep-2.5.4-r1.ebuild
new file mode 100644
index 000000000000..973810950222
--- /dev/null
+++ b/sys-apps/grep/grep-2.5.4-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/grep-2.5.4-r1.ebuild,v 1.1 2009/04/09 16:09:35 loki_val Exp $
+
+EAPI=2
+
+inherit eutils
+
+DESCRIPTION="GNU regular expression matcher"
+HOMEPAGE="http://www.gnu.org/software/grep/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2
+	mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~amd64-fbsd ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="nls pcre"
+
+RDEPEND="nls? ( virtual/libintl )
+	pcre? ( >=dev-libs/libpcre-7.8-r1 )"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.5.3-po-builddir-fix.patch
+	epatch "${FILESDIR}"/${PN}-2.5.3-nls.patch
+}
+
+src_configure() {
+	econf \
+		--bindir=/bin \
+		$(use_enable nls) \
+		$(use_enable pcre perl-regexp) \
+		$(use elibc_FreeBSD || echo --without-included-regex) \
+		|| die "econf failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
+}
diff --git a/sys-apps/grep/grep-2.5.4.ebuild b/sys-apps/grep/grep-2.5.4.ebuild
index 5ff7c7fa3ea0..090b0f5d23e3 100644
--- a/sys-apps/grep/grep-2.5.4.ebuild
+++ b/sys-apps/grep/grep-2.5.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/grep-2.5.4.ebuild,v 1.3 2009/03/12 15:51:07 drizzt Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/grep-2.5.4.ebuild,v 1.4 2009/04/09 16:09:35 loki_val Exp $
 
 inherit eutils
 
@@ -16,7 +16,7 @@ IUSE="nls pcre static"
 
 RDEPEND="nls? ( virtual/libintl )"
 DEPEND="${RDEPEND}
-	pcre? ( dev-libs/libpcre )
+	pcre? ( <=dev-libs/libpcre-7.8 )
 	nls? ( sys-devel/gettext )"
 
 src_unpack() {