Punt old versions which depend on old libpcre.

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

5 files changed, 6 insertions, 176 deletions

diff --git a/sys-apps/grep/ChangeLog b/sys-apps/grep/ChangeLog
index f54dffba3acc..44b8f26f7cd9 100644
--- a/sys-apps/grep/ChangeLog
+++ b/sys-apps/grep/ChangeLog
@@ -1,6 +1,10 @@
 # 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.91 2009/07/04 12:20:42 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/ChangeLog,v 1.92 2009/10/22 16:32:40 loki_val Exp $
+
+  22 Oct 2009; Peter Alfredsen <loki_val@gentoo.org> -grep-2.5.1a-r1.ebuild,
+  -grep-2.5.3-r1.ebuild, -grep-2.5.4.ebuild:
+  Punt old versions which depend on old libpcre.
 
   04 Jul 2009; nixnut <nixnut@gentoo.org> grep-2.5.4-r1.ebuild:
   ppc stable #273037
diff --git a/sys-apps/grep/Manifest b/sys-apps/grep/Manifest
index 27aaacb260b4..d5399a562797 100644
--- a/sys-apps/grep/Manifest
+++ b/sys-apps/grep/Manifest
@@ -13,13 +13,7 @@ AUX grep-2.5.1a-nls.patch 1227 RMD160 c49d3604ff65b586ace6fa75a478c367cf6a0c62 S
 AUX grep-2.5.3-nls.patch 1339 RMD160 1f395f9bea5097c92a258cf4b06ff186a8a8710b SHA1 c72efe2cc35295acf5611b11369c827489575edf SHA256 fbeab3c37dcea3905aad14b87eddc14d035532af6fa0f3a126c52d0ca709edea
 AUX grep-2.5.3-po-builddir-fix.patch 252 RMD160 e2d58380b32de1ba6ecf47a4d2f93bd25186cbb5 SHA1 0cf165687ae45c3a79f37497a0dc7bf40ed3fa7a SHA256 5475ff7cb45b1b744618b5687ea8e130a4922888bd222f230a6f2856fc0c8b4a
 AUX grep-2.5.3-yesno-test-fix.patch 1553 RMD160 31871333dc9595bbedc70571ff7453bc7bf5479f SHA1 1068fd1f5b6f346a8ea73487f6bebf12e79437d2 SHA256 0b366ffa3f13aedfdb714e2151486476bd50d784176b564c0ddabd5943a97f25
