* [gentoo-commits] repo/gentoo:master commit in: sys-apps/most/files/, sys-apps/most/
@ 2021-04-22 12:27 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2021-04-22 12:27 UTC (permalink / raw
To: gentoo-commits
commit: e43cfbd33594ef27c2d0582f0067120cbd9e2427
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 22 12:24:47 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Apr 22 12:27:29 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e43cfbd3
sys-apps/most: drop 5.0.0a-r1 (EAPI 5)
Closes: https://bugs.gentoo.org/783741
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/most/Manifest | 1 -
.../files/most-5.0.0a-no-explicit-termcap.patch | 216 ---------------------
sys-apps/most/most-5.0.0a-r1.ebuild | 35 ----
3 files changed, 252 deletions(-)
diff --git a/sys-apps/most/Manifest b/sys-apps/most/Manifest
index 7d3eff66a3e..d1ffb632d48 100644
--- a/sys-apps/most/Manifest
+++ b/sys-apps/most/Manifest
@@ -1,2 +1 @@
-DIST most-5.0.0a.tar.bz2 131130 BLAKE2B f516b7cd1b37ca274dc8472a258390cde437f44ac320a257ab94cb97e918d574f61e961457809941a3eefa761a62e8f45bd60392e5b95dc60cedc6c1d9f56baf SHA512 0c101777250a15ed9cbe0bfbaa17d0ac5ef973a7e0730d096bd931ba578dbcbd4f244305c99a50bc8fd8aa1937b621a97a6452b3821fee7d72f33a02da278e5d
DIST most-5.1.0.tar.gz 162172 BLAKE2B a3c0f3d85e7c4f4a014c174efb0d3d22b0fc2758e403ddccc74308399eeec616800e16db33554f0ca53fba674efba9dd93d51ed0c3f887b2c24fd3dd2335387c SHA512 cbc090283bbaafb8ffee9d6d1abc7b49cd58d54b742cf8dc86274351dee6398d1f24841bd1631ac40f861ad9e23569646133d3297317d9d514a7a38dd74533d2
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 f858f56f7bc..00000000000
--- 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 483a54c3287..00000000000
--- 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 epatch
-
-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
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/most/files/, sys-apps/most/
@ 2021-11-19 9:06 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2021-11-19 9:06 UTC (permalink / raw
To: gentoo-commits
commit: e0aba0f8c5d55bb8c9dc71787905cc1fe36e1ef4
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 19 09:00:46 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Nov 19 09:06:03 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0aba0f8
sys-apps/most: backport parallel build patch
Closes: https://bugs.gentoo.org/795117
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../most/files/most-5.1.0-fix-parallel-build.patch | 21 +++++++++++++++++++++
sys-apps/most/most-5.1.0.ebuild | 1 +
2 files changed, 22 insertions(+)
diff --git a/sys-apps/most/files/most-5.1.0-fix-parallel-build.patch b/sys-apps/most/files/most-5.1.0-fix-parallel-build.patch
new file mode 100644
index 000000000000..0b5e5b2da3f6
--- /dev/null
+++ b/sys-apps/most/files/most-5.1.0-fix-parallel-build.patch
@@ -0,0 +1,21 @@
+https://bugs.gentoo.org/795117
+
+Grabbed from NixOS (slyfox submitted this upstream):
+
+Upstream commit c9cfad50a ("src/Makefile.in: Avoid a race condition
+when performing a parallel build")
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -54,6 +54,12 @@ COMPILE_CMD = $(CC) -c $(ALL_CFLAGS) -DMOST_SYSTEM_INITFILE='"$(SYS_INITFILE)"'
+ all: $(EXEC)
+ $(EXEC): $(OBJDIR) $(CONFIG_H) slangversion $(OBJDIR)/$(EXEC)
+ @echo $(EXEC) created in $(OBJDIR)
++
++# C source files include autogenrated "config.h". Make sure
++# it's available before the compilation. Pessimistically assume
++# any source file can depend on "config.h".
++$(OBJS) $(OBJDIR)/chkslang.o: $(CONFIG_H)
++
+ $(OBJDIR)/$(EXEC): $(OBJS)
+ cd $(OBJDIR); $(CC) $(OFILES) -o $(EXEC) $(LDFLAGS) $(EXECLIBS)
+ #
diff --git a/sys-apps/most/most-5.1.0.ebuild b/sys-apps/most/most-5.1.0.ebuild
index 18b707ef38fb..b09ff495ab76 100644
--- a/sys-apps/most/most-5.1.0.ebuild
+++ b/sys-apps/most/most-5.1.0.ebuild
@@ -18,6 +18,7 @@ DEPEND="${RDEPEND}"
PATCHES=(
"${FILESDIR}"/${PN}-5.0.0a-donot-hardcode-path.patch
+ "${FILESDIR}"/${P}-fix-parallel-build.patch
)
src_prepare() {
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/most/files/, sys-apps/most/
@ 2025-03-14 6:39 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2025-03-14 6:39 UTC (permalink / raw
To: gentoo-commits
commit: d69023cbdfda77d227f9659d329599da91f6d5ee
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 14 06:38:03 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Mar 14 06:38:03 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d69023cb
sys-apps/most: drop 5.1.0
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/most/Manifest | 1 -
.../most/files/most-5.1.0-fix-parallel-build.patch | 21 ------------
sys-apps/most/most-5.1.0.ebuild | 38 ----------------------
3 files changed, 60 deletions(-)
diff --git a/sys-apps/most/Manifest b/sys-apps/most/Manifest
index 3ac82c0380ba..a11602700ee6 100644
--- a/sys-apps/most/Manifest
+++ b/sys-apps/most/Manifest
@@ -1,2 +1 @@
-DIST most-5.1.0.tar.gz 162172 BLAKE2B a3c0f3d85e7c4f4a014c174efb0d3d22b0fc2758e403ddccc74308399eeec616800e16db33554f0ca53fba674efba9dd93d51ed0c3f887b2c24fd3dd2335387c SHA512 cbc090283bbaafb8ffee9d6d1abc7b49cd58d54b742cf8dc86274351dee6398d1f24841bd1631ac40f861ad9e23569646133d3297317d9d514a7a38dd74533d2
DIST most-5.2.0.tar.gz 256075 BLAKE2B ae73680cedb0306dd6980c637fd8c0d016537663ab707e925931972822f718dd31fc80d83598af9832c7869b5abf4ec3333bc076ce56c4a6d42f71d30be1a50d SHA512 3aa3cb46ddd456532a009fb9cfcd746971396be33e03e52a15b754a6d7683f4efd020edb0ec4eb36d22ba20f050aaac4ba6cdd3b69bb5701ea58ddb9a903c59d
diff --git a/sys-apps/most/files/most-5.1.0-fix-parallel-build.patch b/sys-apps/most/files/most-5.1.0-fix-parallel-build.patch
deleted file mode 100644
index 0b5e5b2da3f6..000000000000
--- a/sys-apps/most/files/most-5.1.0-fix-parallel-build.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-https://bugs.gentoo.org/795117
-
-Grabbed from NixOS (slyfox submitted this upstream):
-
-Upstream commit c9cfad50a ("src/Makefile.in: Avoid a race condition
-when performing a parallel build")
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -54,6 +54,12 @@ COMPILE_CMD = $(CC) -c $(ALL_CFLAGS) -DMOST_SYSTEM_INITFILE='"$(SYS_INITFILE)"'
- all: $(EXEC)
- $(EXEC): $(OBJDIR) $(CONFIG_H) slangversion $(OBJDIR)/$(EXEC)
- @echo $(EXEC) created in $(OBJDIR)
-+
-+# C source files include autogenrated "config.h". Make sure
-+# it's available before the compilation. Pessimistically assume
-+# any source file can depend on "config.h".
-+$(OBJS) $(OBJDIR)/chkslang.o: $(CONFIG_H)
-+
- $(OBJDIR)/$(EXEC): $(OBJS)
- cd $(OBJDIR); $(CC) $(OFILES) -o $(EXEC) $(LDFLAGS) $(EXECLIBS)
- #
diff --git a/sys-apps/most/most-5.1.0.ebuild b/sys-apps/most/most-5.1.0.ebuild
deleted file mode 100644
index 991e0d5124af..000000000000
--- a/sys-apps/most/most-5.1.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Paging program that displays, one windowful at a time, the contents of a file"
-HOMEPAGE="https://www.jedsoft.org/most/"
-SRC_URI="https://www.jedsoft.org/releases/${PN}/${P}.tar.gz
- https://www.jedsoft.org/releases/${PN}/old/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~mips ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE=""
-
-RDEPEND=">=sys-libs/slang-2.1.3"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-5.0.0a-donot-hardcode-path.patch
- "${FILESDIR}"/${P}-fix-parallel-build.patch
-)
-
-src_prepare() {
- default
- # Do not strip by default
- sed -e '/\$(INSTALL)/s@ -s@@' -i src/Makefile.in || die
-}
-
-src_configure() {
- unset ARCH
- econf
-}
-
-src_install() {
- emake DESTDIR="${D}" DOC_DIR="${EPREFIX}/usr/share/doc/${PF}" \
- install
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-03-14 6:40 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-03-14 6:39 [gentoo-commits] repo/gentoo:master commit in: sys-apps/most/files/, sys-apps/most/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2021-11-19 9:06 Sam James
2021-04-22 12:27 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox