gentoo resync : 28.04.2021

4 files changed, 2 insertions, 256 deletions

diff --git a/sys-apps/most/Manifest b/sys-apps/most/Manifest
index c78233c11d38..9120796ce42a 100644
--- a/sys-apps/most/Manifest
+++ b/sys-apps/most/Manifest
@@ -1,7 +1,4 @@
 AUX most-5.0.0a-donot-hardcode-path.patch 969 BLAKE2B 1089149fc01a3081760f422b73d4a691e3078f13df1a7045cf0f94d6991c762e4004088e9a0b89a9b6b39ec70782f1b86edb13c714ef2b2b33bd6ccd9f18435d SHA512 6da3424b5e9763bd8f89998ffe019230cc8e9c7fc9722235cc13830d50647f590f6a934ae025a063fe8fc1e8bdd2b4fc067fbc1569c7a0ebfa220b868b999271
-AUX most-5.0.0a-no-explicit-termcap.patch 6172 BLAKE2B af569f2fc46a341a57823bb6afc57dbaff020547c840acd8e918550e939d9d3ddfa8b4f16d14fc19b6950997fe58273b720ebfbcfde445a6fb994a3bdac064ee SHA512 48a87d66bda3b1464a214614c5ea23a5ba5a820da0da497de4db9ca4205288d7f63f460b08713047a4a14e8911bbb0b6a92ff2521cbec1acdf4e37e86a2c1346
-DIST most-5.0.0a.tar.bz2 131130 BLAKE2B f516b7cd1b37ca274dc8472a258390cde437f44ac320a257ab94cb97e918d574f61e961457809941a3eefa761a62e8f45bd60392e5b95dc60cedc6c1d9f56baf SHA512 0c101777250a15ed9cbe0bfbaa17d0ac5ef973a7e0730d096bd931ba578dbcbd4f244305c99a50bc8fd8aa1937b621a97a6452b3821fee7d72f33a02da278e5d
 DIST most-5.1.0.tar.gz 162172 BLAKE2B a3c0f3d85e7c4f4a014c174efb0d3d22b0fc2758e403ddccc74308399eeec616800e16db33554f0ca53fba674efba9dd93d51ed0c3f887b2c24fd3dd2335387c SHA512 cbc090283bbaafb8ffee9d6d1abc7b49cd58d54b742cf8dc86274351dee6398d1f24841bd1631ac40f861ad9e23569646133d3297317d9d514a7a38dd74533d2
-EBUILD most-5.0.0a-r1.ebuild 879 BLAKE2B 4fe01614ceddbdbe1ab9ef427ade3817621c64e48a9b39e8ba6269e8512e9dbb58287a5f645ae468135a106bc609a03f0e483e6fbfaea0744cc7150421fb9846 SHA512 b504994a06d07fed46481f631bd6e6a81d6fc38d9157a426b8df0845abe04047e097af6416c85769bf5c4751593f0aa0a8056748277f02447c3496b7283c084a
-EBUILD most-5.1.0.ebuild 870 BLAKE2B 74c3ded940f1e5ae127d87bffdf1520d091ec6f7575284f5e2dac2702b75e0bb97e3e933d8ba4d4cfed9a64270881fa9ac0434927ba667b4f86ad6bacc322602 SHA512 4030f523b09d9e45a37a4b1e57572a68260c10e6a40b95f38e77bbe389019f85f4146334bb239510a4ab0040c3f14e87bfc629e4ee2e3cf99c35343583520378
+EBUILD most-5.1.0.ebuild 865 BLAKE2B 3685189fff6bfe88faf0535665e6cf106616ec63d205d106ee534c7da82dece2cb6103009112ee656cbf2c86d7d8805c01e02618db91df3a35940f0fb180f9a5 SHA512 f2c4bb745c7149bb72512df1361a7caec50f803c5e65efb21b9bd91dc63be00f2c57bd6737b0e59709e7a27802ad723d7195792e0e5dfc81bb4e56580b6c46e2
 MISC metadata.xml 271 BLAKE2B 46146f4bf13e9f4d33435225ec1012dd9bb89b20812963dc50368cab2a60a3c542052cb72f8963cc72074b2c13a5b054c77152de1d108027752601a349bc4ef8 SHA512 3e98f5382cf789992bdfc0f32e6e36eba31944be654c03f2ed9bd00baf56c8b768c256c4f8778d5775d6df38da4afcf8e32b6e6495a1ecfc8e7982c7c8943b1b
