Merge updates from master

2026-09-24 04:59:14 -07:00 · 2024-06-20 22:03:47 +00:00
parent 9f6d428f4d 8cb2607019
commit c37a4b9f53
22 changed files with 30 additions and 19 deletions
--- a/app-shells/bash/bash-5.2_p26-r5.ebuild
+++ b/app-shells/bash/bash-5.2_p26-r5.ebuild
@@ -65,7 +65,7 @@ S=${WORKDIR}/${MY_P}
 LICENSE="GPL-3+"
 SLOT="0"
 if (( PLEVEL >= 0 )); then
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 IUSE="afs bashlogger examples mem-scramble +net nls plugins pgo +readline"

--- 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 )"

--- a/dev-java/checker-framework-qual/checker-framework-qual-3.43.0.ebuild
+++ b/dev-java/checker-framework-qual/checker-framework-qual-3.43.0.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/checker-framework-checker-framework-${PV}/checker-qual"

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"

 DEPEND=">=virtual/jdk-1.8:*"
 RDEPEND=">=virtual/jre-1.8:*"
--- a/dev-java/error-prone-annotations/error-prone-annotations-2.27.1-r1.ebuild
+++ b/dev-java/error-prone-annotations/error-prone-annotations-2.27.1-r1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/error-prone-${PV}/annotations"

 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"

 DEPEND=">=virtual/jdk-11:*"
 RDEPEND=">=virtual/jre-1.8:*"
--- a/dev-java/guava-testlib/guava-testlib-33.2.0.ebuild
+++ b/dev-java/guava-testlib/guava-testlib-33.2.0.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/guava-${PV}"

 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"

 CP_DEPEND="
 	>=dev-java/error-prone-annotations-2.27.1:0
--- a/dev-java/guava/guava-33.2.0.ebuild
+++ b/dev-java/guava/guava-33.2.0.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${P}"

 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"

 CP_DEPEND="
 	>=dev-java/error-prone-annotations-2.27.1:0
--- a/dev-java/j2objc-annotations/j2objc-annotations-3.0.0-r1.ebuild
+++ b/dev-java/j2objc-annotations/j2objc-annotations-3.0.0-r1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/j2objc-${PV}/annotations"

 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"

 DEPEND=">=virtual/jdk-11:*"
 RDEPEND=">=virtual/jre-1.8:*"
--- a/dev-libs/cJSON/cJSON-1.7.18.ebuild
+++ b/dev-libs/cJSON/cJSON-1.7.18.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/DaveGamble/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"

--- a/dev-php/PEAR-Auth_SASL/PEAR-Auth_SASL-1.2.0.ebuild
+++ b/dev-php/PEAR-Auth_SASL/PEAR-Auth_SASL-1.2.0.ebuild
@@ -9,5 +9,5 @@ DESCRIPTION="Abstraction of various SASL mechanism responses"

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm ~hppa ~ppc64 ~s390 sparc x86"
+KEYWORDS="amd64 arm ~hppa ppc64 ~s390 sparc x86"
 RDEPEND="dev-php/PEAR-PEAR"
--- a/dev-php/PEAR-Structures_Graph/PEAR-Structures_Graph-1.2.0.ebuild
+++ b/dev-php/PEAR-Structures_Graph/PEAR-Structures_Graph-1.2.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://pear.php.net/get/${MY_P}.tgz"
 S="${WORKDIR}/${MY_P}"
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ppc64 ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ppc64 ~s390 sparc x86"

 RDEPEND="dev-lang/php:*"
 PDEPEND="dev-php/PEAR-PEAR"
--- a/dev-tex/bibtexu/bibtexu-4.00_p20230311.ebuild
+++ b/dev-tex/bibtexu/bibtexu-4.00_p20230311.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://mirrors.ctan.org/systems/texlive/Source/texlive-${PV#*_p}-sourc

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="doc source"

 RDEPEND="
