From 56bd759df1d0c750a065b8c845e93d5dfa6b549d Mon Sep 17 00:00:00 2001 From: "Robin H. Johnson" Date: Sat, 8 Aug 2015 13:49:04 -0700 Subject: proj/gentoo: Initial commit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson X-Thanks: Alec Warner - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring - wrote much python to improve cvs2svn X-Thanks: Rich Freeman - validation scripts X-Thanks: Patrick Lauer - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed --- sys-apps/most/Manifest | 1 + .../files/most-5.0.0a-donot-hardcode-path.patch | 33 ++++ .../files/most-5.0.0a-no-explicit-termcap.patch | 216 +++++++++++++++++++++ sys-apps/most/metadata.xml | 5 + sys-apps/most/most-5.0.0a-r1.ebuild | 36 ++++ 5 files changed, 291 insertions(+) create mode 100644 sys-apps/most/Manifest create mode 100644 sys-apps/most/files/most-5.0.0a-donot-hardcode-path.patch create mode 100644 sys-apps/most/files/most-5.0.0a-no-explicit-termcap.patch create mode 100644 sys-apps/most/metadata.xml create mode 100644 sys-apps/most/most-5.0.0a-r1.ebuild (limited to 'sys-apps/most') diff --git a/sys-apps/most/Manifest b/sys-apps/most/Manifest new file mode 100644 index 000000000000..9ae65ec729bb --- /dev/null +++ b/sys-apps/most/Manifest @@ -0,0 +1 @@ +DIST most-5.0.0a.tar.bz2 131130 SHA256 94cb5a2e71b6b9063116f4398a002a757e59cd1499f1019dde8874f408485aa9 SHA512 0c101777250a15ed9cbe0bfbaa17d0ac5ef973a7e0730d096bd931ba578dbcbd4f244305c99a50bc8fd8aa1937b621a97a6452b3821fee7d72f33a02da278e5d WHIRLPOOL 26beeeed2b46b06edb5dcfb8cf009070964e74e42e78a29068c343b5863764e4b8fa8e8457481523589f37f72171b3be4b603d071fba80ad756dd9c3cdbac374 diff --git a/sys-apps/most/files/most-5.0.0a-donot-hardcode-path.patch b/sys-apps/most/files/most-5.0.0a-donot-hardcode-path.patch new file mode 100644 index 000000000000..37e786c26b0c --- /dev/null +++ b/sys-apps/most/files/most-5.0.0a-donot-hardcode-path.patch @@ -0,0 +1,33 @@ +Author: Benda Xu +Date: 2014-12-08 +Forwarded: John E. Davis + +cp or rm does not necessarily reside in /bin. If it does, /bin is +in $PATH by convention. In either case, hardcoding /bin/cp or /bin/rm +is not a good idea. + +Index: most-5.0.0a/src/Makefile.in +=================================================================== +--- most-5.0.0a.orig/src/Makefile.in ++++ most-5.0.0a/src/Makefile.in +@@ -61,7 +61,7 @@ $(OBJDIR): + -mkdir $(OBJDIR) + # + $(CONFIG_H) : $(SRCDIR)/sysconf.h +- /bin/cp $(SRCDIR)/sysconf.h $(CONFIG_H) ++ cp $(SRCDIR)/sysconf.h $(CONFIG_H) + # + slangversion: $(OBJDIR)/chkslang + $(OBJDIR)/chkslang $(EXEC) 20000 +@@ -75,9 +75,9 @@ $(SRCDIR)/version.h: $(SRCDIR)/../change + fi + # + clean: +- /bin/rm -f $(OBJDIR)/* *~ ++ rm -f $(OBJDIR)/* *~ + distclean: clean +- /bin/rm -rf $(OBJDIR) Makefile sysconf.h ++ rm -rf $(OBJDIR) Makefile sysconf.h + installdirs: + $(MKINSDIR) $(DEST_DOCDIR) + $(MKINSDIR) $(DEST_MANDIR)/man1 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 new file mode 100644 index 000000000000..f858f56f7bc1 --- /dev/null +++ b/sys-apps/most/files/most-5.0.0a-no-explicit-termcap.patch @@ -0,0 +1,216 @@ +Author: Benda Xu +Date: 2014-12-08 +Forwarded: John E. Davis + +"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 /* for off_t */ +- #include ++#include + 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 /* for off_t */ +- #include ++#include + 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 >$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/metadata.xml b/sys-apps/most/metadata.xml new file mode 100644 index 000000000000..f23b9cae1593 --- /dev/null +++ b/sys-apps/most/metadata.xml @@ -0,0 +1,5 @@ + + + + shell-tools + diff --git a/sys-apps/most/most-5.0.0a-r1.ebuild b/sys-apps/most/most-5.0.0a-r1.ebuild new file mode 100644 index 000000000000..d6cfd9955f5c --- /dev/null +++ b/sys-apps/most/most-5.0.0a-r1.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +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 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 +} -- cgit v1.2.3-18-g5258