baselayout-prefix-2.2-r3: Fix termcap check and conditional.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xA630CCB8

5 files changed, 98 insertions, 132 deletions

diff --git a/sys-apps/baselayout-prefix/ChangeLog b/sys-apps/baselayout-prefix/ChangeLog
index e4a390a079da..e8cf811146b7 100644
--- a/sys-apps/baselayout-prefix/ChangeLog
+++ b/sys-apps/baselayout-prefix/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/baselayout-prefix
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout-prefix/ChangeLog,v 1.33 2013/10/27 16:47:02 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout-prefix/ChangeLog,v 1.34 2013/10/29 21:00:57 haubi Exp $
+
+  29 Oct 2013; Michael Haubenwallner <haubi@gentoo.org>
+  -files/einfo-1.0.3-checkfuncs-aix.patch,
+  +files/einfo-1.0.4-termcap-check.patch, baselayout-prefix-2.2-r3.ebuild:
+  Fix termcap check and conditional.
 
   27 Oct 2013; Fabian Groffen <grobian@gentoo.org>
   -baselayout-prefix-2.2-r2.ebuild, baselayout-prefix-2.2-r3.ebuild:
diff --git a/sys-apps/baselayout-prefix/Manifest b/sys-apps/baselayout-prefix/Manifest
index d2528154c0a6..1ce25b2ab3a2 100644
--- a/sys-apps/baselayout-prefix/Manifest
+++ b/sys-apps/baselayout-prefix/Manifest
@@ -18,7 +18,7 @@ AUX baselayout-1.12.5-prefix.patch 14807 SHA256 a79a3d2f35e03e75c858ef81ccada82b
 AUX baselayout-1.12.5-solaris.patch 1860 SHA256 2d2f304af9e975507793dbe6ff1a360317bef1758ac0b601dffbfad69ec2d93b SHA512 d3358956ac16e9ec093050211a6489e47b14cf873b3cae583d432a0c87c6162de94ca4053b0283ba488ced4cb8b3b59eccdcd308085d1fafc819b98cd59a78d1 WHIRLPOOL 6ef0e8a6152130257f36065a0ca1e1534e6925a0cf145d75626b65e7662b3e00cfaf55553d03926f16d1d022efb46346725f2eaa0bdaad8a0d3f314c0c6fd971
 AUX baselayout-1.12.5-strsep.patch 778 SHA256 81b1dbaeef76e8c394f2c2c61407dd5ede20dc0ab682be206163eda30b743fe9 SHA512 552c0b6e877ec89a1eea6129c0cff0677f26f738a4eea871207a69caa6df551d32b70f60ca212226a816d2f9c92049f1a04ff0e5060422e316239852b7cb5eac WHIRLPOOL 4fa15717f580f8d6ebf94ef7aa4923c1d8e2fa557b2ab13120dcc1361e84e37d97c06a0b3d8667f18beb4975fd61d9c8eba8510fa98f28cf04e96300d0538280
 AUX baselayout-1.12.5-termios_h.patch 893 SHA256 60b4251ebce7488b415686178a0eae207adf18240f80523dbc0b4bc70a53ae99 SHA512 af31086474d2604e9e3c6f026360c2027e5b5c4f1cd101180f532020d48ad81daf52b1450b5cbef93758574d8bdec5894062af27501dcab67e66346b2be8c08d WHIRLPOOL 17b8056c7360fa223f1d8cbbbacc1741194a4fe7a4aff1d6c4a2454091d54f5fbdf1a89e3fe22fba864849a06b51c58ef3b08d27b6dc7285ecb0cb231eda0331