--- a/dev-tex/glossaries/glossaries-4.53.ebuild
+++ b/dev-tex/glossaries/glossaries-4.53.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://dev.gentoo.org/~flow/distfiles/glossaries/${P}.zip"

 LICENSE="LPPL-1.2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="doc examples"

 RDEPEND="
--- a/dev-tex/latex-beamer/latex-beamer-3.71.ebuild
+++ b/dev-tex/latex-beamer/latex-beamer-3.71.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/beamer-${PV}"

 LICENSE="GPL-2 FDL-1.2 LPPL-1.3c"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="doc"

 BDEPEND="dev-texlive/texlive-latex"
--- a/dev-tex/pgf/pgf-3.1.10.ebuild
+++ b/dev-tex/pgf/pgf-3.1.10.ebuild
@@ -14,7 +14,7 @@ SRC_URI="

 LICENSE="GPL-2 LPPL-1.3c FDL-1.2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="doc source"

 RDEPEND="dev-texlive/texlive-latexrecommended"
--- a/media-gfx/xdot/xdot-1.4.ebuild
+++ b/media-gfx/xdot/xdot-1.4.ebuild
@@ -11,7 +11,7 @@ EGIT_REPO_URI="https://github.com/jrfonseca/${MY_PN}"
 if [[ ${PV} = 9999* ]]; then
 	GIT_ECLASS="git-r3"
 else
-	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
 	MY_P="${MY_PN}-${PV}"
 	S="${WORKDIR}/${MY_P}"
 	SRC_URI="https://github.com/jrfonseca/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,13 @@

 #--- END OF EXAMPLES ---

+# James Le Cuirot <chewi@gentoo.org> (2024-06-20)
+# Ancient, dead upstream, X11-based, probably doesn't work any more, and there
+# are better ways of running games in different sessions now.
+# Removal on 2024-07-20.  Bug #934640.
+games-util/xgame
+games-util/xgame-gtk2
+
 # James Le Cuirot <chewi@gentoo.org> (2024-06-20)
 # Apparently a good game, but you cannot buy the full Linux version any more.
 # Get the HD version from Steam or the Windows original from GOG instead.
--- a/sys-apps/man-pages/man-pages-6.06.ebuild
+++ b/sys-apps/man-pages/man-pages-6.06.ebuild
@@ -100,6 +100,8 @@ src_unpack() {
 		verify-sig_verify_detached - "${DISTDIR}"/${P}.tar.sign \
 			< <(xz -cd "${DISTDIR}"/${P}.tar.xz | tee >(tar -x))
 		assert "Unpack failed"
+
+		unpack man-pages-gentoo-${GENTOO_PATCH}.tar.bz2
 	else
 		default
 	fi
--- a/sys-apps/man-pages/man-pages-9999.ebuild
+++ b/sys-apps/man-pages/man-pages-9999.ebuild
@@ -100,6 +100,8 @@ src_unpack() {
 		verify-sig_verify_detached - "${DISTDIR}"/${P}.tar.sign \
 			< <(xz -cd "${DISTDIR}"/${P}.tar.xz | tee >(tar -x))
 		assert "Unpack failed"
+
+		unpack man-pages-gentoo-${GENTOO_PATCH}.tar.bz2
 	else
 		default
 	fi
--- a/sys-libs/readline/readline-8.2_p10.ebuild
+++ b/sys-libs/readline/readline-8.2_p10.ebuild
@@ -83,7 +83,7 @@ fi
 LICENSE="GPL-3+"
 SLOT="0/8"  # subslot matches SONAME major
 if is_release ; then
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 IUSE="static-libs +unicode utils"

--- a/sys-process/iotop-c/iotop-c-1.26.ebuild
+++ b/sys-process/iotop-c/iotop-c-1.26.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/iotop-${PV}"

 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc x86"

 RDEPEND="
 	sys-libs/ncurses:=
--- a/x11-plugins/wmcp/wmcp-1.2.8-r2.ebuild
+++ b/x11-plugins/wmcp/wmcp-1.2.8-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ~ppc ~sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc ~sparc x86"

 RDEPEND="x11-libs/libX11
 	x11-libs/libXext
--- 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