sys-process/time: Bump to version 1.7.2

Package-Manager: Portage-2.3.7, Repoman-2.3.3

6 files changed, 66 insertions, 10 deletions

diff --git a/sys-process/time/Manifest b/sys-process/time/Manifest
index aa5e05278e9f..b2122bb1938b 100644
--- a/sys-process/time/Manifest
+++ b/sys-process/time/Manifest
@@ -1 +1,2 @@
+DIST time-1.7.2.tar.gz 108371 SHA256 be6927ef6cb08c411b907ac039d9228e1649f4944ef3e0fbe381471d6a61e45b SHA512 dfde8f48a9d52bcc9080596feca6c429556e1e510977503138195d390cb52f27dd171f519d78226b0b48adc404062ec1f9234d92ea9707ec16d1be23ced90afc WHIRLPOOL 2d9bbe909bed2861459fdd2a72104ca754f99439d0ffcd9df1db23969c44b2cfcd334907a560569d552a4ed4184fd9793ad134ccb3eaad24244953c3443a1b7d
 DIST time-1.7.tar.gz 103066 SHA256 e37ea79a253bf85a85ada2f7c632c14e481a5fd262a362f6f4fd58e68601496d SHA512 d759b651e343beddc0b3bd06af85881486b72319c979a2e7f752d5a34edd8b7c1c19391c5c7a2e8f6685746cc7a046bf2c8e082b31458a1dd043ed90a4cebcd1 WHIRLPOOL 8102c994a6b5faa60ee51e7343383f307c0d31cbd26177f86fc96b41014e1065b536202a371556af336394ac0bf473db2571a15bc7644247a9a3d8235269880f
diff --git a/sys-process/time/files/1.7-info-dir-entry.patch b/sys-process/time/files/1.7-info-dir-entry.patch
index 1cc057b04ea1..eb30029722bb 100644
--- a/sys-process/time/files/1.7-info-dir-entry.patch
+++ b/sys-process/time/files/1.7-info-dir-entry.patch
@@ -1,5 +1,5 @@
---- time.info.old	2004-09-11 03:00:39.076871344 -0400
-+++ time.info	2004-09-11 03:00:40.394671008 -0400
+--- a/time.info
++++ b/time.info
 @@ -19,6 +19,9 @@
  manual into another language, under the above conditions for modified
  versions, except that this permission notice may be stated in a
diff --git a/sys-process/time/files/time-1.7-build.patch b/sys-process/time/files/time-1.7-build.patch
index 82d6ae1c7584..504643d768e5 100644
--- a/sys-process/time/files/time-1.7-build.patch
+++ b/sys-process/time/files/time-1.7-build.patch
@@ -1,5 +1,5 @@
---- configure.in
-+++ configure.in
+--- a/configure.in
++++ b/configure.in
 @@ -1,11 +1,6 @@
  dnl Process this file with autoconf to produce a configure script.
 -AC_INIT(time.c)
diff --git a/sys-process/time/files/time-1.7-incorrect_memory_usage.patch b/sys-process/time/files/time-1.7-incorrect_memory_usage.patch
index 55807100c3a9..ab1f4ddfbd5e 100644
--- a/sys-process/time/files/time-1.7-incorrect_memory_usage.patch
+++ b/sys-process/time/files/time-1.7-incorrect_memory_usage.patch
@@ -1,9 +1,8 @@
 https://bugs.launchpad.net/ubuntu/+source/time/+bug/742248
 https://bugs.gentoo.org/332253
 
-diff -rupN time-1.7-original/ChangeLog time-1.7/ChangeLog
---- time-1.7-original/ChangeLog	2011-11-11 09:17:47.507026731 +0100
-+++ time-1.7/ChangeLog	2011-11-11 09:27:46.751002205 +0100
+--- time-1.7/ChangeLog
++++ time-1.7/ChangeLog
 @@ -1,3 +1,9 @@
 +Fri Oct  1 00:00:00 2010	Bob Proulx	<bob@proulx.com>
 +	The struct rusage reports ru_maxrss in kbytes not pages and 
@@ -14,9 +13,8 @@ diff -rupN time-1.7-original/ChangeLog time-1.7/ChangeLog
  Thu Jul 11 12:37:17 1996  David J MacKenzie  <djm@catapult.va.pubnix.com>
  
  	* Version 1.7.
-diff -rupN time-1.7-original/time.c time-1.7/time.c
---- time-1.7-original/time.c	2011-11-11 09:17:47.507026731 +0100
-+++ time-1.7/time.c	2011-11-11 09:27:58.167001738 +0100
+--- time-1.7/time.c
++++ time-1.7/time.c
 @@ -398,7 +398,7 @@ summarize (fp, fmt, command, resp)
  		       ptok ((UL) resp->ru.ru_ixrss) / MSEC_TO_TICKS (v));
  	      break;
diff --git a/sys-process/time/files/time-1.7.2-incorrect_memory_usage.patch b/sys-process/time/files/time-1.7.2-incorrect_memory_usage.patch
new file mode 100644
index 000000000000..6c83f0bb9264
--- /dev/null
+++ b/sys-process/time/files/time-1.7.2-incorrect_memory_usage.patch
@@ -0,0 +1,29 @@
+https://bugs.launchpad.net/ubuntu/+source/time/+bug/742248
+https://bugs.gentoo.org/332253
+
+--- time-1.7.2/ChangeLog
++++ time-1.7.2/ChangeLog
+@@ -1,6 +1,12 @@
+ Fri Dec 21 23:00:00 2012  David C Niemi <gnutime@dcn.tuxers.net>
+ 	* Version 1.7.1.
+ 
++Fri Oct  1 00:00:00 2010  Bob Proulx  <bob@proulx.com>
++	* time.c (summarize): Do not call ptok on ru_maxrss.
++	  The struct rusage reports ru_maxrss in kbytes not pages and
++	  should not be converted through pages-to-kbytes again.
++	  Reported by Sven Hartrumpf.
++
+ Thu Jul 11 12:37:17 1996  David J MacKenzie  <djm@catapult.va.pubnix.com>
+ 
+ 	* Version 1.7.
+--- time-1.7.2/time.c
++++ time-1.7.2/time.c
+@@ -394,7 +394,7 @@
+ 		       ptok ((UL) resp->ru.ru_ixrss) / MSEC_TO_TICKS (v));
+ 	      break;
+ 	    case 'M':		/* Maximum resident set size.  */
+-	      fprintf (fp, "%lu", ptok ((UL) resp->ru.ru_maxrss));
++	      fprintf (fp, "%lu", (UL) resp->ru.ru_maxrss);
+ 	      break;
+ 	    case 'O':		/* Outputs.  */
+ 	      fprintf (fp, "%ld", resp->ru.ru_oublock);
diff --git a/sys-process/time/time-1.7.2.ebuild b/sys-process/time/time-1.7.2.ebuild
new file mode 100644
index 000000000000..ed96169755c3
--- /dev/null
+++ b/sys-process/time/time-1.7.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="Displays info about resources used by a program"
+HOMEPAGE="https://www.gnu.org/directory/time.html"
+SRC_URI="http://git.savannah.gnu.org/cgit/time.git/snapshot/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND="sys-apps/texinfo"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.7-build.patch
+	"${FILESDIR}"/1.7-info-dir-entry.patch
+	"${FILESDIR}"/${PN}-1.7.2-incorrect_memory_usage.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}