-AUX einfo-1.0.3-checkfuncs-aix.patch 3899 SHA256 5ca406e484c9cd9c0310d74d06821cc676b1052599c9dee52009028a3ca587d3 SHA512 03d3cde09f1aee5387d55bb9d237ef33d5c6eee6e7c18328d1ac3d22074767aabef91dc56d725bc40c12d341d076e05305cf71b0ed97e40a330950043913670b WHIRLPOOL b178e3350afea09377b9d7bd592525049bddb0c75c89b926dd249a27d3e53ec9aab073ca8b1008acff8fd2b84c2826e5b053f37042976c76a66cbf9fead23ece
+AUX einfo-1.0.4-termcap-check.patch 2197 SHA256 5282414571cecc412ca0324e336394bd953966cdb8688ebccb0164bbbe640469 SHA512 1d66fb1c2811e2b9719a5ec277aa4a3581c6d2e4918c4825ff00c0e39e750fb1b1d8daf5849a7f1c9bd05e94e8780e61d4b39bfc88cc457a46f3fd8b62e8e92e WHIRLPOOL b402b3679b2aa2868f7c32c0287651190b1e7b5f817dd01580bfabc870ec5f130d932c6639d2c2253f4cfde8bd90d3323244ff258ee343e55ebe75baa5654642
 DIST baselayout-2.2.tar.bz2 40744 SHA256 11d4a223b06da545c3e59e07c9195570f334b5b1be05d995df0ebc8ea2203e98 SHA512 a5199c42e835d9f2683cc94f3c4c47ecdc392316c24e0932845736e2e90479b0c5c8ad72ead8e0537f097405b7d7548d00b87b7ff8c9e3651486e3c5c0970b36 WHIRLPOOL 60cc4f7f76c5a45c15303e526decffb3bad2b50ac659b1dd072d2ed4b0eb0b31929a1a733ddb03a31ee5882b889a4efb87206f63ffaa2b11e26d36afd0933a95
 DIST baselayout-prefix-1.12.14.1709.tar.bz2 461562 SHA256 ca1eec028b7ec72f1e3196f71eafd564062d9b677569698fe41ac5f817c9379e SHA512 600cf1a90771deb0f1d2be73dc2b6fbd0708c8b19e4b300a95cb5e5431be05904864cbcf8cd87dd3aefa5827fc8c3324d5249496a37a84ea2f676a25447f5b9e WHIRLPOOL 872f02fa0e4920c1c6fadbfeeee19d52ab1a2ccce32b0eb52e245dc71767cf31110c063946163bc171d6085a50867f74936c397fd6fdf8e9e30b146b06dc8926
 DIST baselayout-prefix-1.12.5.1701.tar.bz2 412843 SHA256 452ee800e37c65d9c44e77130f0ea9f082e05df2f9a673523fe2e03170fa3099 SHA512 87d73943a9210c2ab613a60bed1197fa92fe536bde870f97e28aaa6cbc432d2c94b507f9a78011c2b7e92a09612267c3d23a540bdb5677a836d6dc845af0858b WHIRLPOOL 4a678f1b150a48c85507a09dce57572b98eb7f2c4e22bb57294cc653e7ac896281ed255f39ecc6c45e3a1ddd385ffded1eaec9b3b0412b62320f0e997e8a84ec
@@ -26,13 +26,13 @@ DIST einfo-1.0.4.tar.xz 218624 SHA256 b731b6d16b522317cb4c288af04d70eca818b87103
 EBUILD baselayout-prefix-1.12.14-r1.ebuild 4405 SHA256 af7f8c7807c7a8f77e3367a8f964df2d33bd413b842ba2437eb4f9b10b679b74 SHA512 07d3aee8a4118ec8bba6d1abfc9396729c056a4cf24d40134f5656b912aa181f60e93e315b04a78d1e50b8269192ea095781b822a7990683c8fe2b108f76ce83 WHIRLPOOL fe5620c4caa0cff3c25d85fa37257009b22c95c0723924730e78e39243fcba02f3d1df8b81234aa517c2b6b6fc04617d3788bb0d3c59dc17967eb4e17c136d3d
 EBUILD baselayout-prefix-1.12.14.ebuild 5389 SHA256 083974adb065d0205f588ebcab5013bf379cecce17b31a86a198edd7d8177658 SHA512 aea398e212550284dca9a06a4d78e0c72b77910c29fcb3582129635624c3dae2bad87f4ab8a5cd8c93ffa16d39e11fe0d7841b0570777f5569ae5442a4b514b3 WHIRLPOOL 679c3d017891a85cd0ad8fa1c5540355cbb2b0fe3f86ea47dca86f225c4073ca510c44c4b1117c2926d09102b97eaef86d7cd714aec2c8941888e3a5a4411014
 EBUILD baselayout-prefix-1.12.5-r11.ebuild 5261 SHA256 0c646a03af85f78ed81fee96050621e1f5b09e3e2155c69bb883fcf6b9d8346d SHA512 ebbfc991734ffbf98ce46c985acda7f8fe0b52218ef35f8e03bbbcfc5f5cb9089badf40c8ecee93dda115956b18965a26729382185a813e138c79d269deae174 WHIRLPOOL 77b94032b729005983296f12bb1e7013db898c9f7e46d6fb89da1aa49b5faa64dbd5adfc71c882650983cc28889d62e34aa992b94612f721a48aebbcf0f06d83
