From 49ad29f8ad3c886e93ef25526cc8f3622aa991db Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Fri, 5 Nov 2021 21:29:20 +0100 Subject: [PATCH] sys-apps/which: Sync with gentoo It's from gentoo commit 38b155fa1bf907617067c98eb4ba3a5d0790eb1a. --- .../portage-stable/sys-apps/which/ChangeLog | 190 ------------------ .../portage-stable/sys-apps/which/Manifest | 7 +- .../sys-apps/which/metadata.xml | 7 +- .../sys-apps/which/which-2.20-r1.ebuild | 25 --- .../sys-apps/which/which-2.21.ebuild | 13 +- 5 files changed, 10 insertions(+), 232 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/which/ChangeLog delete mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/which/which-2.20-r1.ebuild diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/which/ChangeLog b/sdk_container/src/third_party/portage-stable/sys-apps/which/ChangeLog deleted file mode 100644 index baeb0bd699..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-apps/which/ChangeLog +++ /dev/null @@ -1,190 +0,0 @@ -# ChangeLog for sys-apps/which -# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/which/ChangeLog,v 1.59 2015/03/21 12:28:37 polynomial-c Exp $ - -*which-2.21 (21 Mar 2015) - - 21 Mar 2015; Lars Wendler -which-2.19.ebuild, - -which-2.20.ebuild, +which-2.21.ebuild, - -files/which-2.19-remove-readline.patch, -files/which-gentoo.patch: - Version bump. Removed old. - - 15 Nov 2014; Mike Frysinger which-2.20-r1.ebuild: - Update HOMEPAGE/SRC_URI #515528 by Manfred Knick. - - 26 Jan 2014; Agostino Sarubbo which-2.20-r1.ebuild: - Stable for sparc, wrt bug #495938 - - 19 Jan 2014; Agostino Sarubbo which-2.20-r1.ebuild: - Stable for ppc64, wrt bug #495938 - - 18 Jan 2014; Mike Frysinger which-2.20-r1.ebuild: - Add arm64 love. - - 17 Jan 2014; Mike Frysinger which-2.20-r1.ebuild: - Mark m68k/s390/sh stable. - - 15 Jan 2014; Agostino Sarubbo which-2.20-r1.ebuild: - Stable for ia64, wrt bug #495938 - - 14 Jan 2014; Agostino Sarubbo which-2.20-r1.ebuild: - Stable for ppc, wrt bug #495938 - - 14 Jan 2014; Agostino Sarubbo which-2.20-r1.ebuild: - Stable for x86, wrt bug #495938 - - 12 Jan 2014; Pacho Ramos which-2.20-r1.ebuild: - amd64 stable, bug #495938 - - 03 Jan 2014; Matt Turner which-2.20-r1.ebuild: - alpha stable, bug 495938. - - 31 Dec 2013; Markus Meier which-2.20-r1.ebuild: - arm stable, bug #495938 - - 26 Dec 2013; Jeroen Roovers which-2.20-r1.ebuild: - Stable for HPPA (bug #495938). - - 14 Sep 2013; Patrick Lauer which-2.20-r1.ebuild: - Whitespace - - 14 Sep 2013; Markos Chandras which-2.20-r1.ebuild: - Fix my last commit to use tc-export instead - - 14 Sep 2013; Markos Chandras which-2.20-r1.ebuild: - Export AR. Bug #484854 - -*which-2.20-r1 (23 May 2013) - - 23 May 2013; Mike Frysinger +which-2.20-r1.ebuild: - Update to EAPI=4 and build against 64bit interfaces #471024. - - 17 Feb 2013; Zac Medico which-2.20.ebuild: - Add ~arm-linux keyword. - - 07 Jan 2010; Christian Faulhammer which-2.20.ebuild: - Transfer Prefix keywords - - 05 Oct 2009; Raúl Porcel which-2.20.ebuild: - ia64/m68k/s390/sh stable wrt #283975 - - 02 Oct 2009; Tiago Cunha which-2.20.ebuild: - stable sparc, bug 283975 - - 29 Sep 2009; Tobias Klausmann which-2.20.ebuild: - Stable on alpha, bug #283975 - - 25 Sep 2009; Brent Baude which-2.20.ebuild: - Marking which-2.20 ppc64 for bug 283975 - - 19 Sep 2009; nixnut which-2.20.ebuild: - ppc stable #283975 - - 13 Sep 2009; Markus Meier which-2.20.ebuild: - arm stable, bug #283975 - - 11 Sep 2009; Markus Meier which-2.20.ebuild: - amd64/x86 stable, bug #283975 - - 08 Sep 2009; Jeroen Roovers which-2.20.ebuild: - Stable for HPPA (bug #283975). - -*which-2.20 (17 Sep 2008) - - 17 Sep 2008; Mike Frysinger +which-2.20.ebuild: - Version bump #237155 by Conrad Kostecki. - - 29 Mar 2008; Brent Baude which-2.19.ebuild: - stable ppc64, bug 215056 - - 28 Mar 2008; Brent Baude which-2.19.ebuild: - stable ppc, bug 215056 - - 28 Mar 2008; Jeroen Roovers which-2.19.ebuild: - Stable for HPPA too. - - 13 Mar 2008; Doug Goldstein - +files/which-2.19-remove-readline.patch, which-2.19.ebuild: - readline is not necessary. bug #207151. patch from Daniel Robbins - - - 07 Mar 2008; Santiago M. Mola which-2.19.ebuild: - amd64 stable - - 05 Mar 2008; Raúl Porcel which-2.19.ebuild: - alpha/ia64/sparc/x86 stable - -*which-2.19 (19 Jan 2008) - - 19 Jan 2008; Mike Frysinger +which-2.19.ebuild: - Verison bump #206627 by Samuli Suominen. - - 09 Feb 2007; Diego Pettenò ChangeLog: - Regenerate digest in Manifest2 format. - - 01 Jul 2004; Jeremy Huddleston which-2.14.ebuild, - which-2.16.ebuild: - virtual/glibc -> virtual/libc - - 23 Mar 2004; Martin Holzer which-2.14.ebuild: - fixing depend qa issue. see 45343. - - 02 Mar 2004; Brian Jackson which-2.16.ebuild: - adding initial s390 support - - 15 Jan 2004; Jon Portnoy which-2.16.ebuild : - Stable on AMD64. - - 09 Jan 2004; Aron Griffis which-2.16.ebuild: - stable on alpha - - 28 Dec 2003; Joshua Kinard which-2.16.ebuild: - Move to mips stable (~mips -> mips) - - 14 Dec 2003; Guy Martin which-2.16.ebuild: - Marked stable on hppa. - - 27 Nov 2003; Christian Birchinger which-2.16.ebuild: - Added sparc stable keyword - -*which-2.16 (15 Sep 2003) - - 15 Sep 2003; Daniel Ahlberg which-2.16.ebuild: - Version bump - -*which-2.15 (12 Sep 2003) - - 12 Sep 2003; Seemant Kulleen which-2.15.ebuild: - version bump - - 20 Feb 2003; Zach Welch which-2.14 : - Added arm to keywords. - - 09 Feb 2003; Guy Martin which-2.14 : - Added hppa to keywords. - - 06 Dec 2002; Rodney Rees : changed sparc ~sparc keywords - -*which-2.14 (26 Jul 2002) - - 19 Jan 2003; Jan Seidel : - Added mips to keywords - - 04 Aug 2002; Calum Selkirk which-2.12-r2.ebuild - which-2.13.ebuild which-2.14.ebuild : - - Added ppc to KEYWORDS. - - 26 Jul 2002; Maik Schreiber : - - New version. - -*which-2.12-r2.ebuild (14 Jul 2002) - - 14 Jul 2002; Daniel Ahlberg which-2.12-r2.ebuild: - Added LICENSE, KEYWORDS, SLOT. - -*which-2.13 (14 Jul 2002) - - 14 Jul 2002; Daniel Ahlberg which-2.13.ebuild: - Added LICENSE, KEYWORDS, SLOT. diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/which/Manifest b/sdk_container/src/third_party/portage-stable/sys-apps/which/Manifest index 4de5c6b1c3..75aa5ac8b2 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/which/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-apps/which/Manifest @@ -1,6 +1 @@ -DIST which-2.20.tar.gz 135372 SHA256 d417b65c650d88ad26a208293c1c6e3eb60d4b6d847f01ff8f66aca63e2857f8 SHA512 29445cd6072814d3a6179b53b8f9e7e3fc8a27b77315f2a04171e177397b91ff80a97db8806fc6b1f08dab8cbca6f208d9d7845858268b121b3af396a4a9062e WHIRLPOOL 35ca3dfc47e6112a2827188b979bc19d369f69f5841dca445039036e6fa5423b0e4e9efddd370f92da16a3873523bf37f7bdf68b748fc78e5b7991290875c49d -DIST which-2.21.tar.gz 149305 SHA256 f4a245b94124b377d8b49646bf421f9155d36aa7614b6ebf83705d3ffc76eaad SHA512 d2f04a5c5291f2d7d1226982da7cf999d36cfe24d3f7bda145508efcfb359511251d3c68b860c0ddcedd66b15a0587b648a35ab6d1f173707565305c506dfc61 WHIRLPOOL e1712d2f2b48467300f5947d0a72c0cf759bc33001661ba41cd57cefe21cb9974cc318748d76ff73c71fb869c4d7a445973ad95777ab380f673c85095360fd57 -EBUILD which-2.20-r1.ebuild 762 SHA256 915e30f5c31fbad9574601df0f01ca3fe5c817944ac9d76aa6bb6f0852991e3a SHA512 3a9084aab1834f9905c18e2af6edaa358f713e7b6bb982888ff977752fa1a65165f960e044dc90b4469eaede582c3b7e4b40e5c6ef61626fd1c1b4c44ad76d5c WHIRLPOOL bcc5c72366dee9552c7d38ef8faadda95ad63986147667a48eb69939e469b7dc409d737cb2070fb09d9854c17e072a2988df6ce6946e96f3e447c814bcf4f5f9 -EBUILD which-2.21.ebuild 775 SHA256 23ad2335c18db9b8ec4f44e944c7a6a8fce49720112bbae737e279e760e4c449 SHA512 1582557047a43ca050ad0ac789b6fdec49ede33796abc699d4db8150d1185e4a1b692e94d3063cff5e1bd4bb840f391e3ab0735566b654e5a33729607f9f426e WHIRLPOOL b1626b61bd0d1025f76475726fd924de79253b926e111af037f7a612710d5f2db8c868f1dd2aa21ce4753a076442200cafac4b871e366613a158ad60ebace727 -MISC ChangeLog 6083 SHA256 35b22ff565712767e514c94500a653f01263f27054ce4e26760c7b3a0c6389cb SHA512 94f51ab2182652d46bf6280966ae9a663ba990fdb9506a379d29146ce6cc9d68c6c173ce8599352abaa6baa041ea9af5b4557c2ff988542d90281753bd93ea14 WHIRLPOOL 7c0c7f7a840df07298d88175cea8b90da04e92b403201dde48969d393a9e30ac417d2daf485f0286879f14ea0e00e24041d4bc3f61d254dee285f1cdd7e694ca -MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52 +DIST which-2.21.tar.gz 149305 BLAKE2B 355888b0dfe3e4e1679a8a9e1255a935fa48be220408abc441fae69fe0b26bd39e0544ed20e75497ed5bccaa75e788d9aec17007c668f15eaf6b1599faa131a0 SHA512 d2f04a5c5291f2d7d1226982da7cf999d36cfe24d3f7bda145508efcfb359511251d3c68b860c0ddcedd66b15a0587b648a35ab6d1f173707565305c506dfc61 diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/which/metadata.xml b/sdk_container/src/third_party/portage-stable/sys-apps/which/metadata.xml index 96a2d58636..73dda144f9 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/which/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/sys-apps/which/metadata.xml @@ -1,5 +1,8 @@ - + -base-system + + base-system@gentoo.org + Gentoo Base System + diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/which/which-2.20-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/which/which-2.20-r1.ebuild deleted file mode 100644 index 640bfed058..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-apps/which/which-2.20-r1.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="4" - -inherit flag-o-matic toolchain-funcs - -DESCRIPTION="Prints out location of specified executables that are in your path" -HOMEPAGE="https://carlowood.github.io/which/" -SRC_URI="https://carlowood.github.io/which/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="" - -src_prepare() { - append-lfs-flags -} - -src_configure() { - tc-export AR - default -} diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/which/which-2.21.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/which/which-2.21.ebuild index 6eabd01a7a..a0a57a10d2 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/which/which-2.21.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/which/which-2.21.ebuild @@ -1,8 +1,7 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -# $Id$ -EAPI="4" +EAPI=7 inherit flag-o-matic toolchain-funcs @@ -12,14 +11,10 @@ SRC_URI="https://carlowood.github.io/which/${P}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="" - -src_prepare() { - append-lfs-flags -} +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" src_configure() { + append-lfs-flags tc-export AR default }