amd64 stable wrt #212788

(Portage version: 2.1.4.4)

4 files changed, 8 insertions, 82 deletions

diff --git a/sys-apps/most/ChangeLog b/sys-apps/most/ChangeLog
index dbc8fe031484..0ac1ed24abc4 100644
--- a/sys-apps/most/ChangeLog
+++ b/sys-apps/most/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/most
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/most/ChangeLog,v 1.41 2008/03/10 11:14:36 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/most/ChangeLog,v 1.42 2008/03/10 14:05:32 drac Exp $
+
+  10 Mar 2008; Samuli Suominen <drac@gentoo.org>
+  -files/most-4.10.2-fix-goto-line.diff, -most-4.10.2-r1.ebuild,
+  most-5.0.0a.ebuild:
+  amd64 stable wrt #212788
 
   10 Mar 2008; Raúl Porcel <armin76@gentoo.org> most-5.0.0a.ebuild:
   alpha/sparc stable wrt #212788
diff --git a/sys-apps/most/files/most-4.10.2-fix-goto-line.diff b/sys-apps/most/files/most-4.10.2-fix-goto-line.diff
deleted file mode 100644
index 3b9272c491b6..000000000000
--- a/sys-apps/most/files/most-4.10.2-fix-goto-line.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --exclude='*~' --exclude='.*' -I '$Id:' -urN most-4.10.2.orig/src/keym.c most-4.10.2/src/keym.c
---- most-4.10.2.orig/src/keym.c	2005-08-13 23:11:23.000000000 -0400
-+++ most-4.10.2/src/keym.c	2005-08-13 23:37:11.000000000 -0400
-@@ -199,7 +199,7 @@
- {
-    Most_Mini_Buf[0] = 0;
- 
--   if (!most_read_from_minibuffer(prompt, (char *) Most_Mini_Buf, MOST_MINI_BUF_LEN))
-+   if (most_read_from_minibuffer(prompt, (char *) Most_Mini_Buf, MOST_MINI_BUF_LEN))
-      return -1;
- 
-    if (1 != sscanf((char *) Most_Mini_Buf, "%d", n))
diff --git a/sys-apps/most/most-4.10.2-r1.ebuild b/sys-apps/most/most-4.10.2-r1.ebuild
deleted file mode 100644
index 17693bfa1105..000000000000
--- a/sys-apps/most/most-4.10.2-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/most/most-4.10.2-r1.ebuild,v 1.12 2008/02/10 11:33:52 drac Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="An extremely excellent text file reader"
-HOMEPAGE="http://freshmeat.net/projects/most/"
-SRC_URI="ftp://space.mit.edu/pub/davis/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-# Note to arch maintainers: you'll need to add to src_install() for your
-# arch, since the app's Makefile does strange things with different
-# directories for each arch. -- ciaranm, 27 June 2004
-KEYWORDS="alpha amd64 mips ppc sparc x86"
-
-DEPEND=">=sys-libs/slang-1.4
-	>=sys-libs/ncurses-5.2-r2"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-fix-goto-line.diff
-}
-
-src_install() {
-	# Changing this to use src/${ARCH}objs/most probably isn't a good
-	# idea...
-	local objsdir
-	case $(tc-arch) in
-		x86)
-			objsdir=x86objs
-		;;
-		amd64)
-			objsdir=amd64objs
-		;;
-		sparc)
-			objsdir=sparcobjs
-		;;
-		mips)
-			objsdir=mipsobjs
-		;;
-		ppc)
-			objsdir=ppcobjs
-		;;
-		alpha)
-			objsdir=alphaobjs
-		;;
-	esac
-	dobin src/${objsdir:-objs}/most || die "Couldn't install binary"
-
-	doman most.1
-
-	dodoc README changes.txt
-	docinto txt
-	dodoc most.rc lesskeys.rc most-fun.txt
-}
-
-pkg_postinst() {
-	echo
-	einfo "See most.rc in /usr/share/doc/${PF}/txt"
-	einfo "for an example /etc/most.conf."
-	echo
-}
diff --git a/sys-apps/most/most-5.0.0a.ebuild b/sys-apps/most/most-5.0.0a.ebuild
index 678eaa2944a2..3e9b3aa31c9d 100644
--- a/sys-apps/most/most-5.0.0a.ebuild
+++ b/sys-apps/most/most-5.0.0a.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/most/most-5.0.0a.ebuild,v 1.6 2008/03/10 11:14:36 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/most/most-5.0.0a.ebuild,v 1.7 2008/03/10 14:05:32 drac Exp $
 
 DESCRIPTION="a paging program that displays, one windowful at a time, the contents of a file."
 HOMEPAGE="ftp://space.mit.edu/pub/davis/most"
@@ -8,7 +8,7 @@ SRC_URI="ftp://space.mit.edu/pub/davis/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~mips ppc sparc x86"
+KEYWORDS="alpha amd64 ~mips ppc sparc x86"
 IUSE=""
 
 RDEPEND=">=sys-libs/slang-2.1.3"