gentoo resync : 17.07.2021

6 files changed, 5 insertions, 259 deletions

diff --git a/app-arch/makeself/Manifest b/app-arch/makeself/Manifest
index 356299366b15..337b29352de9 100644
--- a/app-arch/makeself/Manifest
+++ b/app-arch/makeself/Manifest
@@ -1,9 +1,5 @@
-AUX makeself-2.2.0-help-header.patch 6728 BLAKE2B 7d0211074f68346ead19fd58d9440976ee0e5f0367b0776c186ced0ee77769cca7597948f2894aee68e9d3f42fb6e0e19dcdc378ce0dfe714596ab8ad705d13b SHA512 5cdee18f5190086e8421d091406df5aeefdc9fe3aaee6c26aa990b1eb7d6f415c8c8ebf67137a1b2a22470c14749d394808ed9e5a4fc6f737cd87c32651e2a8c
-AUX makeself-unpack 2814 BLAKE2B cd96049b052b46a6d5273d78e27598f73046c1a29049af406f0f82c2c301e3b8f95c40534a18313eaffb6ac7ce68cbde1d988efa3503bb46f950936706e41590 SHA512 ebfe1dd13a11cd00a853e6a4e7d6094b5f923fbe987f6b5a778fec09e00e2b2daf1e5daab0eb04850d4471019fb95f88a5d2b9d88520f5738a29997d81f2c1c3
 DIST makeself-2.4.3.tar.gz 32613 BLAKE2B 2295b6d47a8105f2b495260abb0c9ae85875c821d0291a19b5af894c1cef669f338c4e10de8128fe38008e7e08079d1f29949884f202cab680c7fd62e2f00dd9 SHA512 d404c7920c7f69ae29c7168bcf76806b6e2aae2e8916bb7feed998d031ce8b2cd205b83ad960a90b01189c97f9242eb3ef574194ba3ee51c605fe99dafbd6c13
