Fix some compiler warnings. Inherit readme.gentoo.eclass.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x9433907D693FB5B8!

4 files changed, 135 insertions, 14 deletions

diff --git a/app-editors/teco/ChangeLog b/app-editors/teco/ChangeLog
index 40f4f6019d94..6ca315c51b51 100644
--- a/app-editors/teco/ChangeLog
+++ b/app-editors/teco/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-editors/teco
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/teco/ChangeLog,v 1.26 2013/02/28 17:56:16 ulm Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/teco/ChangeLog,v 1.27 2014/03/11 09:33:51 ulm Exp $
+
+*teco-1.00-r4 (11 Mar 2014)
+
+  11 Mar 2014; Ulrich Müller <ulm@gentoo.org> +teco-1.00-r4.ebuild,
+  +files/teco-warnings.patch:
+  Fix some compiler warnings. Inherit readme.gentoo.eclass.
 
   28 Feb 2013; Ulrich Müller <ulm@gentoo.org> teco-1.00-r3.ebuild:
   Fix build failure with separate tinfo library.
diff --git a/app-editors/teco/Manifest b/app-editors/teco/Manifest
index 775c8ea27ee5..87b1bdf12ca6 100644
--- a/app-editors/teco/Manifest
+++ b/app-editors/teco/Manifest
@@ -3,25 +3,27 @@ Hash: SHA256
 
 AUX teco-double-free.diff 936 SHA256 f3fdc8fe496b07df9a9dcc6be77f50880092d1f2cc9022b745346c6e56a5d66d SHA512 da914d198a057138c43d3fc7f3bd0f2b9577287c0c37319c09e128bf76af771dbd23301c2630eb4f7884d2298672632cec382fe2bddd06e2a315872023b05583 WHIRLPOOL c201b3bcebb38d08c87da2559256ca238f9bfa99fcb9d0652031bb6a56c0a25268490b0927dfd8ff7a32320104fb0a1649c52446794e0ec1ca81174439956362
 AUX teco-gcc4.patch 336 SHA256 71c86488f422dd77ffab53990433aff66ca24bcdda3cf3c077a01bd5a753d3e4 SHA512 8eb39de57df5f234c38d69c6b89c0422575113b9568336b8f726a2ae733c4af3e54c0e9da06d23c2ec34281fba7899df4a3af046d05d486a2c3d07eb7b55bf28 WHIRLPOOL 13e317000a0a50015194812f81618409997b44f5309a3d8e65a850eb901e6599556721b5ba22e3356edc44dbea9edb8e7b29e9e67026c05aeac4a432fd7dd9f2
