diff options
author | Repository mirror & CI <repomirrorci@gentoo.org> | 2024-06-20 07:34:01 +0000 |
---|---|---|
committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2024-06-20 07:34:01 +0000 |
commit | 220f723bf4856089f221fec10997b2593d8e2b11 (patch) | |
tree | e2393c293d6a3b85cfb7e7806c47ff8fe7b6b387 | |
parent | 2024-06-20 07:19:12 UTC (diff) | |
parent | readme.gentoo-r1.eclass: use two spaces after full stop (diff) | |
download | gentoo-220f723bf4856089f221fec10997b2593d8e2b11.tar.gz gentoo-220f723bf4856089f221fec10997b2593d8e2b11.tar.bz2 gentoo-220f723bf4856089f221fec10997b2593d8e2b11.zip |
Merge updates from master
-rw-r--r-- | app-backup/rdiff-backup/rdiff-backup-2.2.6.ebuild | 2 | ||||
-rw-r--r-- | app-crypt/easy-rsa/easy-rsa-3.2.0.ebuild | 2 | ||||
-rw-r--r-- | app-text/tessdata_fast/tessdata_fast-4.1.0.ebuild | 2 | ||||
-rw-r--r-- | dev-db/redis/redis-7.2.5.ebuild | 2 | ||||
-rw-r--r-- | eclass/readme.gentoo-r1.eclass | 12 | ||||
-rw-r--r-- | net-dns/dnssec-root/dnssec-root-20210902.ebuild | 2 | ||||
-rw-r--r-- | sys-apps/util-linux/util-linux-2.40.1-r3.ebuild | 14 | ||||
-rw-r--r-- | sys-apps/util-linux/util-linux-9999.ebuild | 14 | ||||
-rw-r--r-- | x11-plugins/wmmp3/wmmp3-0.12-r2.ebuild | 4 | ||||
-rw-r--r-- | x11-plugins/wmweather/wmweather-2.4.8.ebuild | 2 |
10 files changed, 20 insertions, 36 deletions
diff --git a/app-backup/rdiff-backup/rdiff-backup-2.2.6.ebuild b/app-backup/rdiff-backup/rdiff-backup-2.2.6.ebuild index 259082ffc737..b10de32276e8 100644 --- a/app-backup/rdiff-backup/rdiff-backup-2.2.6.ebuild +++ b/app-backup/rdiff-backup/rdiff-backup-2.2.6.ebuild @@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/rdiff-backup/rdiff-backup" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" # Tests use a tox environment and separate steps for test env preparation RESTRICT="test" diff --git a/app-crypt/easy-rsa/easy-rsa-3.2.0.ebuild b/app-crypt/easy-rsa/easy-rsa-3.2.0.ebuild index dfc60f804c7f..caa7903176db 100644 --- a/app-crypt/easy-rsa/easy-rsa-3.2.0.ebuild +++ b/app-crypt/easy-rsa/easy-rsa-3.2.0.ebuild @@ -9,7 +9,7 @@ SRC_URI="https://github.com/OpenVPN/easy-rsa/archive/v${PV}.tar.gz -> ${P}.tar.g LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" +KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc ~x86" DEPEND=">=dev-libs/openssl-0.9.6:0=" RDEPEND="${DEPEND}" diff --git a/app-text/tessdata_fast/tessdata_fast-4.1.0.ebuild b/app-text/tessdata_fast/tessdata_fast-4.1.0.ebuild index fdbd66e4efdc..4208ea595bfb 100644 --- a/app-text/tessdata_fast/tessdata_fast-4.1.0.ebuild +++ b/app-text/tessdata_fast/tessdata_fast-4.1.0.ebuild @@ -12,7 +12,7 @@ SRC_URI="${URI_PREFIX}eng.traineddata -> eng.traineddata-${P} LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm arm64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86" IUSE="+osd" RDEPEND="!app-text/tessdata_best diff --git a/dev-db/redis/redis-7.2.5.ebuild b/dev-db/redis/redis-7.2.5.ebuild index b82b9e409b2f..ca63086bc02b 100644 --- a/dev-db/redis/redis-7.2.5.ebuild +++ b/dev-db/redis/redis-7.2.5.ebuild @@ -17,7 +17,7 @@ SRC_URI="https://download.redis.io/releases/${P}.tar.gz" LICENSE="BSD Boost-1.0" SLOT="0/$(ver_cut 1-2)" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~amd64 ~arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" IUSE="+jemalloc selinux ssl systemd tcmalloc test" RESTRICT="!test? ( test )" diff --git a/eclass/readme.gentoo-r1.eclass b/eclass/readme.gentoo-r1.eclass index 202ba31f4f70..48023d9c049f 100644 --- a/eclass/readme.gentoo-r1.eclass +++ b/eclass/readme.gentoo-r1.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: readme.gentoo-r1.eclass @@ -10,7 +10,7 @@ # @BLURB: install a doc file shown via elog messages # @DESCRIPTION: # An eclass for installing a README.gentoo doc file recording tips -# shown via elog messages. With this eclass, those elog messages will only be +# shown via elog messages. With this eclass, those elog messages will only be # shown at first package installation and a file for later reviewing will be # installed under /usr/share/doc/${PF} # @@ -34,8 +34,8 @@ esac # @DEFAULT_UNSET # @DESCRIPTION: # If non-empty, DOC_CONTENTS information will be strictly respected, -# not getting it automatically formatted by fmt. If empty, it will -# rely on fmt for formatting and 'echo -e' options to tweak lines a bit. +# not getting it automatically formatted by fold. If empty, it will +# rely on fold for formatting and 'echo -e' options to tweak lines a bit. # @ECLASS_VARIABLE: FORCE_PRINT_ELOG # @DEFAULT_UNSET @@ -50,7 +50,7 @@ esac # @FUNCTION: readme.gentoo_create_doc # @DESCRIPTION: # Create doc file with ${DOC_CONTENTS} variable (preferred) and, if not set, -# look for "${FILESDIR}/README.gentoo" contents. You can use +# look for "${FILESDIR}/README.gentoo" contents. You can use # ${FILESDIR}/README.gentoo-${SLOT} also. # Usually called at src_install phase. readme.gentoo_create_doc() { @@ -84,7 +84,7 @@ readme.gentoo_create_doc() { # @FUNCTION: readme.gentoo_print_elog # @DESCRIPTION: -# Print elog messages with "${T}"/README.gentoo contents. They will be +# Print elog messages with "${T}"/README.gentoo contents. They will be # shown only when package is installed at first time. # Usually called at pkg_postinst phase. # diff --git a/net-dns/dnssec-root/dnssec-root-20210902.ebuild b/net-dns/dnssec-root/dnssec-root-20210902.ebuild index 69d9b0620c5e..bf9a30588897 100644 --- a/net-dns/dnssec-root/dnssec-root-20210902.ebuild +++ b/net-dns/dnssec-root/dnssec-root-20210902.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://data.iana.org/root-anchors/root-anchors.xml -> root-anchors-${P LICENSE="public-domain" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos" +KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos" IUSE="" BDEPEND=">=dev-perl/XML-XPath-1.420.0" diff --git a/sys-apps/util-linux/util-linux-2.40.1-r3.ebuild b/sys-apps/util-linux/util-linux-2.40.1-r3.ebuild index 340527c06ae4..ac289f40eb68 100644 --- a/sys-apps/util-linux/util-linux-2.40.1-r3.ebuild +++ b/sys-apps/util-linux/util-linux-2.40.1-r3.ebuild @@ -116,18 +116,10 @@ src_unpack() { fi if use verify-sig ; then - mkdir "${T}"/verify-sig || die - pushd "${T}"/verify-sig &>/dev/null || die - # Upstream sign the decompressed .tar - # Let's do it separately in ${T} then cleanup to avoid external - # effects on normal unpack. - cp "${DISTDIR}"/${MY_P}.tar.xz . || die - xz -d ${MY_P}.tar.xz || die - verify-sig_verify_detached ${MY_P}.tar "${DISTDIR}"/${MY_P}.tar.sign - - popd &>/dev/null || die - rm -r "${T}"/verify-sig || die + verify-sig_verify_detached \ + <(xz -cd "${DISTDIR}"/${MY_P}.tar.xz) \ + "${DISTDIR}"/${MY_P}.tar.sign fi default diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild index 90d69b34f877..c9f50b8ca79a 100644 --- a/sys-apps/util-linux/util-linux-9999.ebuild +++ b/sys-apps/util-linux/util-linux-9999.ebuild @@ -116,18 +116,10 @@ src_unpack() { fi if use verify-sig ; then - mkdir "${T}"/verify-sig || die - pushd "${T}"/verify-sig &>/dev/null || die - # Upstream sign the decompressed .tar - # Let's do it separately in ${T} then cleanup to avoid external - # effects on normal unpack. - cp "${DISTDIR}"/${MY_P}.tar.xz . || die - xz -d ${MY_P}.tar.xz || die - verify-sig_verify_detached ${MY_P}.tar "${DISTDIR}"/${MY_P}.tar.sign - - popd &>/dev/null || die - rm -r "${T}"/verify-sig || die + verify-sig_verify_detached \ + <(xz -cd "${DISTDIR}"/${MY_P}.tar.xz) \ + "${DISTDIR}"/${MY_P}.tar.sign fi default diff --git a/x11-plugins/wmmp3/wmmp3-0.12-r2.ebuild b/x11-plugins/wmmp3/wmmp3-0.12-r2.ebuild index 1118757da360..a2be7f324c98 100644 --- a/x11-plugins/wmmp3/wmmp3-0.12-r2.ebuild +++ b/x11-plugins/wmmp3/wmmp3-0.12-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,7 +9,7 @@ SRC_URI="https://www.dockapps.net/download/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~sparc ~x86" +KEYWORDS="~amd64 ppc ~sparc ~x86" IUSE="" RDEPEND="x11-libs/libX11 diff --git a/x11-plugins/wmweather/wmweather-2.4.8.ebuild b/x11-plugins/wmweather/wmweather-2.4.8.ebuild index 2fb481c9a1c0..2ebe3e7ccfc8 100644 --- a/x11-plugins/wmweather/wmweather-2.4.8.ebuild +++ b/x11-plugins/wmweather/wmweather-2.4.8.ebuild @@ -10,7 +10,7 @@ S="${WORKDIR}/${P}/src" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~amd64 ~mips ~ppc ppc64 ~sparc ~x86" RDEPEND="x11-libs/libX11 x11-libs/libXext |