move ppc-macos to newer version and punt older

Package-Manager: portage-2.0.53_rc7

4 files changed, 12 insertions, 89 deletions

diff --git a/sys-apps/grep/Manifest b/sys-apps/grep/Manifest
index 3509c2aeab71..97de845c3a6c 100644
--- a/sys-apps/grep/Manifest
+++ b/sys-apps/grep/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 a6b713632ad06779ad521eb06562edf8 ChangeLog 8405
 MD5 792f6cb13959979de2b10537067603bb files/2.5.1-manpage-line-buffering.patch 477
 MD5 41f77ef6693dc91a37b5ec51ce5a3e2d files/2.5.1-manpage.patch 283
@@ -16,3 +19,10 @@ MD5 1eee743f3bf8a7926c07f9a0307a6b64 files/grep-2.5.1-restrict_arr.patch 410
 MD5 4c998f6d8d6ee9690d26e2ff67138d4b grep-2.5.1-r8.ebuild 2097
 MD5 e853cf278bda1dc5f46c743c9f3fe197 grep-2.5.1-r9.ebuild 2156
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDi7xSgIKl8Uu19MoRAh8tAJ40Ue65E2M7qsKUhmimGqo5KbcB1gCeNQet
+2x2o/M2TQ3VK5Iefl+832Lk=
+=uca1
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/grep/files/digest-grep-2.5.1-r6 b/sys-apps/grep/files/digest-grep-2.5.1-r6
deleted file mode 100644
index ef03a032aa20..000000000000
--- a/sys-apps/grep/files/digest-grep-2.5.1-r6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 85df024edc9f9689035f6b3de28c7731 grep-2.5.1.tar.gz 683093
diff --git a/sys-apps/grep/grep-2.5.1-r6.ebuild b/sys-apps/grep/grep-2.5.1-r6.ebuild
deleted file mode 100644
index 845bba00f6a1..000000000000
--- a/sys-apps/grep/grep-2.5.1-r6.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# 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-r6.ebuild,v 1.15 2005/11/26 20:08:39 vapier Exp $
-
-inherit gnuconfig flag-o-matic eutils multilib
-
-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 mips ppc ppc64 s390 sh sparc x86 ~ppc-macos"
-IUSE="build nls pcre static"
-
-RDEPEND="virtual/libc"
-DEPEND="${RDEPEND}
-	pcre? (
-		>=sys-apps/sed-4
-		dev-libs/libpcre )
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A} && cd ${S} || die
-
-	# Fix a weird sparc32 compiler bug
-	echo "" >> src/dfa.h
-	epatch "${FILESDIR}/${PV}-manpage.patch"
-
-	# man page describes a --line-buffering option, where as
-	# grep recognises --line-buffered.
-	# 	-taviso (20 Aug 2004)
-	epatch ${FILESDIR}/${PV}-manpage-line-buffering.patch
-
-	use elibc_uclibc && epatch ${FILESDIR}/grep-2.5.1-restrict_arr.patch
-
-	epatch ${FILESDIR}/${PN}-${PV}-fgrep.patch.bz2
-	epatch ${FILESDIR}/${PN}-${PV}-i18n.patch.bz2
-	epatch ${FILESDIR}/${PN}-${PV}-gofast.patch.bz2
-	epatch ${FILESDIR}/${PN}-${PV}-oi.patch
-
-	# Fix configure scripts to detect linux-mips
-	gnuconfig_update
-}
-
-src_compile() {
-	local myconf="
-		$(use_enable nls)
-		--bindir=/bin"
-
-	if use static ; then
-		append-flags -static
-		append-ldflags -static
-	fi
-
-	if use elibc_uclibc ; then
-		myconf="${myconf} --without-included-regex"
-	else
-		myconf="${myconf} $(use_enable pcre perl-regexp)"
-	fi
-
-	econf ${myconf} || die "econf failed"
-
-	if use pcre && ! use elibc_uclibc ; then
-		sed -i -e "s:-lpcre:/usr/$(get_libdir)/libpcre.a:g" {lib,src}/Makefile \
-			|| die "sed Makefile failed"
-	fi
-
-	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 -rf "${D}/usr/share"
-	else
-		dodoc AUTHORS ChangeLog NEWS README THANKS TODO
-	fi
-}
diff --git a/sys-apps/grep/grep-2.5.1-r8.ebuild b/sys-apps/grep/grep-2.5.1-r8.ebuild
index d8ac89febf4e..9d11e5d4112b 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.9 2005/11/26 20:08:39 vapier Exp $
+# $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 $
 
 inherit flag-o-matic eutils
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ~ppc-macos ppc64 s390 sh sparc x86"
 IUSE="build nls pcre static"
 
 RDEPEND=""