+AUX teco-warnings.patch 1206 SHA256 e91ae1938f72d411a57369100f9ce40492f3b805b2670658e5f5ec9a1fccc0db SHA512 7294ef66917eb549d9437327b32160317313d343c731423e34a07ed407e5595e7ac52d57c55bc1e5c6732f5ed0840533aa9c546ee32f4ea2bef54adf5a91b249 WHIRLPOOL bf45ff3cb203607696eb694464f7c653f07bb0b89b4ef17e6b5a089eec12a123b0882a43df493c95d09fce1fd32d831ebdcb826625709c4530f0c89f3f5a73ca
 DIST tech.txt.gz 1971 SHA256 b363c59a4e97793e0c7bd0011cfc6d6669621e7a8b7c98e88da0d098aae83b7c SHA512 8c74d813d7e1bcd2f911982a8b49fa8b97ff85475a4798ea23d9a25ef30ad7243cfc851525aea895eec1a2f69aad84b6cce890ee6a29763a63c1a6d1358a200f WHIRLPOOL 5814546368ee3a0794c098496c25b5ccfe63c84e72cc802edfdbfe415f4a1920d518496b67011c63d0e3ff950204af5c61bad0e1684c35b1c724a977b2145a5a
 DIST teco.doc.gz 129896 SHA256 c2102dcfc223e5f8fe189b2dd75dfb6f8dbdf1e7509761c974da45e6ba115c66 SHA512 ea294aaa0d54de5b58ef645fbaf5c9512f5a27fb2b49b1120b4a712d01c6482f01a53ac2dac7c8eabdf110823a4556563cde828fc7416479b9c23157282e76da WHIRLPOOL 650e504660874a88170ca8e88735ac7e3c9a0587191aa56591c441949402ea170cf72f23084d85c2bd74de340a42585b64f9a93b45c2f4089fd4f9d2642394e8
 DIST teco.tar.gz 61305 SHA256 2d20d7246df15863a3cc485ee38706fd4dd8650aab0578d202913cc5750fc8e4 SHA512 686b3944a82d088a2fce12a9b770f4aa5f58aaadde064b3d3342114f0ece2d7cbae27d0e92fd026def6f62a3ff0dc82b37146e30a93b2ec195dc7f376b45fdf7 WHIRLPOOL 976dfcffd0dd9c40e97574c22efc99b8985484534a4f8f8deae218daad9ccc6c4f29e1c352ec0be5e73368993d3d04e757b708ca325b42b8fa3c1e71ae2e42b9
 DIST tecolore.txt.gz 7039 SHA256 a7cd56d4d9bce8befd8d73fe8cbb1ab22740571f52354880c84ffd0fcd22d884 SHA512 f8b66637dd140057331bb950b639f755b7d2a58c6d9feb5c89c062350f3213b40f4e955c586643312b4bcdcfd5ce67c621c8f7351e08a4303be35af967ce206e WHIRLPOOL c847df458b938d3b6a5d41ea868bbf1107a191cd5cf0f5e93e93d8c8c1f1fb55574bf5db9768fbfbf520d5306ffdae8b0915167e9a7a6ff958b9a286df077cc3
 DIST tecoprog.doc.gz 15629 SHA256 8e0349b73ffcd22c668d81ea1427f93324d8f236862847634f7118fd4cde26d7 SHA512 f49de461d6411345e9e72b51bf39bc1155acc07901b54d8fda94b99a4a573005ccffc475ef8aac3bfc0b8bd246dc0077399d4bcef70e8a5e753c45995df7ad55 WHIRLPOOL 17a80c2ee2c66509689359103167c6e6c2809f8a3f54d6293de8288f37641491a34ead63691572e99e84e07c39565f441f6b56e5a8c9e20ae32f5641dac69a45
 EBUILD teco-1.00-r3.ebuild 1763 SHA256 10d3f30016df81c78cdba142ae57a14c4ae420340b01f0c23f1c72e2646dcb4a SHA512 3cc6babf2a9a3e5c77520fd37cb4fa684a68182d3289f656b1392133990260d4453ab65d5bcf883aaeb1ac38b2211cce9c27af39cb439c875da5fa7bfd2ba303 WHIRLPOOL ca2774b4e45430dcdbda31f58ffb7fbffa52f1e8da80acf60883fe4980d3494a92db4b691d39000c64e5e2740755a5f6baadadb73aef7d39615cc7542cc083e5
