diff options
author | Mike Frysinger <vapier@gentoo.org> | 2007-07-07 04:43:28 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2007-07-07 04:43:28 +0000 |
commit | 6a716ca13f5905306da4be358e01dba2e21189d6 (patch) | |
tree | fe90cdde1452ef7b895ef371b414eadedc507cf7 /sys-apps/grep | |
parent | old (diff) | |
download | gentoo-2-6a716ca13f5905306da4be358e01dba2e21189d6.tar.gz gentoo-2-6a716ca13f5905306da4be358e01dba2e21189d6.tar.bz2 gentoo-2-6a716ca13f5905306da4be358e01dba2e21189d6.zip |
old
(Portage version: 2.1.3_rc6)
Diffstat (limited to 'sys-apps/grep')
-rw-r--r-- | sys-apps/grep/files/2.5.1-tests.patch | 45 | ||||
-rw-r--r-- | sys-apps/grep/files/digest-grep-2.5.1-r8 | 3 | ||||
-rw-r--r-- | sys-apps/grep/files/digest-grep-2.5.1-r9 | 3 | ||||
-rw-r--r-- | sys-apps/grep/files/digest-grep-2.5.1a | 3 | ||||
-rw-r--r-- | sys-apps/grep/grep-2.5.1-r8.ebuild | 69 | ||||
-rw-r--r-- | sys-apps/grep/grep-2.5.1-r9.ebuild | 81 | ||||
-rw-r--r-- | sys-apps/grep/grep-2.5.1a.ebuild | 79 |
7 files changed, 0 insertions, 283 deletions
diff --git a/sys-apps/grep/files/2.5.1-tests.patch b/sys-apps/grep/files/2.5.1-tests.patch deleted file mode 100644 index 5d29d5924297..000000000000 --- a/sys-apps/grep/files/2.5.1-tests.patch +++ /dev/null @@ -1,45 +0,0 @@ -glibc has changed the error code it returns from '1' to '2'. The -included grep regex library returns '1' still though, so spencer -test #55 incorrectly fails. For now, we update the test to match -the glibc regex since that is what we're using ;). - -http://bugs.gentoo.org/show_bug.cgi?id=76192 -http://linuxfromscratch.org/pipermail/lfs-dev/2003-February/032543.html - - -glibc has a sweet bug where it can go to town (and never come back) -with some complicated regex's. this has been fixed in glibc cvs, -but our latest releases don't have the patch. so let's add a simple -workaround from upstream grep cvs. - -http://bugs.gentoo.org/show_bug.cgi?id=76879 - -Index: tests/spencer1.tests -=================================================================== -RCS file: /cvsroot/grep/grep/tests/spencer1.tests,v -retrieving revision 1.1 -retrieving revision 1.2 -diff -u -r1.1 -r1.2 ---- tests/spencer1.tests 3 Nov 1998 21:39:05 -0000 1.1 -+++ tests/spencer1.tests 12 Jun 2003 15:26:15 -0000 1.2 -@@ -52,3 +52,3 @@ - 0@$*@- --1@(*)b@- -+2@(*)b@- - 1@$b@b -Index: tests/backref.sh -=================================================================== -RCS file: /cvsroot/grep/grep/tests/backref.sh,v -retrieving revision 1.3 -retrieving revision 1.4 -diff -u -r1.3 -r1.4 ---- tests/backref.sh 23 Jul 2003 05:15:51 -0000 1.3 -+++ tests/backref.sh 19 Nov 2004 14:00:18 -0000 1.4 -@@ -14,5 +14,6 @@ - - # hit hard with the `Bond' tests --echo "civic" | ${GREP} -E -e '^(.?)(.?)(.?)(.?)(.?)(.?)(.?)(.?)(.?).?\9\8\7\6\5\4\3\2\1$' > /dev/null 2>&1 -+# For now, remove the ``?'' in the last parentheses, so that new glibc can do it. --Stepan -+echo "civic" | ${GREP} -E -e '^(.?)(.?)(.?)(.?)(.?)(.?)(.?)(.?)(.).?\9\8\7\6\5\4\3\2\1$' > /dev/null 2>&1 - if test $? -ne 0 ; then - echo "Options: Bond, test \#2 failed" diff --git a/sys-apps/grep/files/digest-grep-2.5.1-r8 b/sys-apps/grep/files/digest-grep-2.5.1-r8 deleted file mode 100644 index 7fcc231ba042..000000000000 --- a/sys-apps/grep/files/digest-grep-2.5.1-r8 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 85df024edc9f9689035f6b3de28c7731 grep-2.5.1.tar.gz 683093 -RMD160 96d1fda2297a03a11c7d2fcea16effff55d2cbd0 grep-2.5.1.tar.gz 683093 -SHA256 d2c068701afae914b9a0707f2af6c373556c7b761913169ae0a7afa9fd5b2442 grep-2.5.1.tar.gz 683093 diff --git a/sys-apps/grep/files/digest-grep-2.5.1-r9 b/sys-apps/grep/files/digest-grep-2.5.1-r9 deleted file mode 100644 index 7fcc231ba042..000000000000 --- a/sys-apps/grep/files/digest-grep-2.5.1-r9 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 85df024edc9f9689035f6b3de28c7731 grep-2.5.1.tar.gz 683093 -RMD160 96d1fda2297a03a11c7d2fcea16effff55d2cbd0 grep-2.5.1.tar.gz 683093 -SHA256 d2c068701afae914b9a0707f2af6c373556c7b761913169ae0a7afa9fd5b2442 grep-2.5.1.tar.gz 683093 diff --git a/sys-apps/grep/files/digest-grep-2.5.1a b/sys-apps/grep/files/digest-grep-2.5.1a deleted file mode 100644 index 86f3e9144a79..000000000000 --- a/sys-apps/grep/files/digest-grep-2.5.1a +++ /dev/null @@ -1,3 +0,0 @@ -MD5 52202fe462770fa6be1bb667bd6cf30c grep-2.5.1a.tar.bz2 527386 -RMD160 f02c36c5a1efe805eafb0b4c0171ddb7ff15fbeb grep-2.5.1a.tar.bz2 527386 -SHA256 38c8a2bb9223d1fb1b10bdd607cf44830afc92fd451ac4cd07619bf92bdd3132 grep-2.5.1a.tar.bz2 527386 diff --git a/sys-apps/grep/grep-2.5.1-r8.ebuild b/sys-apps/grep/grep-2.5.1-r8.ebuild deleted file mode 100644 index 77c60d1892c9..000000000000 --- a/sys-apps/grep/grep-2.5.1-r8.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2006 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.15 2007/02/28 22:20:04 genstef 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.gz - mirror://gentoo/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86" -IUSE="build nls static" - -RDEPEND="" -DEPEND="${RDEPEND} - nls? ( sys-devel/gettext )" - -src_unpack() { - unpack ${A} - cd "${S}" - - # Fix a weird sparc32 compiler bug - echo "" >> src/dfa.h - - epatch "${FILESDIR}"/${P}-manpage.patch - epatch "${FILESDIR}"/${P}-fgrep.patch - epatch "${FILESDIR}"/${P}-bracket.patch - epatch "${FILESDIR}"/${P}-i18n.patch - epatch "${FILESDIR}"/${P}-oi.patch - epatch "${FILESDIR}"/${P}-restrict_arr.patch - epatch "${FILESDIR}"/${PV}-utf8-case.patch - epatch "${FILESDIR}"/${P}-perl-segv.patch #95495 - epatch "${FILESDIR}"/${P}-libintl.patch #92586 - - # uclibc does not suffer from this glibc bug. - use elibc_uclibc || epatch "${FILESDIR}"/${PV}-tests.patch -} - -src_compile() { - if use static ; then - append-flags -static - append-ldflags -static - fi - - econf \ - --bindir=/bin \ - $(use_enable nls) \ - --disable-perl-regexp \ - || die "econf failed" - 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" - - if use build ; then - rm -r "${D}"/usr/share - else - dodoc AUTHORS ChangeLog NEWS README THANKS TODO - fi -} diff --git a/sys-apps/grep/grep-2.5.1-r9.ebuild b/sys-apps/grep/grep-2.5.1-r9.ebuild deleted file mode 100644 index 2168adf4f337..000000000000 --- a/sys-apps/grep/grep-2.5.1-r9.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 1999-2006 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.11 2007/02/28 22:20:04 genstef 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.gz - mirror://gentoo/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 arm hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh ~sparc ~x86 ~x86-fbsd" -IUSE="build nls static" - -RDEPEND="" -DEPEND="${RDEPEND} - nls? ( sys-devel/gettext )" - -src_unpack() { - unpack ${A} - cd "${S}" - - # Fix a weird sparc32 compiler bug - echo "" >> src/dfa.h - - epatch "${FILESDIR}"/${P}-manpage.patch - epatch "${FILESDIR}"/${P}-fgrep.patch - epatch "${FILESDIR}"/${P}-bracket.patch - epatch "${FILESDIR}"/${P}-i18n.patch - epatch "${FILESDIR}"/${P}-oi.patch - epatch "${FILESDIR}"/${P}-restrict_arr.patch - epatch "${FILESDIR}"/${PV}-utf8-case.patch - epatch "${FILESDIR}"/${P}-perl-segv.patch #95495 - epatch "${FILESDIR}"/${P}-libintl.patch #92586 - epatch "${FILESDIR}"/${P}-fix-devices-skip.patch #113640 - - # retarded - sed -i 's:__mempcpy:mempcpy:g' lib/*.c || die - - # uclibc does not suffer from this glibc bug. - use elibc_uclibc || epatch "${FILESDIR}"/${PV}-tests.patch -} - -src_compile() { - if use static ; then - append-flags -static - append-ldflags -static - fi - - econf \ - --bindir=/bin \ - $(use_enable nls) \ - --disable-perl-regexp \ - || die "econf failed" - - 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" - - if use build ; then - rm -r "${D}"/usr/share - else - dodoc AUTHORS ChangeLog NEWS README THANKS TODO - fi -} - -pkg_postinst() { - if has pcre ${USE} ; then - ewarn "This grep ebuild no longer supports pcre. If you want this" - ewarn "functionality, please use 'pcregrep' from the libpcre package." - fi -} diff --git a/sys-apps/grep/grep-2.5.1a.ebuild b/sys-apps/grep/grep-2.5.1a.ebuild deleted file mode 100644 index 3295f7916d6a..000000000000 --- a/sys-apps/grep/grep-2.5.1a.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2006 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.ebuild,v 1.8 2007/02/28 22:20:04 genstef 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 ~x86 ~x86-fbsd" -IUSE="build nls static" - -RDEPEND="nls? ( virtual/libintl )" -DEPEND="${RDEPEND} - nls? ( sys-devel/gettext )" - -src_unpack() { - unpack ${A} - cd "${S}" - - # Fix 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() { - if use static ; then - append-flags -static - append-ldflags -static - fi - - econf \ - --bindir=/bin \ - $(use_enable nls) \ - --disable-perl-regexp \ - || die "econf failed" - - 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" - - if use build ; then - rm -r "${D}"/usr/share - else - dodoc AUTHORS ChangeLog NEWS README THANKS TODO - fi -} - -pkg_postinst() { - if has pcre ${USE} ; then - ewarn "This grep ebuild no longer supports pcre. If you want this" - ewarn "functionality, please use 'pcregrep' from the libpcre package." - fi -} |