diff --git a/sys-apps/most/files/most-5.0.0a-no-explicit-termcap.patch b/sys-apps/most/files/most-5.0.0a-no-explicit-termcap.patch
deleted file mode 100644
index f858f56f7bc1..000000000000
--- a/sys-apps/most/files/most-5.0.0a-no-explicit-termcap.patch
+++ /dev/null
@@ -1,216 +0,0 @@
-Author: Benda Xu <heroxbd@gentoo.org>
-Date: 2014-12-08
-Forwarded: John E. Davis <jed@jedsoft.org>
-
-"most" completely replies on slang to access terminfo/termcap, by
-SLtt_get_terminfo() and friends.
-
-Nothing should be considered by most but to find slang. Therefore it
-should not link against libtermcap in any case.
-
-	* configure.ac: remove JD_TERMCAP
-	* configure: regenerate with autoconf-2.61
-	* src/Makefile.in: remove libtermcap linking
-
-Index: most-5.0.0a/autoconf/configure.ac
-===================================================================
---- most-5.0.0a.orig/autoconf/configure.ac
-+++ most-5.0.0a/autoconf/configure.ac
-@@ -62,7 +62,6 @@ getpgrp tcgetpgrp \
- )
- 
- JD_SET_OBJ_SRC_DIR
--JD_TERMCAP
- JD_WITH_LIBRARY(slang)
- JD_GCC_WARNINGS
- JD_GET_MODULES(src/modules.lis)
-Index: most-5.0.0a/configure
-===================================================================
---- most-5.0.0a.orig/configure
-+++ most-5.0.0a/configure
-@@ -700,8 +700,6 @@ X_EXTRA_LIBS
- SRCDIR
- OBJDIR
- ELFDIR
--TERMCAP
--MISC_TERMINFO_DIRS
- SLANG_LIB
- SLANG_INC
- PROGRAM_OFILES
-@@ -9064,13 +9062,11 @@ _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
--#include <sys/types.h> /* for off_t */
--     #include <stdio.h>
-+#include <stdio.h>
- int
- main ()
- {
--int (*fp) (FILE *, off_t, int) = fseeko;
--     return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
-+return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0);
-   ;
-   return 0;
- }
-@@ -9110,13 +9106,11 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- #define _LARGEFILE_SOURCE 1
--#include <sys/types.h> /* for off_t */
--     #include <stdio.h>
-+#include <stdio.h>
- int
- main ()
- {
--int (*fp) (FILE *, off_t, int) = fseeko;
--     return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
-+return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0);
-   ;
-   return 0;
- }
-@@ -9777,42 +9771,6 @@ OBJDIR=$SRCDIR/"$ARCH"objs
- ELFDIR=$SRCDIR/elf"$ARCH"objs
- 
- 
--{ echo "$as_me:$LINENO: checking for Terminfo" >&5
--echo $ECHO_N "checking for Terminfo... $ECHO_C" >&6; }
--MISC_TERMINFO_DIRS="$FINKPREFIX/share/terminfo"
--if test ! -d $MISC_TERMINFO_DIRS
--then
--   MISC_TERMINFO_DIRS=""
--fi
--
--JD_Terminfo_Dirs="/usr/lib/terminfo \
--                 /usr/share/terminfo \
--                 /usr/share/lib/terminfo \
--		 /usr/local/lib/terminfo \
--		 $MISC_TERMINFO_DIRS"
--
--TERMCAP=-ltermcap
--
--for terminfo_dir in $JD_Terminfo_Dirs
--do
--   if test -d $terminfo_dir
--   then
--      { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
--      TERMCAP=""
--      break
--   fi
--done
--if test "$TERMCAP"; then
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
--  cat >>confdefs.h <<\_ACEOF
--#define USE_TERMCAP 1
--_ACEOF
--
--fi
--
--
-   if test "X$jd_prefix" = "X"
-   then
-     jd_prefix=$ac_default_prefix
-@@ -10858,8 +10816,6 @@ X_EXTRA_LIBS!$X_EXTRA_LIBS$ac_delim
- SRCDIR!$SRCDIR$ac_delim
- OBJDIR!$OBJDIR$ac_delim
- ELFDIR!$ELFDIR$ac_delim
--TERMCAP!$TERMCAP$ac_delim
--MISC_TERMINFO_DIRS!$MISC_TERMINFO_DIRS$ac_delim
- SLANG_LIB!$SLANG_LIB$ac_delim
- SLANG_INC!$SLANG_INC$ac_delim
- PROGRAM_OFILES!$PROGRAM_OFILES$ac_delim
-@@ -10868,9 +10824,10 @@ PROGRAM_HFILES!$PROGRAM_HFILES$ac_delim
- PROGRAM_OBJECTS!$PROGRAM_OBJECTS$ac_delim
- PROGRAM_ELFOBJECTS!$PROGRAM_ELFOBJECTS$ac_delim
- LIBOBJS!$LIBOBJS$ac_delim
-+LTLIBOBJS!$LTLIBOBJS$ac_delim
- _ACEOF
- 
--  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 96; then
-     break
-   elif $ac_last_try; then
-     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-@@ -10906,50 +10863,6 @@ CEOF$ac_eof
- _ACEOF
- 
- 
--ac_delim='%!_!# '
--for ac_last_try in false false false false false :; do
--  cat >conf$$subs.sed <<_ACEOF
--LTLIBOBJS!$LTLIBOBJS$ac_delim
--_ACEOF
--
--  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 1; then
--    break
--  elif $ac_last_try; then
--    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
--echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
--   { (exit 1); exit 1; }; }
--  else
--    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
--  fi
--done
--
--ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
--if test -n "$ac_eof"; then
--  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
--  ac_eof=`expr $ac_eof + 1`
--fi
--
--cat >>$CONFIG_STATUS <<_ACEOF
--cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof
--/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
--_ACEOF
--sed '
--s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
--s/^/s,@/; s/!/@,|#_!!_#|/
--:n
--t n
--s/'"$ac_delim"'$/,g/; t
--s/$/\\/; p
--N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
--' >>$CONFIG_STATUS <conf$$subs.sed
--rm -f conf$$subs.sed
--cat >>$CONFIG_STATUS <<_ACEOF
--:end
--s/|#_!!_#|//g
--CEOF$ac_eof
--_ACEOF
--
--
- # VPATH may cause trouble with some makes, so we remove $(srcdir),
- # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
- # trailing colons and then remove the whole line if VPATH becomes empty
-@@ -11193,7 +11106,7 @@ s&@abs_builddir@&$ac_abs_builddir&;t t
- s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
- s&@INSTALL@&$ac_INSTALL&;t t
- $ac_datarootdir_hack
--" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out
-+" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed 's/|#_!!_#|//g' >$tmp/out
- 
- test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-   { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
-Index: most-5.0.0a/src/Makefile.in
-===================================================================
---- most-5.0.0a.orig/src/Makefile.in
-+++ most-5.0.0a/src/Makefile.in
-@@ -3,7 +3,6 @@ CFLAGS		= @CFLAGS@ @SLANG_DLL_CFLAGS@
- LDFLAGS		= @LDFLAGS@
- SLANG_INC	= @SLANG_INC@
- SLANG_LIB	= @SLANG_LIB@ -lslang
--MISCLIBS	= @TERMCAP@
- RPATH		= @RPATH@
- 
- #-----------------------------------------------------------------------------
-@@ -44,7 +43,7 @@ EXEC = most
- CONFIG_H = config.h
- INCS = $(SLANG_INC)
- ALL_CFLAGS = $(CFLAGS) -Dunix $(INCS)
--EXECLIBS = $(RPATH) $(SLANG_LIB) $(MISCLIBS) -lm
-+EXECLIBS = $(RPATH) $(SLANG_LIB) -lm
- #
- most_O_DEP = $(SRCDIR)/version.h
- UPDATE_VERSION_SCRIPT = $(HOME)/bin/update_changes_version
diff --git a/sys-apps/most/most-5.0.0a-r1.ebuild b/sys-apps/most/most-5.0.0a-r1.ebuild
deleted file mode 100644
index f57fbba42dd5..000000000000
--- a/sys-apps/most/most-5.0.0a-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="Paging program that displays, one windowful at a time, the contents of a file"
-HOMEPAGE="ftp://space.mit.edu/pub/davis/most"
-SRC_URI="ftp://space.mit.edu/pub/davis/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~mips ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE=""
-
-RDEPEND=">=sys-libs/slang-2.1.3"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-5.0.0a-no-explicit-termcap.patch
-	epatch "${FILESDIR}"/${PN}-5.0.0a-donot-hardcode-path.patch
-	sed -i -e 's:$(INSTALL) -s:$(INSTALL):' src/Makefile.in || die
-	export MAKEOPTS+=" -j1"
-}
-
-src_configure() {
-	unset ARCH
-	econf
-}
-
-src_install() {
-	emake DESTDIR="${D}" DOC_DIR="${EPREFIX}/usr/share/doc/${PF}" \
-		install
-}
diff --git a/sys-apps/most/most-5.1.0.ebuild b/sys-apps/most/most-5.1.0.ebuild
index 9268240d6aeb..18b707ef38fb 100644
--- a/sys-apps/most/most-5.1.0.ebuild
+++ b/sys-apps/most/most-5.1.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.jedsoft.org/releases/${PN}/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~mips ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE=""
 
 RDEPEND=">=sys-libs/slang-2.1.3"