-MISC ChangeLog 3109 SHA256 d58c9b1b98708ccd788625ec35a2aab0f34fbfd8df1d5b0ad0dc73398f2a0395 SHA512 981b59f969d10b93956ca7a9683e6770abe7221bb396c9e270640b7de8d408975263c9ca7cb4163df661c316bfc37cb42df3d32ac6bc009e3aaeda663d70f9db WHIRLPOOL 47508657c5bc850eee8373a715bd24dc26d59f34cd6be90dea5209395ecee568f199570dc6f67aba5aef2cc08501c401ed7fe01e52688e83cadc522dd1323e26
+EBUILD teco-1.00-r4.ebuild 1809 SHA256 29c5a193150aad599fd229f28db0fa7e4ebd094deae174393cf6ae443aed43ab SHA512 5f1bbdb0cf37d1f1b7587799cd3d348a1f3c5af31722215e79ef7033de5d9556cf88a08539cb2c21de67fdc3b88ac64a595035f7fca254ada556f86684e65590 WHIRLPOOL fd056fa1fa744bd03e12bf38a37b4d4a79f79df677a0ed35634b0424a5f2f0791fc2f2f188164548a68217249fd182cecd4b9cc124817d7bb7ef3ef9ba64002b
+MISC ChangeLog 3298 SHA256 354535227d2b0385b9167c0df7ac7aea241c2f81ff6f105dc4fb0ef5644d2477 SHA512 7067713ece6977a6a9ab8f49d3c0c869f5860080988eadebb221995c131f279e72223b3225f08636044319c124553a8786af1678269a0e521d30b66f282d971e WHIRLPOOL cc43c21e8b5cf30db9f8d43e27efad61987c18c7e97f7a5c9d9286d10e9e981bc24239edc7ea65901688f0641c5baa5a09b9783167006161a8de4f56b1dbb2d9
 MISC metadata.xml 1278 SHA256 16a0d5e5ff0ce75a78248d0d6179df28947401e433e3cdeecab675b08bdd741d SHA512 bd8799160adaadf5be825503dc131c1330d162fb217e913d6e63a8a77d88a3e021739cac124394aa73a32e001b3c59573da8c15254ca507366c551583f0fbc67 WHIRLPOOL 423d4235d3b3bddb5c3571173bd5bac3abc772418120944f43873b07247cf7ccc3454c2c69d2053b96577050ff49977bf9161d0488dc5ee0bf42fa96d1d617ba
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQGcBAEBCAAGBQJRL5tSAAoJEJQzkH1pP7W4izAMAIpm37vM2L2S8C2j7sgydz4U
-V87tz/5VYnjrmt/if/FwalZJRdrN3Tx9XFoIjpSquiOOo8FW2Z5PibfaGPrfC9zi
-IA9M3+3+AzxvKpuSQsmsHyiZ2kxbVImw07dCaLIKidZEeDc6VU9XCz+zEsEAlzA0
-rTADwZ0It8TyjM0jjvSknE6hYQmaZFsDPYkPjjUZ9P7e5SzNSY+O+DDm6+ShRZXk
-Kn+nMxRECytbwH1El9fsTeg2CyBOEOxyljnjByZsJWcN8X3mGWwTMeNQCnEmW3Td
-jdp5bJL6VeaM3r7oI4pF1ED0OyxL2qDF1yryexcJT88okzFw8AsfaWvqq3nsmcfA
-SsHcckTrfaNVvr7N+N8M603tNRuqOTWY534NuT02V8BJ6gSIpvK2fg4aWionm0Qv
-CcDaXgKIo3Esf1lh/SQq3ZdBV+QKChrLAH41UFmvzMkZ4kuzbfG9ydV6RKxBvOrH
-vPSYdeR4eRa+Cwx832NOYA9AryjG9AwLh4prf0XjUA==
-=+pR8
+iQGcBAEBCAAGBQJTHtn5AAoJEJQzkH1pP7W4BywL/1Q8kZeKoqw5HZG7W5wSigW4
+3pF6uIIIAmjDs0uRjLTtDEuqo2O8xvTwqDKC3d+DkNyYIP7RQzkApHObqrttvZDk
+1chF2y3rzxBVaDOFiCzYK/UZTn1M+s+sBQRU6M2FvGMnSKAKTj7LluYaYtkNnpyC
+XVodwgXg8Yi8uuZFn/83Bt37t6cv5lMhjKCaPCXKNe862ladOouJo5j3fIJmyC0K
+PziTAba9XFfrj2qop2Mkj33QzBB4d6bVcsckxuLnlIlD7uPs/yaRg04oLH9fa5NI
+eJp3DKGOVbhf9gozAZ87AASBIV6/C9ez3+tqjKG7yyxLD2G41xd9wfqa1Ks2AypI
+0oNgEPVe8jP1X8VrraMCViYdosOHTPOiNPtcirB0Hgbg+aStQ+AC6YO34Qi1toas
+guA+FJb6wl4MNfEL6bXX9OCWA9BgZhLv9vdkaMUMBVuVGlbx9/Y7v9FM9DJZOY4b
+CDKu7Utz80KocnZsR4nWsqgiG2up3Demz8rKSAdZDA==
+=rfIt
 -----END PGP SIGNATURE-----