-DIST makeself-2.4.4.tar.gz 38889 BLAKE2B eac74fa28ac39cbc6b18d11671bfa32d6c0b04b55b3603c6c928483dd64af38d416936ef242f55aa4840affd4bf7fb91c2987f87afab093816331e50f16379ab SHA512 3d4d03458f7f11a8df46340d1b489ca60d413d5ed857cc67bb8ef15335ce2848e4675e080791c26fdf29423f813d468b4b797438fe0876dad54e85c6346b9b8b
-DIST release-2.2.0.tar.gz 21640 BLAKE2B 32b06157829864918d225a136043a5c9b7c6c543351e981c0e3cdce84cbbe4c52f00870bb04d29bfd79e715c1c708b51cc9958d495a9633afb9a8d342601c20d SHA512 11cd536baed2d56405103f18a8318a202092755a74baf10730aa58dc57032e327697b1c7f76bf9bf438927093ba9ac467ffa0c4564c7f6b1d3b2b3936f34fa73
-EBUILD makeself-2.2.0-r2.ebuild 695 BLAKE2B 24c8845a3765c0540fbc61a0d479a52aa48368c5992391b24a6e50d4d21df96973fd4c24dfb37d72eade758d1350b04dcce6061603e1e36df7aad1c461440cf7 SHA512 3686991760d6bdaca0ae09db9506f6337609550052041ec60a5d1da3321ed99a08f1f5e149c56228b0086f1a664531b8df81690496bf80774fe8f7546bb08022
-EBUILD makeself-2.4.3.ebuild 942 BLAKE2B c9853c874c7653c35ab3656b80357bef22ebcee730a9f2be6eecc857302dce32dcf90e4ad5e15874babcbbd44f6331440517089a086f8c225cc1c1e2f14d490f SHA512 8357031146ec48a52bdf7957c8faa50eab5ca9fa6e68ceb6462666da63c7f2bb61892efe8bfea4ae50659dd3b60c41b7dab3669de1b0ba2131ba8fb99ec36d0c
-EBUILD makeself-2.4.4.ebuild 1171 BLAKE2B ebad131c264fd1caacb5bedeb4ff3298ff35c095db7954cf017e34d232c9631b427bea0d582a1b5b27373e16ab7d84477166fe23a401cba58d05f2f2442a8974 SHA512 e65cac5fb12545c8060434cde76c02911e0dc065ce3be4829e2cb5c051353f9d1853589b7791afbb10926d7c073315f7aba57b110f1fb5a13834c171e0000f72
+DIST makeself-2.4.5.tar.gz 39012 BLAKE2B f79cf1c087e89c4fd09f328fb795a3f8a78ee38060dbbd1590e3dcdf22a346b0c12bf6837d1636efadb2a66f6a762308de7ee9dd2fc62a7c88d417d257c5f0f6 SHA512 1dae74586f6bd5afb526801b7ffa7fc7962ff74b0f190cdd51da93c21421864b72f5fe18090cb2ff6ad27f0907fbf3aeb5545f3f70e33dbc9e505a78505f5f90
+EBUILD makeself-2.4.3.ebuild 929 BLAKE2B cf5cf22da092ef5ed0b9e9f32c237d49529ebf0be2b7d998a8109ad19613237feb6d4c8f8f72bce28d0c5da43efed7e4473c8f03d56ece72a0fb34388ebf5f8d SHA512 1eb89f4e0f5b4eeedec4f538052f6dd1bf21f515cb90ea5561f7e7eaa9e2694fad6266f36687c19f9fa3464ef87ab849271de50182ca024a703c00330409f7ef
+EBUILD makeself-2.4.5.ebuild 1158 BLAKE2B 943cb467f061b207812394cacb456070c552c549092fa2a3ec93f32a6ea108915f40dd1990662ba766f67f7e3f02b10c9056fe482dbed8114b1ef3684ced305f SHA512 1f0454d64d30047c29454a294aa156a1da0d7b02ff94d1bcd8e5f2550cf4cf19e27ac9a28f98cec2014dc119c66695817f2e83865da4c9aa32b5ea4ec543186a
 MISC metadata.xml 513 BLAKE2B 25f348226db47085523f7e1f74b1b557982acf56ba2b33252e250cc45400137be2090e29dad3b009e7b11c2d2942e564e7c499c7566c857ad5b05849553014c0 SHA512 48b0f4efee7e7dd1dc3e5bc0b2585748a15e4e2e0e41eb764709b41b4eb45d6ef98b712fc5265c2892e70b6c99c00e15542430e854811961d3acb5a803c6d5c5