-EBUILD baselayout-prefix-2.2-r3.ebuild 3241 SHA256 27e89cb19a5fea9524d94615a1de4e4f2e75914f5feb9902aed7a6549fe82853 SHA512 c0a509db2e115319e743c46b38009d336978c019cd2018f546109d626f0f8df350642ec9c539ff0e2d941f0673c122c226107e562f5e858886a240e36320512c WHIRLPOOL 9609c4ba7912ce68c1b5f59a88c11e406f49f54bcdfc7e77038b0797e0fea119138f2d0075b2179e608ec49cb7e2ae89f00da85c8758832896a2d1e556884b37
-MISC ChangeLog 10973 SHA256 578718c722a83582fd5c3f7a9bb3031ab665c267ec32a5dc4a884984ac988dcc SHA512 817b8426e34b1d80c9359eb2e874087d6dc3e2a9779b94a75b8f627322f30ceed5ac373eabe038eea132381059a15ea8493f65b12be2134b5d744dc37f7b8c40 WHIRLPOOL f3ad94de5ed0fa45b2d0555f171a89ad01defbef1b7bea88a4a6482a52825d459e8d96e6b633c357a60c5477d32f061e131e7629f2ddf50c28c02d34334591e4
+EBUILD baselayout-prefix-2.2-r3.ebuild 3290 SHA256 0daef8d31a7ee8b3e9403b464841b00ce8f12b807b9d54d51778426ca562ae76 SHA512 ba67b80d966458efd41a7a31b1c72f2fce2d0cf4253e063678d7dd312d39b5cf81a340a230f2b2c320f7b09918160193342974eec98bf0f3ed002e62c7ecb061 WHIRLPOOL 2aa25777662c06f46a88bde55c4f209a5a85b5ce808425ef345639a21e5b137d43fdef884fa1a6f5137a3c5b2c4da88fadb84955020105fa1cb8e66617c040c6
+MISC ChangeLog 11183 SHA256 54c8c07e98a720ebea0d942b8282331b1ab119fb34bd0b543009959579bdbaf8 SHA512 e04198118499d55e9cfd8709c4f7cb2521e6095f4bbf8d67d0fa09e1e6581a91cd5e09cd1f70eb4bde45f32bda819a60c815d99c6c89950663c0ae7a02aa3aee WHIRLPOOL 3fef5253c9689eb33723538c499010162c27f03104388e77bca0cb69af6ef5a6dbd98c8a90e06c99dd1f7c9ac2bfa56b3990085eec242598dfd443ff6988f7bd
 MISC metadata.xml 296 SHA256 99687144efc36586c7f5aa897107c38c9efff985ac77e6e555d9f5f9ff0490ff SHA512 f81ae448ab1a0c422d6ca54a6611c63742387e13174b8b37ff8a114ad715c75d57fc6d490c9f73a8513f5a810436048d4188ad1def72f686a04c0b277a9d9c61 WHIRLPOOL 4e79826481a9e21662b853a587b3020a8ef9f1fe3a30f25ba83c1983f52b919288eb3f705232e4eeead76f6f1f631b0bc281093a01ba3f97465c098c6c7e97cb
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (Darwin)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlJtQ4gACgkQX3X2B8XHTokUrwCghZpGKeCl8sZbrptrl9yAuALd
-KgsAn226dErtuzv0iy63quEeN5SBcNqr
-=NS3t
+iEYEAREIAAYFAlJwIg8ACgkQLc0TWKYwzLhoGgCeJ7xGu3JdB6laIlhnv65VGFUX
+MzEAmwVAzHxL4tPuLmkus2CO5Wa6/ItT
+=2Pw1
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/baselayout-prefix/baselayout-prefix-2.2-r3.ebuild b/sys-apps/baselayout-prefix/baselayout-prefix-2.2-r3.ebuild
index 33c7585d1e2e..560a54192950 100644
--- a/sys-apps/baselayout-prefix/baselayout-prefix-2.2-r3.ebuild
+++ b/sys-apps/baselayout-prefix/baselayout-prefix-2.2-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout-prefix/baselayout-prefix-2.2-r3.ebuild,v 1.3 2013/10/27 16:47:02 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout-prefix/baselayout-prefix-2.2-r3.ebuild,v 1.4 2013/10/29 21:00:57 haubi Exp $
 
 EAPI=3
 