diff --git a/app-editors/teco/files/teco-warnings.patch b/app-editors/teco/files/teco-warnings.patch
new file mode 100644
index 000000000000..f8bbfbfff181
--- /dev/null
+++ b/app-editors/teco/files/teco-warnings.patch
@@ -0,0 +1,47 @@
+Include stdlib.h for exit(3).
+Fix conflicting type for malloc(3).
+Avoid casting pointers from/to int.
+
+--- teco-orig/te_defs.h
++++ teco/te_defs.h
+@@ -6,6 +6,7 @@
+ /* version for multiple buffers 04/19/89 11.25                              */
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <ctype.h>
+ #include <setjmp.h>
+ 
+--- teco-orig/te_rdcmd.c
++++ teco/te_rdcmd.c
+@@ -94,7 +94,8 @@
+ 			qreg[i].f = cbuf.f;         /* put the old command string in its place */
+ 			if (qreg[i].f) qreg[i].f->b = (struct buffcell *) &qreg[i];
+ 			qreg[i].z = cbuf.z;
+-			cbuf.f = (struct buffcell *) (cbuf.z = 0);      /* no old command string */
++			cbuf.f = NULL;              /* no old command string */
++			cbuf.z = 0;
+ 			err = 0;                    /* no previous error */
+ 			goto restart;
+ 			}
+--- teco-orig/te_utils.c
++++ teco/te_utils.c
+@@ -13,7 +13,6 @@
+ 
+ struct buffcell *get_bcell()
+     {
+-    char *malloc();
+     struct buffcell *p;
+     int i;
+ 
+--- teco-orig/te_window.c
++++ teco/te_window.c
+@@ -1051,7 +1051,7 @@
+ 	pp->c = loc % CELLSIZE;
+ 	pp->dot = loc;
+ 	}
+-    return( (int) pb0->f);
++    return(pb0->f != NULL);
+     }
+ 
+ /* routine to move N lines (back, forward, or 0)                */
diff --git a/app-editors/teco/teco-1.00-r4.ebuild b/app-editors/teco/teco-1.00-r4.ebuild
new file mode 100644
index 000000000000..6ce65829a313
--- /dev/null
+++ b/app-editors/teco/teco-1.00-r4.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/teco/teco-1.00-r4.ebuild,v 1.1 2014/03/11 09:33:51 ulm Exp $
+
+EAPI=5
+
+inherit eutils toolchain-funcs flag-o-matic readme.gentoo
+
+DESCRIPTION="Classic TECO editor, Predecessor to EMACS"
+HOMEPAGE="http://www.ibiblio.org/pub/linux/apps/editors/tty/ http://www.ibiblio.org/pub/academic/computer-science/history/pdp-11/teco"
+SRC_URI="http://www.ibiblio.org/pub/linux/apps/editors/tty/teco.tar.gz
+	doc? ( mirror://gentoo/tecolore.txt.gz
+		mirror://gentoo/tech.txt.gz
+		mirror://gentoo/teco.doc.gz
+		mirror://gentoo/tecoprog.doc.gz )"
+
+LICENSE="freedist"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+IUSE="doc"
+
+RDEPEND="sys-libs/ncurses"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	unpack teco.tar.gz
+	if use doc; then
+		mkdir doc
+		cd doc || die
+		unpack tecolore.txt.gz tech.txt.gz teco.doc.gz tecoprog.doc.gz
+	fi
+}
+
+src_prepare() {
+	local pkg_config=$("$(tc-getPKG_CONFIG)" --libs ncurses)
+	sed -i -e "s:\$(CC):& \$(LDFLAGS):;s:-ltermcap:${pkg_config}:" \
+		Makefile || die
+	# bug 103257
+	epatch "${FILESDIR}"/${PN}-double-free.diff
+	epatch "${FILESDIR}"/${PN}-gcc4.patch
+	epatch "${FILESDIR}"/${PN}-warnings.patch
+}
+
+src_compile() {
+	append-flags -ansi
+	append-cppflags -D_POSIX_SOURCE
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	dobin te
+	doman te.1
+	dodoc sample.tecorc sample.tecorc2 READ.ME MANIFEST
+	if use doc; then
+		cd doc
+		dodoc tecolore.txt tech.txt teco.doc tecoprog.doc
+	fi
+
+	DOC_CONTENTS="The TECO binary is called te.
+		\nSample configurations	and documentation are available
+		in /usr/share/doc/${PF}/."
+	readme.gentoo_create_doc
+}