Fix build system regarding terminfo and cp/rm locations. Bug #531958

Package-Manager: portage-2.2.14/cvs/Linux x86_64

5 files changed, 264 insertions, 14 deletions

diff --git a/sys-apps/most/ChangeLog b/sys-apps/most/ChangeLog
index a3e7ac313fb7..01fd9e605e58 100644
--- a/sys-apps/most/ChangeLog
+++ b/sys-apps/most/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/most
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/most/ChangeLog,v 1.47 2014/01/14 18:47:42 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/most/ChangeLog,v 1.48 2014/12/08 11:09:18 heroxbd Exp $
+
+  08 Dec 2014; Benda Xu <heroxbd@gentoo.org>
+  +files/most-5.0.0a-donot-hardcode-path.patch,
+  +files/most-5.0.0a-no-explicit-termcap.patch, most-5.0.0a.ebuild:
+  Fix build system regarding terminfo and cp/rm locations. Bug #531958
 
   14 Jan 2014; Fabian Groffen <grobian@gentoo.org> most-5.0.0a.ebuild:
   Marked ~x64-macos
diff --git a/sys-apps/most/Manifest b/sys-apps/most/Manifest
index 5a8301df12c3..32b5ed43ddbb 100644
--- a/sys-apps/most/Manifest
+++ b/sys-apps/most/Manifest
@@ -1,14 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
+AUX most-5.0.0a-donot-hardcode-path.patch 969 SHA256 6d08644fe57f3a02bffe6ae935392f9d2323b4c0767a1cd49969dac53506f986 SHA512 6da3424b5e9763bd8f89998ffe019230cc8e9c7fc9722235cc13830d50647f590f6a934ae025a063fe8fc1e8bdd2b4fc067fbc1569c7a0ebfa220b868b999271 WHIRLPOOL 9b21c2b20910127db97c965ae362ffd5d8d4d34c2c80559b01f7fc59b7c65b9b053d55d2db4764150ff1624be33249f5cbf501f92e777e95630db24f7d18029d
+AUX most-5.0.0a-no-explicit-termcap.patch 6172 SHA256 06b1c19bbe5102a7960e38cba6179925e3859a0457fdb987dd7fe2a5ed3555c9 SHA512 48a87d66bda3b1464a214614c5ea23a5ba5a820da0da497de4db9ca4205288d7f63f460b08713047a4a14e8911bbb0b6a92ff2521cbec1acdf4e37e86a2c1346 WHIRLPOOL 4a5477b45a91106c97466f8551d30e1d8be2ae999e1b45cbd7e9b0e6e3ed75ff28024309d3d442bb1db663586c96564fef182d55559a629099f8fc5440cc5d36
 DIST most-5.0.0a.tar.bz2 131130 SHA256 94cb5a2e71b6b9063116f4398a002a757e59cd1499f1019dde8874f408485aa9 SHA512 0c101777250a15ed9cbe0bfbaa17d0ac5ef973a7e0730d096bd931ba578dbcbd4f244305c99a50bc8fd8aa1937b621a97a6452b3821fee7d72f33a02da278e5d WHIRLPOOL 26beeeed2b46b06edb5dcfb8cf009070964e74e42e78a29068c343b5863764e4b8fa8e8457481523589f37f72171b3be4b603d071fba80ad756dd9c3cdbac374
-EBUILD most-5.0.0a.ebuild 841 SHA256 d88b9914efc93e42547a4f9f9c340f144de7cce901f9bc25568323b802709ebb SHA512 291af29159049b966dd1600bbc4296721dab1f01ac2133be40e289773528fbdcf2b72975aa32e9cb95bd798e0c8343f5b49606f9e89fce7a08a83537e65ab3c0 WHIRLPOOL dd5c6e4e9cca7c6fd6f5094c3e2315f0c85f056d717ae9331bb1390f9bd5155ec585d99afd3edc3ac1ddd3abc0c6bb6cbaf8a20c78ccbbc87476cbd2fb99a4a5
-MISC ChangeLog 6141 SHA256 ee7a6e5b2b3a9928449082a9f0b51df7cf6bc2b14fc238b72bb88b5ea15f923b SHA512 8998e43d9292e5f167d4d1dbbee30cc600660b1ea6d4f4c74fa21bce1078bf5adc4e0667125c467a8160de986577642e4ecb0a3f151644050c79ec81b071d457 WHIRLPOOL 4f5bdd6502e6372ce3e794e1a7b25d92fe6934a1730826a55faac4f01a97d18e0cf85c5b04f48f59e09faeba2ea301955b411f01f046c3b1080a791b4ff32ec9
+EBUILD most-5.0.0a.ebuild 979 SHA256 7764f8b23807e20e988d6ecb5886b9d41e11a00753754975e92dc852c1e2afcc SHA512 3989442506c7770d3f913f440d07dff7b8c9730d715b9bc034d5e400f0925613b849a0c329921c54dc125f1a659f9a81b43bec66a5c4f669d310ce19beae7852 WHIRLPOOL 95054f824f4e9ef051530a8020425cef414763272852f3b008e944f8a446911a09b31280bd4981bd41f4f12425d389a00ab4a18ee786a37ea77b05f9ea71b6a7
+MISC ChangeLog 6374 SHA256 36e933f5fb206c653aa2f859ec1769f1a5a2597d3feec92739134cf7e2172c40 SHA512 6a3508ded6711489790e5bf7cd83ee6c64c557bc6eaaafcbb4a0b47685f3973962bf5da19553a30a7f73ed74f9c899a4ef82f68e2347d1605ba8e2f037e2251f WHIRLPOOL ddcf2727dc7cb5567ef27051601fa26fd8ce7ea6975d0e85efe8ac173ed400bf6f9c750454b8927e9953b3d8ae2a361e26a0ffbe1ce11199cb27c08ed7f957c8
 MISC metadata.xml 164 SHA256 03080f40dc43565fd4bb7569351e0f607a4946a6108c15765ac42901ab16caf3 SHA512 62f5a94d0d14c10b174523390efd33328206f015380bf7cd2a0c1192a4f8c6733e5f5c6438ade4e3fd3d5f3823bd09edff0b9f2913b8d38e35f4318427931501 WHIRLPOOL 0420fcb91591746a9b4b002b61159be9d05fd082f9caad11643403e1895c6ca9bcd89381134a427c7d95c7d011ddaed4d8e05e42ab714f20a69553b4887e765b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (Darwin)
-
-iEYEAREIAAYFAlLVhk8ACgkQX3X2B8XHTol3iwCcCVSZ9b3Gw4Yvh2YPPaKNMoMi
-XJgAn20GcH4nWaVkpkYQD1kebuOuQX/f
-=dbVy
------END PGP SIGNATURE-----
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 <heroxbd@gentoo.org>
+Date: 2014-12-08
+Forwarded: John E. Davis <jed@jedsoft.org>
+
+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 <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.ebuild b/sys-apps/most/most-5.0.0a.ebuild
index 196994aef75f..ad990aeb8866 100644
--- a/sys-apps/most/most-5.0.0a.ebuild
+++ b/sys-apps/most/most-5.0.0a.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2014 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.13 2014/01/14 18:47:42 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/most/most-5.0.0a.ebuild,v 1.14 2014/12/08 11:09:18 heroxbd Exp $
 
 EAPI=4
 
+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"
@@ -17,6 +19,8 @@ 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
 }