-DIST grep-2.5.1a.tar.bz2 527386 RMD160 f02c36c5a1efe805eafb0b4c0171ddb7ff15fbeb SHA1 2cd082775d30be463c0ac674a00595eb56fda22e SHA256 38c8a2bb9223d1fb1b10bdd607cf44830afc92fd451ac4cd07619bf92bdd3132
-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 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 1109 RMD160 05717fd64981f6eaeb7e48bc4f46fdbce3247263 SHA1 007aa4919489ed4f6218b60efd29fd1705b4fb05 SHA256 65dc001df85002132c01ee867b8eb0e5911be811998be9c8cf09ba17d0ad8d14
-EBUILD grep-2.5.4.ebuild 1250 RMD160 4b34d11af68c9cd44556ad94a1f36a0a86795f48 SHA1 1cda64703a58fe715449f3a470998f38798781c1 SHA256 ef82309c8a7af49b244eadf8e9de8b18c9a28b3e10ef394dcffca82e8cd9977c
-MISC ChangeLog 12994 RMD160 619f3527d86a6a3046d1cc9e7a73e4ed6182ca81 SHA1 1004c845ab881e5cab6068b7db2aa94a1160f81e SHA256 b8b750af37182156d0380436efe3f4ed8b57155711bb78a1bbe9672550021e2c
+MISC ChangeLog 13168 RMD160 96b510ddbeffa9ad9f7f9ad04db10a4489fec4c9 SHA1 6509e6aff3d0af473d93fbf4d456e71c5ec9b8b6 SHA256 8535f54d393dc471951bc2ccc2a88ad54d0a97cd2a868f5e4454cf8b176fa5fb
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
diff --git a/sys-apps/grep/grep-2.5.1a-r1.ebuild b/sys-apps/grep/grep-2.5.1a-r1.ebuild
deleted file mode 100644
index 509c487a28bb..000000000000
--- a/sys-apps/grep/grep-2.5.1a-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# 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.9 2009/04/09 16:09:35 loki_val Exp $
-
-inherit flag-o-matic eutils
-
-DESCRIPTION="GNU regular expression matcher"
-HOMEPAGE="http://www.gnu.org/software/grep/grep.html"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2
-	mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
-IUSE="nls pcre static"
-
-RDEPEND="nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	pcre? ( <=dev-libs/libpcre-7.8 )
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# work around a weird sparc32 compiler bug
-	echo "" >> src/dfa.h
-
-	epatch "${FILESDIR}"/${PN}-2.5.1-manpage.patch
-	epatch "${FILESDIR}"/${PN}-2.5.1-fgrep.patch
-	epatch "${FILESDIR}"/${PN}-2.5.1-color.patch
-	epatch "${FILESDIR}"/${PN}-2.5.1-bracket.patch
-	epatch "${FILESDIR}"/${PN}-2.5.1-i18n.patch
-	epatch "${FILESDIR}"/${PN}-2.5.1-oi.patch
-	epatch "${FILESDIR}"/${PN}-2.5.1-restrict_arr.patch
-	epatch "${FILESDIR}"/2.5.1-utf8-case.patch
-	epatch "${FILESDIR}"/${PN}-2.5.1-perl-segv.patch #95495
-	epatch "${FILESDIR}"/${PN}-2.5.1-fix-devices-skip.patch #113640
-	epatch "${FILESDIR}"/${P}-nls.patch
-
-	# retarded
-	sed -i 's:__mempcpy:mempcpy:g' lib/*.c || die
-}
-
-src_compile() {
-	use static && append-ldflags -static
-
-	econf \
-		--bindir=/bin \
-		$(use_enable nls) \
-		$(use_enable pcre perl-regexp) \
-		|| die "econf failed"
-
-	use static || sed -i 's:-lpcre:-Wl,-Bstatic -lpcre -Wl,-Bdynamic:g' src/Makefile
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	# Override the default shell scripts... grep knows how to act
-	# based on how it's called
-	ln -sfn grep "${D}"/bin/egrep || die "ln egrep failed"
-	ln -sfn grep "${D}"/bin/fgrep || die "ln fgrep failed"
-
-	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
-}
diff --git a/sys-apps/grep/grep-2.5.3-r1.ebuild b/sys-apps/grep/grep-2.5.3-r1.ebuild
deleted file mode 100644
index 98780986e10f..000000000000
--- a/sys-apps/grep/grep-2.5.3-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# 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.5 2009/04/09 16:09:35 loki_val Exp $
-
-inherit flag-o-matic eutils
-
-DEB_VER="${PV}~dfsg-6"
-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
-	mirror://debian/pool/main/g/grep/grep_${DEB_VER}.diff.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="nls pcre static"
-
-RDEPEND="nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	pcre? ( <=dev-libs/libpcre-7.8 )
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${WORKDIR}"/grep_${DEB_VER}.diff
-	EPATCH_FORCE="yes" \
-	EPATCH_SUFFIX="patch" \
-	EPATCH_MULTI_MSG="Applying Debian patchset (${DEB_VER}) ..." \
-	epatch ${P}~dfsg/debian/patches/
-	epatch "${FILESDIR}"/${P}-yesno-test-fix.patch
-	epatch "${FILESDIR}"/${P}-po-builddir-fix.patch
-	epatch "${FILESDIR}"/${P}-nls.patch
-	use static && append-ldflags -static
-}
-
-src_compile() {
-	econf \
-		--bindir=/bin \
-		$(use_enable nls) \
-		$(use_enable pcre perl-regexp) \
-		$(use elibc_FreeBSD || echo --without-included-regex) \
-		|| die "econf failed"
-
-	use static || sed -i 's:-lpcre:-Wl,-Bstatic -lpcre -Wl,-Bdynamic:g' src/Makefile
-
-	emake || die "emake 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
deleted file mode 100644
index 090b0f5d23e3..000000000000
--- a/sys-apps/grep/grep-2.5.4.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# 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.4 2009/04/09 16:09:35 loki_val Exp $
-
-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 static"
-
-RDEPEND="nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	pcre? ( <=dev-libs/libpcre-7.8 )
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-2.5.3-po-builddir-fix.patch
-	epatch "${FILESDIR}"/${PN}-2.5.3-nls.patch
-}
-
-src_compile() {
-	econf \
-		--bindir=/bin \
-		$(use_enable nls) \
-		$(use_enable pcre perl-regexp) \
-		$(use elibc_FreeBSD || echo --without-included-regex) \
-		|| die "econf failed"
-
-	use static || sed -i 's:-lpcre:-Wl,-Bstatic -lpcre -Wl,-Bdynamic:g' src/Makefile
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
-}