@@ -29,6 +29,7 @@ pkg_preinst() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}"/${EINFO}-termcap-check.patch
 	# exotic platforms still aren't fixed in upstream libtool
 	elibtoolize
 }
diff --git a/sys-apps/baselayout-prefix/files/einfo-1.0.3-checkfuncs-aix.patch b/sys-apps/baselayout-prefix/files/einfo-1.0.3-checkfuncs-aix.patch
deleted file mode 100644
index 0468d4c741ab..000000000000
--- a/sys-apps/baselayout-prefix/files/einfo-1.0.3-checkfuncs-aix.patch
+++ /dev/null
@@ -1,123 +0,0 @@
-Generic port to AIX, may apply for other platforms too.
-
-http://prefix.gentooexperimental.org:8000/einfo/rev/c75747287497
-http://prefix.gentooexperimental.org:8000/einfo/rev/d5770e2343a1
-
-Better patch autoconf-output here rather than autoconf-input.
-#diff -ru einfo-1.0.3.orig/configure.ac einfo-1.0.3/configure.ac
-#--- einfo-1.0.3.orig/configure.ac	2013-05-06 17:06:34.000000000 +0000
-#+++ einfo-1.0.3/configure.ac	2013-10-22 11:12:51.000000000 +0000
-#@@ -27,7 +27,7 @@
-# AC_SUBST([TERMCAP_LIBS], [$HAVE_TERMCAP])
-# 
-# # Checks for library functions.
-#-AC_CHECK_FUNCS([gettimeofday strcasecmp strrchr strdup])
-#+AC_CHECK_FUNCS([gettimeofday strcasecmp strrchr strdup strlcpy strlcat vsyslog])
-# AC_SEARCH_LIBS([nanosleep], [rt])
-# 
-# # defines for functions.sh
-diff -ru einfo-1.0.3.orig/configure einfo-1.0.3/configure
---- einfo-1.0.3.orig/configure	2013-05-06 17:08:23.000000000 +0000
-+++ einfo-1.0.3/configure	2013-10-22 11:13:11.000000000 +0000
-@@ -11453,7 +11453,7 @@
- 
- 
- # Checks for library functions.
--for ac_func in gettimeofday strcasecmp strrchr strdup
-+for ac_func in gettimeofday strcasecmp strrchr strdup strlcpy strlcat vsyslog
- do :
-   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
- ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-diff -ru einfo-1.0.3.orig/config.h.in einfo-1.0.3/config.h.in
---- einfo-1.0.3.orig/config.h.in	2013-05-06 17:10:47.000000000 +0000
-+++ einfo-1.0.3/config.h.in	2013-10-22 11:14:24.000000000 +0000
-@@ -30,6 +30,12 @@
- /* Define to 1 if you have the <string.h> header file. */
- #undef HAVE_STRING_H
- 
-+/* Define to 1 if you have the `strlcat' function. */
-+#undef HAVE_STRLCAT
-+
-+/* Define to 1 if you have the `strlcpy' function. */
-+#undef HAVE_STRLCPY
-+
- /* Define to 1 if you have the `strrchr' function. */
- #undef HAVE_STRRCHR
- 
-@@ -45,6 +51,9 @@
- /* Define to 1 if you have the <unistd.h> header file. */
- #undef HAVE_UNISTD_H
- 
-+/* Define to 1 if you have the `vsyslog' function. */
-+#undef HAVE_VSYSLOG
-+
- /* Define to the sub-directory in which libtool stores uninstalled libraries.
-    */
- #undef LT_OBJDIR
-diff -ru einfo-1.0.3.orig/src/includes/helpers.h einfo-1.0.3/src/includes/helpers.h
---- einfo-1.0.3.orig/src/includes/helpers.h	2013-01-06 15:26:41.000000000 +0000
-+++ einfo-1.0.3/src/includes/helpers.h	2013-10-22 11:15:52.000000000 +0000
-@@ -67,10 +67,8 @@
- 	     (var) = (tvar))
- #endif
- 
--#ifdef __GLIBC__
--#  if ! defined (__UCLIBC__) && ! defined (__dietlibc__)
--#    define strlcpy(dst, src, size) snprintf(dst, size, "%s", src)
--#  endif
-+#if !HAVE_STRLCPY
-+#  define strlcpy(dst, src, size) snprintf(dst, size, "%s", src)
- #endif
- 
- #ifndef timespecsub
-diff -ru einfo-1.0.3.orig/src/libeinfo/libeinfo.c einfo-1.0.3/src/libeinfo/libeinfo.c
---- einfo-1.0.3.orig/src/libeinfo/libeinfo.c	2013-05-05 11:08:36.000000000 +0000
-+++ einfo-1.0.3/src/libeinfo/libeinfo.c	2013-10-22 11:16:28.000000000 +0000
-@@ -195,8 +195,7 @@
- #endif
- 
- /* strlcat and strlcpy are nice, shame glibc does not define them */
--#ifdef __GLIBC__
--#  if ! defined (__UCLIBC__) && ! defined (__dietlibc__)
-+#if !HAVE_STRLCAT
- static size_t
- strlcat(char *dst, const char *src, size_t size)
- {
-@@ -224,7 +223,6 @@
- 
- 	return dst_n + (s - src);
- }
--#  endif
- #endif
- 
- static bool
-@@ -530,7 +528,29 @@
- 		closelog();
- 		openlog(e, LOG_PID, LOG_DAEMON);
- 		va_copy(apc, ap);
-+#if HAVE_VSYSLOG
- 		vsyslog(level, fmt, apc);
-+#else /* !HAVE_VSYSLOG */
-+		{
-+			int len = 900;
-+			int buflen;
-+			char *buf = NULL;
-+			do {
-+				buflen = len;
-+				if (buf) free(buf);
-+				buf = (char*)malloc(sizeof(char) * (buflen+1));
-+				if (buf) {
-+					len = vsnprintf(buf, buflen, fmt, apc);
-+				} else {
-+					syslog(level, "cannot allocate %d bytes: %m", buflen+1);
-+				}
-+			} while(buf && len < (1024*1024*1024) && len > buflen);
-+			if (buf) {
-+				syslog(level, buf); /* resolve "%m" */
-+				free(buf);
-+			}
-+		}
-+#endif
- 		va_end(apc);
- 		closelog();
- 	}
diff --git a/sys-apps/baselayout-prefix/files/einfo-1.0.4-termcap-check.patch b/sys-apps/baselayout-prefix/files/einfo-1.0.4-termcap-check.patch
new file mode 100644
index 000000000000..61d779e47e20
--- /dev/null
+++ b/sys-apps/baselayout-prefix/files/einfo-1.0.4-termcap-check.patch
@@ -0,0 +1,83 @@
+#diff -ru einfo-1.0.4/configure.ac einfo/configure.ac
+#--- einfo-1.0.4/configure.ac	2013-10-27 17:39:07.000000000 +0100
+#+++ einfo/configure.ac	2013-10-29 18:01:51.975745907 +0100
+#@@ -22,7 +22,7 @@
+# 	  )
+# 	)
+# fi
+#-AC_DEFINE([HAVE_TERMCAP], test "x$HAVE_TERMCAP" != "x",
+#+AC_DEFINE_UNQUOTED([HAVE_TERMCAP], `test "x$HAVE_TERMCAP" = "x"; echo $?`,
+# 		  [Define if termcap.h and library exist])
+# AC_SUBST([TERMCAP_LIBS], [$HAVE_TERMCAP])
+# 
+diff -ru einfo-1.0.4/configure einfo/configure
+--- einfo-1.0.4/configure	2013-10-27 17:42:20.000000000 +0100
++++ einfo/configure	2013-10-29 18:02:08.405707018 +0100
+@@ -11447,7 +11432,9 @@
+ 
+ fi
+ 
+-$as_echo "#define HAVE_TERMCAP test \"x\$HAVE_TERMCAP\" != \"x\"" >>confdefs.h
++cat >>confdefs.h <<_ACEOF
++#define HAVE_TERMCAP `test "x$HAVE_TERMCAP" = "x"; echo $?`
++_ACEOF
+ 
+ TERMCAP_LIBS=$HAVE_TERMCAP
+ 
+diff -ru einfo-1.0.4/src/libeinfo/libeinfo.c einfo/src/libeinfo/libeinfo.c
+--- einfo-1.0.4/src/libeinfo/libeinfo.c	2013-10-27 17:37:25.000000000 +0100
++++ einfo/src/libeinfo/libeinfo.c	2013-10-29 18:05:38.081876730 +0100
+@@ -50,7 +50,7 @@
+ #include <string.h>
+ #include <strings.h>
+ #include <syslog.h>
+-#ifdef HAVE_TERMCAP
++#if HAVE_TERMCAP
+ # include <termcap.h>
+ #endif
+ #include <unistd.h>
+@@ -155,7 +155,7 @@
+ 
+ /* Termcap buffers and pointers
+  * Static buffers suck hard, but some termcap implementations require them */
+-#ifdef HAVE_TERMCAP
++#if HAVE_TERMCAP
+ static char termcapbuf[2048];
+ static char tcapbuf[512];
+ #else
+@@ -287,7 +287,7 @@
+ }
+ 
+ /* Fake tgoto call - very crapy, but works for our needs */
+-#ifndef HAVE_TERMCAP
++#if !HAVE_TERMCAP
+ static char *
+ tgoto(const char *cap, int col, int line)
+ {
+@@ -363,7 +363,7 @@
+ 	const char *bold;
+ 	char tmp[100];
+ 	unsigned int i = 0;
+-#ifdef HAVE_TERMCAP
++#if HAVE_TERMCAP
+ 	char *bp;
+ #endif
+ 
+@@ -387,7 +387,7 @@
+ 	if (strcmp(term, "cons25") == 0)
+ 		term_is_cons25 = true;
+ 
+-#ifdef HAVE_TERMCAP
++#if HAVE_TERMCAP
+ 	/* Check termcap to see if we can do colour or not */
+ 	if (tgetent(termcapbuf, term) == 1) {
+ 		bp = tcapbuf;
+@@ -433,7 +433,7 @@
+ 			_me = ME;
+ 		if (!_up)
+ 			_up = UP;
+-#ifdef HAVE_TERMCAP
++#if HAVE_TERMCAP
+ 	}
+ 
+ 	if (!_af || !_ce || !_me || !_md || !_up) {