diff options
| -rw-r--r-- | sys-apps/grep/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-apps/grep/grep-2.5.1a-r1.ebuild | 68 | ||||
| -rw-r--r-- | sys-apps/grep/grep-2.5.3-r1.ebuild | 55 | ||||
| -rw-r--r-- | sys-apps/grep/grep-2.5.4.ebuild | 45 |
4 files changed, 5 insertions, 169 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/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 -} |