From 8bd0334ae8a968e659f362545ebcb7b4a1c1e40e Mon Sep 17 00:00:00 2001 From: Nick Owens Date: Tue, 5 Jul 2016 11:00:14 -0700 Subject: [PATCH] bump(sys-process/time): sync with upstream --- .../md5-cache/sys-process/time-1.7-r1 | 12 +-- .../md5-cache/sys-process/time-1.7-r2 | 11 +++ .../portage-stable/sys-process/time/ChangeLog | 85 +++++++++++++++++++ .../sys-process/time/ChangeLog-2015 | 74 ++++++++++++++++ .../portage-stable/sys-process/time/Manifest | 10 ++- .../time-1.7-incorrect_memory_usage.patch | 28 ++++++ .../sys-process/time/metadata.xml | 8 ++ .../sys-process/time/time-1.7-r1.ebuild | 23 ++--- .../sys-process/time/time-1.7-r2.ebuild | 24 ++++++ 9 files changed, 252 insertions(+), 23 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-process/time-1.7-r2 create mode 100644 sdk_container/src/third_party/portage-stable/sys-process/time/ChangeLog create mode 100644 sdk_container/src/third_party/portage-stable/sys-process/time/ChangeLog-2015 create mode 100644 sdk_container/src/third_party/portage-stable/sys-process/time/files/time-1.7-incorrect_memory_usage.patch create mode 100644 sdk_container/src/third_party/portage-stable/sys-process/time/metadata.xml create mode 100644 sdk_container/src/third_party/portage-stable/sys-process/time/time-1.7-r2.ebuild diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-process/time-1.7-r1 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-process/time-1.7-r1 index f84cb384a5..546634ba4f 100644 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-process/time-1.7-r1 +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-process/time-1.7-r1 @@ -1,11 +1,11 @@ -DEFINED_PHASES=install unpack -DEPEND=!=sys-devel/automake-1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 +DEFINED_PHASES=prepare +DEPEND=!=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 DESCRIPTION=displays info about resources used by a program -EAPI=0 -HOMEPAGE=http://www.gnu.org/directory/time.html -KEYWORDS=alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~ia64-linux ~x86-linux +EAPI=4 +HOMEPAGE=https://www.gnu.org/directory/time.html +KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~ia64-linux ~x86-linux LICENSE=GPL-2 SLOT=0 SRC_URI=mirror://gnu/time/time-1.7.tar.gz _eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils 9d81603248f2ba3ec59124320d123e5e libtool b75230758539a7da029e24afdb693960 multilib 3972ca401cf7dbb430df9995f5d8d580 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 -_md5_=f7c8c123fe2278ad5dca31aed5214a46 +_md5_=028caeb743c25c39ae954ae17ff4b4b9 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-process/time-1.7-r2 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-process/time-1.7-r2 new file mode 100644 index 0000000000..ef5cefbce9 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-process/time-1.7-r2 @@ -0,0 +1,11 @@ +DEFINED_PHASES=prepare +DEPEND=!=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 +DESCRIPTION=displays info about resources used by a program +EAPI=4 +HOMEPAGE=https://www.gnu.org/directory/time.html +KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux +LICENSE=GPL-2 +SLOT=0 +SRC_URI=mirror://gnu/time/time-1.7.tar.gz +_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils 9d81603248f2ba3ec59124320d123e5e libtool b75230758539a7da029e24afdb693960 multilib 3972ca401cf7dbb430df9995f5d8d580 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 +_md5_=66ae3ad5a08941aa9f8ff3ec38abd558 diff --git a/sdk_container/src/third_party/portage-stable/sys-process/time/ChangeLog b/sdk_container/src/third_party/portage-stable/sys-process/time/ChangeLog new file mode 100644 index 0000000000..6ffa58f384 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-process/time/ChangeLog @@ -0,0 +1,85 @@ +# ChangeLog for sys-process/time +# Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2 +# (auto-generated from git log) + +*time-1.7-r2 (09 Aug 2015) +*time-1.7-r1 (09 Aug 2015) + + 09 Aug 2015; Robin H. Johnson + +files/1.7-info-dir-entry.patch, +files/time-1.7-build.patch, + +files/time-1.7-incorrect_memory_usage.patch, +metadata.xml, + +time-1.7-r1.ebuild, +time-1.7-r2.ebuild: + proj/gentoo: Initial commit + + 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 + + 24 Aug 2015; Justin Lecher metadata.xml: + Use https by default + + Convert all URLs for sites supporting encrypted connections from http to + https + + Signed-off-by: Justin Lecher + + 24 Aug 2015; Justin Lecher time-1.7-r1.ebuild, + time-1.7-r2.ebuild: + Use https for most gnu.org URLs + + Signed-off-by: Justin Lecher + + 24 Aug 2015; Mike Gilbert metadata.xml: + Revert DOCTYPE SYSTEM https changes in metadata.xml + + repoman does not yet accept the https version. + This partially reverts eaaface92ee81f30a6ac66fe7acbcc42c00dc450. + + Bug: https://bugs.gentoo.org/552720 + + 24 Nov 2015; Mike Frysinger metadata.xml: + standardize various metadata.xml style + + 24 Jan 2016; Michał Górny metadata.xml: + Unify quoting in metadata.xml files for machine processing + + Force unified quoting in all metadata.xml files since lxml does not + preserve original use of single and double quotes. Ensuring unified + quoting before the process allows distinguishing the GLEP 67-related + metadata.xml changes from unrelated quoting changes. + + 24 Jan 2016; Michał Górny metadata.xml: + Replace all herds with appropriate projects (GLEP 67) + + Replace all uses of herd with appropriate project maintainers, or no + maintainers in case of herds requested to be disbanded. + + 24 Jan 2016; Michał Górny metadata.xml: + Set appropriate maintainer types in metadata.xml (GLEP 67) + diff --git a/sdk_container/src/third_party/portage-stable/sys-process/time/ChangeLog-2015 b/sdk_container/src/third_party/portage-stable/sys-process/time/ChangeLog-2015 new file mode 100644 index 0000000000..d53a439a57 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-process/time/ChangeLog-2015 @@ -0,0 +1,74 @@ +# ChangeLog for sys-process/time +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-process/time/ChangeLog,v 1.9 2015/02/01 11:26:41 polynomial-c Exp $ + +*time-1.7-r2 (01 Feb 2015) + + 01 Feb 2015; Lars Wendler +time-1.7-r2.ebuild, + +files/time-1.7-incorrect_memory_usage.patch: + Fixed incorrect memory usage (bug #332253). + + 18 Jan 2014; Mike Frysinger time-1.7-r1.ebuild: + Add arm64 love. + + 03 Jun 2012; Mike Frysinger time-1.7-r1.ebuild: + Update to EAPI=4. + + 17 Oct 2010; Mart Raudsepp time-1.7-r1.ebuild: + Drop to ~mips + + 10 Jan 2010; Jonathan Callen time-1.7-r1.ebuild: + Add prefix keywords + + 13 Nov 2006; Sven Wegener time-1.7-r1.ebuild: + Fix mirror:// SRC_URI. + + 13 Oct 2006; Mike Frysinger + +files/time-1.7-build.patch, time-1.7-r1.ebuild: + Cleanup autotools #151000. + +*time-1.7-r1 (03 Mar 2005) + + 03 Mar 2005; Ciaran McCreesh +metadata.xml, + +files/1.7-info-dir-entry.patch, +time-1.7-r1.ebuild: + Moved from sys-apps/time to sys-process/time. + + 11 Sep 2004; Mike Frysinger + +files/1.7-info-dir-entry.patch, time-1.7-r1.ebuild, -time-1.7.ebuild: + Redo the whole ebuild ... much cleaner this way says i. + + 28 Jul 2004; Tom Gall time-1.7-r1.ebuild: + stable on ppc64, bug #58303 + + 01 Jul 2004; Jeremy Huddleston time-1.7-r1.ebuild, + time-1.7.ebuild: + virtual/glibc -> virtual/libc + + 20 Feb 2003; Zach Welch : + add arm keyword + + 06 Dec 2002; Rodney Rees : changed sparc ~sparc keywords + +*time-1.7-r1 (15 Apr 2002) + + 21 Jul 2002; Mark Guertin : + updated keywords (ppc) + + 14 Jul 2002; phoen][x time-1.7.ebuild : + Added LICENSE, KEYWORDS, SLOT. + + 14 Jul 2002; phoen][x time-1.7-r1.ebuild : + Added LICENSE, KEYWORDS, SLOT. + + 15 Apr 2002; Matthew Kennedy + time-1.7-r1.ebuild, ChangeLog, files/digest-time-1.7-r1 : + + Resolves bug #1784 (thanks to set_48035@yahoo.com who submitted the + patch). + + +*time-1.7 (27 Feb 2002) + + 27 Feb 2002; Bruce A. Locke time-1.7.ebuild : + + Time ebuild contributed by naz@themoonsofjupiter.net (Michael M Nazaroff) diff --git a/sdk_container/src/third_party/portage-stable/sys-process/time/Manifest b/sdk_container/src/third_party/portage-stable/sys-process/time/Manifest index 52484115e1..83014af389 100644 --- a/sdk_container/src/third_party/portage-stable/sys-process/time/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-process/time/Manifest @@ -1 +1,9 @@ -DIST time-1.7.tar.gz 103066 RMD160 547a9bb4bc0b3a34046be8381e9c142977ffd402 SHA1 dde0c28c7426960736933f3e763320680356cc6a SHA256 e37ea79a253bf85a85ada2f7c632c14e481a5fd262a362f6f4fd58e68601496d +AUX 1.7-info-dir-entry.patch 461 SHA256 fec1ec5d871e2685b22ae73b89fa9ca7d9df9d662c2d28d0ca15e23c53fa0385 SHA512 8ec76006c58798fc317c9280a16737e133992915e12ea97797fae3e4d02489e38a8d68254a104b540ea953827b222e6672e0c2e0a23ed4992db134c7c5ccc4f2 WHIRLPOOL 23c919612cad9379d6a39f0d50d02d8e1041913442da184ca1377b5e89c8dfe24874a5a9547e023db4fd21a7db8c8d21817343fd44f02c8fe9ca6baa9671924c +AUX time-1.7-build.patch 297 SHA256 06871e5b9279c8dd59935bfa919f410e44a02a2503ef55c8e95219dcd8e18bf5 SHA512 a08de606393041af79145913f45b7380cbef67c152673b585c84d99e72fc1482bad0bde9c560f7cdce2e72caf46e9e47c870fc0eb5a2ba486dd99a13648184c5 WHIRLPOOL d3b7242594ea1d31047a2c31749bfbb979ad8989663d313f609826d184e1cd0dc222e852dbfb00a286ac7f463b459d9c9b44fe138d90404f3e8145aa7f884557 +AUX time-1.7-incorrect_memory_usage.patch 1217 SHA256 6a54c0e58b63daf8f8fcde16dde649d9104adcf0541989a907f95fd650fe147c SHA512 e00771b2632d795694135c5c2c81b9e4e2d60779fc158e548a73b0b4bbe92a01df9c6770f88bcc75e71142a20aa6e0e019c988f52db973841cc1816fde51d99a WHIRLPOOL b198f90c953d60d832bfd90221ece32c9009c65194f9568d42160a5848fd03741147607b3204def5bcf8415c2659229ee55126c2174ed139c6a724be5103a801 +DIST time-1.7.tar.gz 103066 SHA256 e37ea79a253bf85a85ada2f7c632c14e481a5fd262a362f6f4fd58e68601496d SHA512 d759b651e343beddc0b3bd06af85881486b72319c979a2e7f752d5a34edd8b7c1c19391c5c7a2e8f6685746cc7a046bf2c8e082b31458a1dd043ed90a4cebcd1 WHIRLPOOL 8102c994a6b5faa60ee51e7343383f307c0d31cbd26177f86fc96b41014e1065b536202a371556af336394ac0bf473db2571a15bc7644247a9a3d8235269880f +EBUILD time-1.7-r1.ebuild 576 SHA256 eff2f5936abc9b6236606b4913d6b262f94d9382047481514db55f9f91281a70 SHA512 980dbd9c06668c9ea63f70ebbab18b78202ef72a293169b28174fa8a77d8f78c5c132e49494bac5a6f062898c94ba77e38a0eee901ad7062e33dab3f20d4385c WHIRLPOOL 58e5e08500cf03fde2453d20e8177fc926fabf35b2003e5bf385f3226e902ce68b12166d377c8522d1c9ebde1668c9034dbbb1b68c9a751cfb6d81d455347054 +EBUILD time-1.7-r2.ebuild 641 SHA256 4d09a6bb6d716b4b3094ebd6f8b7ae67f02a0ca2e58a82398366944422e0eebe SHA512 02a4ce2250898d7731a0e8471f2c2ab254854737882b678ad4ed6147546ca97698da19ceedef34bce66438dc2fa03667e7cfd8095c7fbdb485219b75bf6d58e2 WHIRLPOOL 4c9099bc690cb36f448780ac07b0aac2f935ae352a4551924d7be8879fdf9eec8f5751eeeac4b5045836952f0bae7d4ed7f80c330de626a9e5470666c37b8f14 +MISC ChangeLog 3256 SHA256 1c2a074339b4de71760673f6418c0c7b6403cba40e925ceacf9817337a01028b SHA512 c23754427cec4a423ea34f6e2386311ed03a169fe508abf4cbd5153090ab79c4b25ac32005338fa9888b1c2a2f37771c2b798a6c1504888dbb4538f368f91adf WHIRLPOOL bd12b19c0d6106fe7ae51365aee315a43be608787a7a372fe12cf58672ca375fde07c16870bec27520c538559049567bcf9bcf38c3f2f35c9f18144eadcd2861 +MISC ChangeLog-2015 2409 SHA256 94aafa96c12241bda52707b22165c27e87d22e5a43d843bc84b62d8826975a87 SHA512 574fa9cd3b97f4be09eda2efa1e6238b644d98051bfafa7139b978db3320d7264f87521ecf0540bb79930ae59de81c8faff27890e40e6344dd632541cc3fd06f WHIRLPOOL 592284c6d40860f5b42b425d817af231fe697fa5e60b82304a9e3eaddec31fc94631fb98b7e2eeeac594af6171db255e5e4f5171cea96dda712c407f73ddae62 +MISC metadata.xml 253 SHA256 d82c33ef453113a5c1ebe250dcba373c22934a69b0a86c6ab15a5ca589c25b91 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 WHIRLPOOL e5aee23acff864609953a1e4de768f0e4aef704b44c53c021f28573e1ca5c99f1a46d92935ecec2449f7b4419a36d8373127d0ecfa8d7bae72d835e1839eb3f8 diff --git a/sdk_container/src/third_party/portage-stable/sys-process/time/files/time-1.7-incorrect_memory_usage.patch b/sdk_container/src/third_party/portage-stable/sys-process/time/files/time-1.7-incorrect_memory_usage.patch new file mode 100644 index 0000000000..55807100c3 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-process/time/files/time-1.7-incorrect_memory_usage.patch @@ -0,0 +1,28 @@ +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 +@@ -1,3 +1,9 @@ ++Fri Oct 1 00:00:00 2010 Bob Proulx ++ The struct rusage reports ru_maxrss in kbytes not pages and ++ should not be converted through pages-to-kbytes again. ++ Reported by Sven Hartrumpf. ++ * time.c (summarize): Do not call ptok on ru_maxrss. ++ + Thu Jul 11 12:37:17 1996 David J MacKenzie + + * 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 +@@ -398,7 +398,7 @@ summarize (fp, fmt, command, resp) + 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/sdk_container/src/third_party/portage-stable/sys-process/time/metadata.xml b/sdk_container/src/third_party/portage-stable/sys-process/time/metadata.xml new file mode 100644 index 0000000000..56c1244130 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-process/time/metadata.xml @@ -0,0 +1,8 @@ + + + + + base-system@gentoo.org + Gentoo Base System + + diff --git a/sdk_container/src/third_party/portage-stable/sys-process/time/time-1.7-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-process/time/time-1.7-r1.ebuild index d39cac92cc..15117576f3 100644 --- a/sdk_container/src/third_party/portage-stable/sys-process/time/time-1.7-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-process/time/time-1.7-r1.ebuild @@ -1,31 +1,22 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-process/time/time-1.7-r1.ebuild,v 1.5 2010/01/10 22:31:41 abcd Exp $ +# $Id$ + +EAPI="4" -WANT_AUTOMAKE="latest" -WANT_AUTOCONF="latest" inherit eutils autotools DESCRIPTION="displays info about resources used by a program" -HOMEPAGE="http://www.gnu.org/directory/time.html" +HOMEPAGE="https://www.gnu.org/directory/time.html" SRC_URI="mirror://gnu/time/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~ia64-linux ~x86-linux" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~ia64-linux ~x86-linux" IUSE="" -RDEPEND="" - -src_unpack() { - unpack ${A} - cd "${S}" +src_prepare() { epatch "${FILESDIR}"/${P}-build.patch epatch "${FILESDIR}"/${PV}-info-dir-entry.patch eautoreconf } - -src_install() { - emake install DESTDIR="${D}" || die - dodoc ChangeLog README AUTHORS NEWS -} diff --git a/sdk_container/src/third_party/portage-stable/sys-process/time/time-1.7-r2.ebuild b/sdk_container/src/third_party/portage-stable/sys-process/time/time-1.7-r2.ebuild new file mode 100644 index 0000000000..24063308bb --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-process/time/time-1.7-r2.ebuild @@ -0,0 +1,24 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="4" + +inherit eutils autotools + +DESCRIPTION="displays info about resources used by a program" +HOMEPAGE="https://www.gnu.org/directory/time.html" +SRC_URI="mirror://gnu/time/${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 ~ia64-linux ~x86-linux" +IUSE="" + +src_prepare() { + epatch \ + "${FILESDIR}"/${P}-build.patch \ + "${FILESDIR}"/${PV}-info-dir-entry.patch \ + "${FILESDIR}"/${P}-incorrect_memory_usage.patch + eautoreconf +}