amd64 stable wrt #212788

Package-Manager: portage-2.1.4.4

5 files changed, 10 insertions, 87 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/Manifest b/sys-apps/most/Manifest
index 7d3255dbf3b3..41279e70feb7 100644
--- a/sys-apps/most/Manifest
+++ b/sys-apps/most/Manifest
@@ -1,7 +1,4 @@
-AUX most-4.10.2-fix-goto-line.diff 529 RMD160 4233eb452489a6a7a344e85a357502fc9f7fa881 SHA1 dc70f6a3c6c367eb31cc745212b971444bd1112d SHA256 bddfb90e5551a572bac68aa3cdab821762ee5f0b2c47004a327a76c1ad02f589
-DIST most-4.10.2.tar.gz 138431 RMD160 b38a09b8b9354707479da366bd37b2d0d2e82233 SHA1 b0bcbbbff43aaab7b75b45d35ab8f2d32a3245c2 SHA256 3ee994186d44aa0fcfcce4061bc6e1e83b03fac9f4edc8b9faf2df38a3dec4ec
 DIST most-5.0.0a.tar.bz2 131130 RMD160 759525e5c914f474d7188890cec65bca1fe1b024 SHA1 de9fe30ae405c32f8424f10571839519a25f3043 SHA256 94cb5a2e71b6b9063116f4398a002a757e59cd1499f1019dde8874f408485aa9
-EBUILD most-4.10.2-r1.ebuild 1446 RMD160 23ab71bee9642ad86eaa2c036db70c5303dc7e8f SHA1 f8d923dbaaea4c1fd00682359b41a8e97c9edad0 SHA256 59082bf04251c04e6c602bfb85165351959c5aae6416eaf4517f3cdcde506566
-EBUILD most-5.0.0a.ebuild 839 RMD160 76147fd1e999ba66f9816aa67518a278b569245e SHA1 6be844567079069c4df8cf6ee318a5325bb2346c SHA256 16e6af8eef5bd9bd74a444f1406aa646e53f5f6281f17c07910d94ff866205e4
-MISC ChangeLog 5486 RMD160 4422bbf8ce06c73802c0e0178afe218e690f53f0 SHA1 ef818636d37f93e47d4c7d925e190f3cc9c94307 SHA256 4336280578d2a2a3672bc079c0a5ed477b5d105eb7668b03a1ebd14f2086d4f4
+EBUILD most-5.0.0a.ebuild 835 RMD160 8758e65a69654ed170ed5fb1c0335f352416388b SHA1 5e675150f75a36a30e9d720ae6cf19efa6171678 SHA256 f19cff332ff2435611c67f131546c59f6718fa0f9ee80c730be4c27f9d31aba8
+MISC ChangeLog 5647 RMD160 48a33abe3954f9bc3285892b616449ec64cb26f8 SHA1 ffffe927d3432016fa17a4e1cd131229fe2f08c2 SHA256 c292ebae730baca1d3187aebfcc158bed24b319d8766cc033c19b408aebfd270
 MISC metadata.xml 164 RMD160 cc7a7798af2b0129d7ce728b3d38d8b4625de71c SHA1 a9a44b989a1eee88c892fb0f500b19a80c4d4d0e SHA256 03080f40dc43565fd4bb7569351e0f607a4946a6108c15765ac42901ab16caf3
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"