| 1 |
commit: e43cfbd33594ef27c2d0582f0067120cbd9e2427 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Apr 22 12:24:47 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Apr 22 12:27:29 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e43cfbd3 |
| 7 |
|
| 8 |
sys-apps/most: drop 5.0.0a-r1 (EAPI 5) |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/783741 |
| 11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 12 |
|
| 13 |
sys-apps/most/Manifest | 1 - |
| 14 |
.../files/most-5.0.0a-no-explicit-termcap.patch | 216 --------------------- |
| 15 |
sys-apps/most/most-5.0.0a-r1.ebuild | 35 ---- |
| 16 |
3 files changed, 252 deletions(-) |
| 17 |
|
| 18 |
diff --git a/sys-apps/most/Manifest b/sys-apps/most/Manifest |
| 19 |
index 7d3eff66a3e..d1ffb632d48 100644 |
| 20 |
--- a/sys-apps/most/Manifest |
| 21 |
+++ b/sys-apps/most/Manifest |
| 22 |
@@ -1,2 +1 @@ |
| 23 |
-DIST most-5.0.0a.tar.bz2 131130 BLAKE2B f516b7cd1b37ca274dc8472a258390cde437f44ac320a257ab94cb97e918d574f61e961457809941a3eefa761a62e8f45bd60392e5b95dc60cedc6c1d9f56baf SHA512 0c101777250a15ed9cbe0bfbaa17d0ac5ef973a7e0730d096bd931ba578dbcbd4f244305c99a50bc8fd8aa1937b621a97a6452b3821fee7d72f33a02da278e5d |
| 24 |
DIST most-5.1.0.tar.gz 162172 BLAKE2B a3c0f3d85e7c4f4a014c174efb0d3d22b0fc2758e403ddccc74308399eeec616800e16db33554f0ca53fba674efba9dd93d51ed0c3f887b2c24fd3dd2335387c SHA512 cbc090283bbaafb8ffee9d6d1abc7b49cd58d54b742cf8dc86274351dee6398d1f24841bd1631ac40f861ad9e23569646133d3297317d9d514a7a38dd74533d2 |
| 25 |
|
| 26 |
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 |
| 27 |
deleted file mode 100644 |
| 28 |
index f858f56f7bc..00000000000 |
| 29 |
--- a/sys-apps/most/files/most-5.0.0a-no-explicit-termcap.patch |
| 30 |
+++ /dev/null |
| 31 |
@@ -1,216 +0,0 @@ |
| 32 |
-Author: Benda Xu <heroxbd@g.o> |
| 33 |
-Date: 2014-12-08 |
| 34 |
-Forwarded: John E. Davis <jed@×××××××.org> |
| 35 |
- |
| 36 |
-"most" completely replies on slang to access terminfo/termcap, by |
| 37 |
-SLtt_get_terminfo() and friends. |
| 38 |
- |
| 39 |
-Nothing should be considered by most but to find slang. Therefore it |
| 40 |
-should not link against libtermcap in any case. |
| 41 |
- |
| 42 |
- * configure.ac: remove JD_TERMCAP |
| 43 |
- * configure: regenerate with autoconf-2.61 |
| 44 |
- * src/Makefile.in: remove libtermcap linking |
| 45 |
- |
| 46 |
-Index: most-5.0.0a/autoconf/configure.ac |
| 47 |
-=================================================================== |
| 48 |
---- most-5.0.0a.orig/autoconf/configure.ac |
| 49 |
-+++ most-5.0.0a/autoconf/configure.ac |
| 50 |
-@@ -62,7 +62,6 @@ getpgrp tcgetpgrp \ |
| 51 |
- ) |
| 52 |
- |
| 53 |
- JD_SET_OBJ_SRC_DIR |
| 54 |
--JD_TERMCAP |
| 55 |
- JD_WITH_LIBRARY(slang) |
| 56 |
- JD_GCC_WARNINGS |
| 57 |
- JD_GET_MODULES(src/modules.lis) |
| 58 |
-Index: most-5.0.0a/configure |
| 59 |
-=================================================================== |
| 60 |
---- most-5.0.0a.orig/configure |
| 61 |
-+++ most-5.0.0a/configure |
| 62 |
-@@ -700,8 +700,6 @@ X_EXTRA_LIBS |
| 63 |
- SRCDIR |
| 64 |
- OBJDIR |
| 65 |
- ELFDIR |
| 66 |
--TERMCAP |
| 67 |
--MISC_TERMINFO_DIRS |
| 68 |
- SLANG_LIB |
| 69 |
- SLANG_INC |
| 70 |
- PROGRAM_OFILES |
| 71 |
-@@ -9064,13 +9062,11 @@ _ACEOF |
| 72 |
- cat confdefs.h >>conftest.$ac_ext |
| 73 |
- cat >>conftest.$ac_ext <<_ACEOF |
| 74 |
- /* end confdefs.h. */ |
| 75 |
--#include <sys/types.h> /* for off_t */ |
| 76 |
-- #include <stdio.h> |
| 77 |
-+#include <stdio.h> |
| 78 |
- int |
| 79 |
- main () |
| 80 |
- { |
| 81 |
--int (*fp) (FILE *, off_t, int) = fseeko; |
| 82 |
-- return fseeko (stdin, 0, 0) && fp (stdin, 0, 0); |
| 83 |
-+return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0); |
| 84 |
- ; |
| 85 |
- return 0; |
| 86 |
- } |
| 87 |
-@@ -9110,13 +9106,11 @@ cat confdefs.h >>conftest.$ac_ext |
| 88 |
- cat >>conftest.$ac_ext <<_ACEOF |
| 89 |
- /* end confdefs.h. */ |
| 90 |
- #define _LARGEFILE_SOURCE 1 |
| 91 |
--#include <sys/types.h> /* for off_t */ |
| 92 |
-- #include <stdio.h> |
| 93 |
-+#include <stdio.h> |
| 94 |
- int |
| 95 |
- main () |
| 96 |
- { |
| 97 |
--int (*fp) (FILE *, off_t, int) = fseeko; |
| 98 |
-- return fseeko (stdin, 0, 0) && fp (stdin, 0, 0); |
| 99 |
-+return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0); |
| 100 |
- ; |
| 101 |
- return 0; |
| 102 |
- } |
| 103 |
-@@ -9777,42 +9771,6 @@ OBJDIR=$SRCDIR/"$ARCH"objs |
| 104 |
- ELFDIR=$SRCDIR/elf"$ARCH"objs |
| 105 |
- |
| 106 |
- |
| 107 |
--{ echo "$as_me:$LINENO: checking for Terminfo" >&5 |
| 108 |
--echo $ECHO_N "checking for Terminfo... $ECHO_C" >&6; } |
| 109 |
--MISC_TERMINFO_DIRS="$FINKPREFIX/share/terminfo" |
| 110 |
--if test ! -d $MISC_TERMINFO_DIRS |
| 111 |
--then |
| 112 |
-- MISC_TERMINFO_DIRS="" |
| 113 |
--fi |
| 114 |
-- |
| 115 |
--JD_Terminfo_Dirs="/usr/lib/terminfo \ |
| 116 |
-- /usr/share/terminfo \ |
| 117 |
-- /usr/share/lib/terminfo \ |
| 118 |
-- /usr/local/lib/terminfo \ |
| 119 |
-- $MISC_TERMINFO_DIRS" |
| 120 |
-- |
| 121 |
--TERMCAP=-ltermcap |
| 122 |
-- |
| 123 |
--for terminfo_dir in $JD_Terminfo_Dirs |
| 124 |
--do |
| 125 |
-- if test -d $terminfo_dir |
| 126 |
-- then |
| 127 |
-- { echo "$as_me:$LINENO: result: yes" >&5 |
| 128 |
--echo "${ECHO_T}yes" >&6; } |
| 129 |
-- TERMCAP="" |
| 130 |
-- break |
| 131 |
-- fi |
| 132 |
--done |
| 133 |
--if test "$TERMCAP"; then |
| 134 |
-- { echo "$as_me:$LINENO: result: no" >&5 |
| 135 |
--echo "${ECHO_T}no" >&6; } |
| 136 |
-- cat >>confdefs.h <<\_ACEOF |
| 137 |
--#define USE_TERMCAP 1 |
| 138 |
--_ACEOF |
| 139 |
-- |
| 140 |
--fi |
| 141 |
-- |
| 142 |
-- |
| 143 |
- if test "X$jd_prefix" = "X" |
| 144 |
- then |
| 145 |
- jd_prefix=$ac_default_prefix |
| 146 |
-@@ -10858,8 +10816,6 @@ X_EXTRA_LIBS!$X_EXTRA_LIBS$ac_delim |
| 147 |
- SRCDIR!$SRCDIR$ac_delim |
| 148 |
- OBJDIR!$OBJDIR$ac_delim |
| 149 |
- ELFDIR!$ELFDIR$ac_delim |
| 150 |
--TERMCAP!$TERMCAP$ac_delim |
| 151 |
--MISC_TERMINFO_DIRS!$MISC_TERMINFO_DIRS$ac_delim |
| 152 |
- SLANG_LIB!$SLANG_LIB$ac_delim |
| 153 |
- SLANG_INC!$SLANG_INC$ac_delim |
| 154 |
- PROGRAM_OFILES!$PROGRAM_OFILES$ac_delim |
| 155 |
-@@ -10868,9 +10824,10 @@ PROGRAM_HFILES!$PROGRAM_HFILES$ac_delim |
| 156 |
- PROGRAM_OBJECTS!$PROGRAM_OBJECTS$ac_delim |
| 157 |
- PROGRAM_ELFOBJECTS!$PROGRAM_ELFOBJECTS$ac_delim |
| 158 |
- LIBOBJS!$LIBOBJS$ac_delim |
| 159 |
-+LTLIBOBJS!$LTLIBOBJS$ac_delim |
| 160 |
- _ACEOF |
| 161 |
- |
| 162 |
-- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then |
| 163 |
-+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 96; then |
| 164 |
- break |
| 165 |
- elif $ac_last_try; then |
| 166 |
- { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 |
| 167 |
-@@ -10906,50 +10863,6 @@ CEOF$ac_eof |
| 168 |
- _ACEOF |
| 169 |
- |
| 170 |
- |
| 171 |
--ac_delim='%!_!# ' |
| 172 |
--for ac_last_try in false false false false false :; do |
| 173 |
-- cat >conf$$subs.sed <<_ACEOF |
| 174 |
--LTLIBOBJS!$LTLIBOBJS$ac_delim |
| 175 |
--_ACEOF |
| 176 |
-- |
| 177 |
-- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 1; then |
| 178 |
-- break |
| 179 |
-- elif $ac_last_try; then |
| 180 |
-- { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 |
| 181 |
--echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} |
| 182 |
-- { (exit 1); exit 1; }; } |
| 183 |
-- else |
| 184 |
-- ac_delim="$ac_delim!$ac_delim _$ac_delim!! " |
| 185 |
-- fi |
| 186 |
--done |
| 187 |
-- |
| 188 |
--ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` |
| 189 |
--if test -n "$ac_eof"; then |
| 190 |
-- ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` |
| 191 |
-- ac_eof=`expr $ac_eof + 1` |
| 192 |
--fi |
| 193 |
-- |
| 194 |
--cat >>$CONFIG_STATUS <<_ACEOF |
| 195 |
--cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof |
| 196 |
--/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end |
| 197 |
--_ACEOF |
| 198 |
--sed ' |
| 199 |
--s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g |
| 200 |
--s/^/s,@/; s/!/@,|#_!!_#|/ |
| 201 |
--:n |
| 202 |
--t n |
| 203 |
--s/'"$ac_delim"'$/,g/; t |
| 204 |
--s/$/\\/; p |
| 205 |
--N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n |
| 206 |
--' >>$CONFIG_STATUS <conf$$subs.sed |
| 207 |
--rm -f conf$$subs.sed |
| 208 |
--cat >>$CONFIG_STATUS <<_ACEOF |
| 209 |
--:end |
| 210 |
--s/|#_!!_#|//g |
| 211 |
--CEOF$ac_eof |
| 212 |
--_ACEOF |
| 213 |
-- |
| 214 |
-- |
| 215 |
- # VPATH may cause trouble with some makes, so we remove $(srcdir), |
| 216 |
- # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and |
| 217 |
- # trailing colons and then remove the whole line if VPATH becomes empty |
| 218 |
-@@ -11193,7 +11106,7 @@ s&@abs_builddir@&$ac_abs_builddir&;t t |
| 219 |
- s&@abs_top_builddir@&$ac_abs_top_builddir&;t t |
| 220 |
- s&@INSTALL@&$ac_INSTALL&;t t |
| 221 |
- $ac_datarootdir_hack |
| 222 |
--" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out |
| 223 |
-+" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed 's/|#_!!_#|//g' >$tmp/out |
| 224 |
- |
| 225 |
- test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && |
| 226 |
- { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && |
| 227 |
-Index: most-5.0.0a/src/Makefile.in |
| 228 |
-=================================================================== |
| 229 |
---- most-5.0.0a.orig/src/Makefile.in |
| 230 |
-+++ most-5.0.0a/src/Makefile.in |
| 231 |
-@@ -3,7 +3,6 @@ CFLAGS = @CFLAGS@ @SLANG_DLL_CFLAGS@ |
| 232 |
- LDFLAGS = @LDFLAGS@ |
| 233 |
- SLANG_INC = @SLANG_INC@ |
| 234 |
- SLANG_LIB = @SLANG_LIB@ -lslang |
| 235 |
--MISCLIBS = @TERMCAP@ |
| 236 |
- RPATH = @RPATH@ |
| 237 |
- |
| 238 |
- #----------------------------------------------------------------------------- |
| 239 |
-@@ -44,7 +43,7 @@ EXEC = most |
| 240 |
- CONFIG_H = config.h |
| 241 |
- INCS = $(SLANG_INC) |
| 242 |
- ALL_CFLAGS = $(CFLAGS) -Dunix $(INCS) |
| 243 |
--EXECLIBS = $(RPATH) $(SLANG_LIB) $(MISCLIBS) -lm |
| 244 |
-+EXECLIBS = $(RPATH) $(SLANG_LIB) -lm |
| 245 |
- # |
| 246 |
- most_O_DEP = $(SRCDIR)/version.h |
| 247 |
- UPDATE_VERSION_SCRIPT = $(HOME)/bin/update_changes_version |
| 248 |
|
| 249 |
diff --git a/sys-apps/most/most-5.0.0a-r1.ebuild b/sys-apps/most/most-5.0.0a-r1.ebuild |
| 250 |
deleted file mode 100644 |
| 251 |
index 483a54c3287..00000000000 |
| 252 |
--- a/sys-apps/most/most-5.0.0a-r1.ebuild |
| 253 |
+++ /dev/null |
| 254 |
@@ -1,35 +0,0 @@ |
| 255 |
-# Copyright 1999-2021 Gentoo Authors |
| 256 |
-# Distributed under the terms of the GNU General Public License v2 |
| 257 |
- |
| 258 |
-EAPI=5 |
| 259 |
- |
| 260 |
-inherit epatch |
| 261 |
- |
| 262 |
-DESCRIPTION="Paging program that displays, one windowful at a time, the contents of a file" |
| 263 |
-HOMEPAGE="ftp://space.mit.edu/pub/davis/most" |
| 264 |
-SRC_URI="ftp://space.mit.edu/pub/davis/${PN}/${P}.tar.bz2" |
| 265 |
- |
| 266 |
-LICENSE="GPL-2" |
| 267 |
-SLOT="0" |
| 268 |
-KEYWORDS="~alpha amd64 arm ~mips ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" |
| 269 |
-IUSE="" |
| 270 |
- |
| 271 |
-RDEPEND=">=sys-libs/slang-2.1.3" |
| 272 |
-DEPEND="${RDEPEND}" |
| 273 |
- |
| 274 |
-src_prepare() { |
| 275 |
- epatch "${FILESDIR}"/${PN}-5.0.0a-no-explicit-termcap.patch |
| 276 |
- epatch "${FILESDIR}"/${PN}-5.0.0a-donot-hardcode-path.patch |
| 277 |
- sed -i -e 's:$(INSTALL) -s:$(INSTALL):' src/Makefile.in || die |
| 278 |
- export MAKEOPTS+=" -j1" |
| 279 |
-} |
| 280 |
- |
| 281 |
-src_configure() { |
| 282 |
- unset ARCH |
| 283 |
- econf |
| 284 |
-} |
| 285 |
- |
| 286 |
-src_install() { |
| 287 |
- emake DESTDIR="${D}" DOC_DIR="${EPREFIX}/usr/share/doc/${PF}" \ |
| 288 |
- install |
| 289 |
-} |
Archives