diff --git a/app-arch/makeself/files/makeself-2.2.0-help-header.patch b/app-arch/makeself/files/makeself-2.2.0-help-header.patch
deleted file mode 100644
index 5726bf55f7da..000000000000
--- a/app-arch/makeself/files/makeself-2.2.0-help-header.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-From c9f605cb4a3903985f2c6f816c30c1edf728c1b5 Mon Sep 17 00:00:00 2001
-From: Jon Salz <jsalz@google.com>
-Date: Mon, 27 Jan 2014 16:04:33 +0800
-Subject: [PATCH] Add --help-header option to prepend a string to the archive's
- --help.
-
----
- makeself-header.sh |  3 ++-
- makeself.sh        | 71 ++++++++++++++++++++++++++++++------------------------
- 2 files changed, 41 insertions(+), 33 deletions(-)
-
-diff --git a/makeself-header.sh b/makeself-header.sh
-index e3f6c11..f97758c 100755
---- a/makeself-header.sh
-+++ b/makeself-header.sh
-@@ -13,6 +13,7 @@ label="$LABEL"
- script="$SCRIPT"
- scriptargs="$SCRIPTARGS"
- licensetxt="$LICENSE"
-+helpheader='$HELPHEADER'
- targetdir="$archdirname"
- filesizes="$filesizes"
- keep="$KEEP"
-@@ -119,7 +120,7 @@ MS_dd_Progress()
- MS_Help()
- {
-     cat << EOH >&2
--Makeself version $MS_VERSION
-+\${helpheader}Makeself version $MS_VERSION
-  1) Getting help or info about \$0 :
-   \$0 --help   Print this message
-   \$0 --info   Print embedded info : title, default target directory, embedded script ...
-diff --git a/makeself.sh b/makeself.sh
-index 361d710..cb2d6f2 100755
---- a/makeself.sh
-+++ b/makeself.sh
-@@ -88,38 +88,39 @@ MS_Usage()
- {
-     echo "Usage: $0 [params] archive_dir file_name label startup_script [args]"
-     echo "params can be one or more of the following :"
--    echo "    --version | -v  : Print out Makeself version number and exit"
--    echo "    --help | -h     : Print out this help message"
--    echo "    --quiet | -q    : Do not print any messages other than errors."
--    echo "    --gzip          : Compress using gzip (default if detected)"
--    echo "    --bzip2         : Compress using bzip2 instead of gzip"
--    echo "    --pbzip2        : Compress using pbzip2 instead of gzip"
--    echo "    --xz            : Compress using xz instead of gzip"
--    echo "    --compress      : Compress using the UNIX 'compress' command"
--    echo "    --complevel lvl : Compression level for gzip xz bzip2 and pbzip2 (default 9)"
--    echo "    --base64        : Instead of compressing, encode the data using base64"
--    echo "    --nocomp        : Do not compress the data"
--    echo "    --notemp        : The archive will create archive_dir in the"
--    echo "                      current directory and uncompress in ./archive_dir"
--    echo "    --copy          : Upon extraction, the archive will first copy itself to"
--    echo "                      a temporary directory"
--    echo "    --append        : Append more files to an existing Makeself archive"
--    echo "                      The label and startup scripts will then be ignored"
--    echo "    --target dir    : Extract directly to a target directory"
--    echo "                      directory path can be either absolute or relative"
--    echo "    --current       : Files will be extracted to the current directory"
--    echo "                      Both --current and --target imply --notemp"
--    echo "    --tar-extra opt : Append more options to the tar command line"
--    echo "    --nomd5         : Don't calculate an MD5 for archive"
--    echo "    --nocrc         : Don't calculate a CRC for archive"
--    echo "    --header file   : Specify location of the header script"
--    echo "    --follow        : Follow the symlinks in the archive"
--    echo "    --noprogress    : Do not show the progress during the decompression"
--    echo "    --nox11         : Disable automatic spawn of a xterm"
--    echo "    --nowait        : Do not wait for user input after executing embedded"
--    echo "                      program from an xterm"
--    echo "    --lsm file      : LSM file describing the package"
--    echo "    --license file  : Append a license file"
-+    echo "    --version | -v     : Print out Makeself version number and exit"
-+    echo "    --help | -h        : Print out this help message"
-+    echo "    --quiet | -q       : Do not print any messages other than errors."
-+    echo "    --gzip             : Compress using gzip (default if detected)"
-+    echo "    --bzip2            : Compress using bzip2 instead of gzip"
-+    echo "    --pbzip2           : Compress using pbzip2 instead of gzip"
-+    echo "    --xz               : Compress using xz instead of gzip"
-+    echo "    --compress         : Compress using the UNIX 'compress' command"
-+    echo "    --complevel lvl    : Compression level for gzip xz bzip2 and pbzip2 (default 9)"
-+    echo "    --base64           : Instead of compressing, encode the data using base64"
-+    echo "    --nocomp           : Do not compress the data"
-+    echo "    --notemp           : The archive will create archive_dir in the"
-+    echo "                         current directory and uncompress in ./archive_dir"
-+    echo "    --copy             : Upon extraction, the archive will first copy itself to"
-+    echo "                         a temporary directory"
-+    echo "    --append           : Append more files to an existing Makeself archive"
-+    echo "                         The label and startup scripts will then be ignored"
-+    echo "    --target dir       : Extract directly to a target directory"
-+    echo "                         directory path can be either absolute or relative"
-+    echo "    --current          : Files will be extracted to the current directory"
-+    echo "                         Both --current and --target imply --notemp"
-+    echo "    --tar-extra opt    : Append more options to the tar command line"
-+    echo "    --nomd5            : Don't calculate an MD5 for archive"
-+    echo "    --nocrc            : Don't calculate a CRC for archive"
-+    echo "    --header file      : Specify location of the header script"
-+    echo "    --follow           : Follow the symlinks in the archive"
-+    echo "    --noprogress       : Do not show the progress during the decompression"
-+    echo "    --nox11            : Disable automatic spawn of a xterm"
-+    echo "    --nowait           : Do not wait for user input after executing embedded"
-+    echo "                         program from an xterm"
-+    echo "    --lsm file         : LSM file describing the package"
-+    echo "    --license file     : Append a license file"
-+    echo "    --help-header file : Add a header to the archive's --help output"
-     echo
-     echo "Do not forget to give a fully qualified startup script name"
-     echo "(i.e. with a ./ prefix if inside the archive)."
-@@ -254,6 +255,12 @@ do
- 	LSM_CMD="cat \"$2\" >> \"\$archname\""
-     if ! shift 2; then MS_Help; exit 1; fi
- 	;;
-+    --help-header)
-+	HELPHEADER=`sed -e "s/'/'\\\\\''/g" $2`
-+    if ! shift 2; then MS_Help; exit 1; fi
-+	[ -n "$HELPHEADER" ] && HELPHEADER="$HELPHEADER
-+"
-+    ;;
-     -q | --quiet)
- 	QUIET=y
- 	shift
--- 
-1.8.5.5
-
diff --git a/app-arch/makeself/files/makeself-unpack b/app-arch/makeself/files/makeself-unpack
deleted file mode 100644
index 90b98312c8b9..000000000000
--- a/app-arch/makeself/files/makeself-unpack
+++ /dev/null
@@ -1,100 +0,0 @@
-#!/bin/bash
-
-# Glue to keep unpack_makeself() unchanged
-source /lib/gentoo/functions.sh
-find_unpackable_file() { echo "$@"; }
-debug-print() { :; }
-emktemp() { mktemp "$@"; }
-die() { eerror "$*"; exit 1; }
-assert() { _pipestatus="${PIPESTATUS[*]}"; [[ "${_pipestatus// /}" -eq 0 ]] || die; }
-
-# Straight copied from unpacker.eclass ... should be kept in sync
-
-unpack_banner() {
-	echo ">>> Unpacking ${1##*/} to ${PWD}"
-}
-
-unpack_makeself() {
-	local src_input=${1:-${A}}
-	local src=$(find_unpackable_file "${src_input}")
-	local skip=$2
-	local exe=$3
-
-	[[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
-
-	unpack_banner "${src}"
-
-	if [[ -z ${skip} ]] ; then
-		local ver=$(grep -m1 -a '#.*Makeself' "${src}" | awk '{print $NF}')
-		local skip=0
-		exe=tail
-		case ${ver} in
-			1.5.*|1.6.0-nv*)	# tested 1.5.{3,4,5} ... guessing 1.5.x series is same
-				skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
-				;;
-			2.0|2.0.1)
-				skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-)
-				;;
-			2.1.1)
-				skip=$(grep -a ^offset= "${src}" | awk '{print $2}' | cut -b2-)
-				(( skip++ ))
-				;;
-			2.1.2)
-				skip=$(grep -a ^offset= "${src}" | awk '{print $3}' | head -n 1)
-				(( skip++ ))
-				;;
-			2.1.3)
-				skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
-				(( skip++ ))
-				;;
-			2.1.4|2.1.5|2.1.6|2.2.0)
-				skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
-				skip=$(head -n ${skip} "${src}" | wc -c)
-				exe="dd"
-				;;
-			*)
-				eerror "I'm sorry, but I was unable to support the Makeself file."
-				eerror "The version I detected was '${ver}'."
-				eerror "Please file a bug about the file ${src##*/} at"
-				eerror "http://bugs.gentoo.org/ so that support can be added."
-				die "makeself version '${ver}' not supported"
-				;;
-		esac
-		debug-print "Detected Makeself version ${ver} ... using ${skip} as offset"
-	fi
-	case ${exe} in
-		tail)	exe="tail -n +${skip} '${src}'";;
-		dd)		exe="dd ibs=${skip} skip=1 if='${src}'";;
-		*)		die "makeself cant handle exe '${exe}'"
-	esac
-
-	# lets grab the first few bytes of the file to figure out what kind of archive it is
-	local filetype tmpfile=$(emktemp)
-	eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}"
-	filetype=$(file -b "${tmpfile}") || die
-	case ${filetype} in
-		*tar\ archive*)
-			eval ${exe} | tar --no-same-owner -xf -
-			;;
-		bzip2*)
-			eval ${exe} | bzip2 -dc | tar --no-same-owner -xf -
-			;;
-		gzip*)
-			eval ${exe} | tar --no-same-owner -xzf -
-			;;
-		compress*)
-			eval ${exe} | gunzip | tar --no-same-owner -xf -
-			;;
-		XZ*)
-			eval ${exe} | unxz | tar --no-same-owner -xf -
-			;;
-		*)
-			eerror "Unknown filetype \"${filetype}\" ?"
-			false
-			;;
-	esac
-	assert "failure unpacking (${filetype}) makeself ${src##*/} ('${ver}' +${skip})"
-	rm "${tmpfile}"
-}
-
-for x; do unpack_makeself "$x" ; done
diff --git a/app-arch/makeself/makeself-2.2.0-r2.ebuild b/app-arch/makeself/makeself-2.2.0-r2.ebuild
deleted file mode 100644
index 04f9402991c5..000000000000
--- a/app-arch/makeself/makeself-2.2.0-r2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit unpacker
-
-DESCRIPTION="Shell script that generates a self-extractible tar.gz"
-HOMEPAGE="http://www.megastep.org/makeself/"
-SRC_URI="https://github.com/megastep/makeself/archive/release-${PV}.tar.gz"
-S="${WORKDIR}/${PN}-release-${PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ppc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="sys-apps/gentoo-functions"
-
-PATCHES=( "${FILESDIR}/${P}-help-header.patch" )
-
-src_install() {
-	dobin makeself-header.sh makeself.sh "${FILESDIR}"/makeself-unpack
-	dosym makeself.sh /usr/bin/makeself
-	doman makeself.1
-	dodoc README.md makeself.lsm
-}
diff --git a/app-arch/makeself/makeself-2.4.3.ebuild b/app-arch/makeself/makeself-2.4.3.ebuild
index 2cd2a9fa8709..32df98cc0e0c 100644
--- a/app-arch/makeself/makeself-2.4.3.ebuild
+++ b/app-arch/makeself/makeself-2.4.3.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit optfeature
 
 DESCRIPTION="Shell script that generates a self-extractible tar.gz"
-HOMEPAGE="http://www.megastep.org/makeself/"
+HOMEPAGE="https://makeself.io/"
 SRC_URI="https://github.com/megastep/makeself/archive/refs/tags/release-${PV}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}/${PN}-release-${PV}"
 
diff --git a/app-arch/makeself/makeself-2.4.4.ebuild b/app-arch/makeself/makeself-2.4.5.ebuild
index 17f5cf26fdd7..6e66645515bd 100644
--- a/app-arch/makeself/makeself-2.4.4.ebuild
+++ b/app-arch/makeself/makeself-2.4.5.ebuild
@@ -6,7 +6,7 @@ EAPI="7"
 inherit optfeature
 
 DESCRIPTION="Shell script that generates a self-extractible tar.gz"
-HOMEPAGE="http://www.megastep.org/makeself/"
+HOMEPAGE="https://makeself.io/"
 SRC_URI="https://github.com/megastep/makeself/archive/refs/tags/release-${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"