gentoo resync : 20.03.2022

4 files changed, 4 insertions, 123 deletions

diff --git a/x11-terms/rxvt-unicode/Manifest b/x11-terms/rxvt-unicode/Manifest
index fced9ee09e8d..42f5a585ef3a 100644
--- a/x11-terms/rxvt-unicode/Manifest
+++ b/x11-terms/rxvt-unicode/Manifest
@@ -2,10 +2,7 @@ AUX rxvt-unicode-9.06-case-insensitive-fs.patch 238 BLAKE2B 887eec8ec419900765ed
 AUX rxvt-unicode-9.21-xsubpp.patch 640 BLAKE2B 51b9f626436153239ca98df1094c5bbadaca463cf3624d39094cf5dce75a42c23568584292cd55b891439a45bc7d9e3fbf098ec80743b44267e6c3c1d0b339ca SHA512 70f4c5cb7b6a440f009f693c4dc2f8595051e198250d375cd18704c35059596d77938a3d062740bd26f947bfebdb67ea7d46f59f8cbf08fc73193a62267723ec
 AUX urxvtd.service 145 BLAKE2B 9199c81f02ff161caf6f72bac95808d4ba584bf09fb68cf7fef1bdf883873fe360816d8736835987a61c1cf0ac1be469aa47f2b74e96d8215a3ac17de896d6a5 SHA512 a77606d11e80c8d117917ab34a6d2ca430c667372ee713cf8519e49df4d972f289399d49bd808a9d31fa343d11c2fd2eb761b813be3f2892784d1dd9c281fc38
 AUX urxvtd.socket 133 BLAKE2B d685c78de25a3f2d661f180a6a5cc227c500e873dab049587f0742330910c3867f60871a96a237787d85f66b8999b397281b36ed9b92bda2422e1e2295accfee SHA512 20c7d7a00bd41deefb738b6795ecbea8098ec81d3356cceab4de39408de3552d385fc48ef74a087f3724d436b77de54adb67d0858a0949b9595820ee3d9cf7e4
-DIST rxvt-unicode-9.26.tar.bz2 904950 BLAKE2B 1790d02eeadf630cc9bc718288af2f6bd19c3e320d3dbfa44c8cef516c8e790e0abfbfe4e557795749ddd3ec41b8358f6eac623c060240f091b3e84a549151ad SHA512 35560b57730e17c9542ea4a615fd86ce703c4e6421323e8fe1570007737a880fde90d17943e5af9e170be4111b9769f4aa7e57efca5428421fdc1c299112f8e0
-DIST rxvt-unicode-9.26_24-bit-color_aur-20210516+eautoreconf.patch.xz 11716 BLAKE2B 7e18b0f884dbb9574515db8cfb4e1521e1e3287ac194750db288409c7e4d0bb120964e4559ce7e3b91e169935ded93f3af3045fc7c1737a5a6de2710ee2e107b SHA512 8cbcc1c04bdb83996ce08ece559ef9e7f5f530140a2a66291e0ffd049808da60787a68520b4a990dc12e1272de861a85b199ddd10ac8b245eafbfe16dc521199
 DIST rxvt-unicode-9.29_24-bit-color_aur-9.26-20210712.patch.xz 7568 BLAKE2B 8ea5d813e00fd4012d145acf70e3d9b0974dddffd203fbec4bf06a0da1c9368ec316fc2903dccae3a5d71d684fd93b2a09ed208f26be1e85f77c702494db4e54 SHA512 baa226ca9adf6025a72dea925ec3be16186502bb4aab21dd61ef1f7c3e2eb793e7a1dc9619ed8228166758daa2879a465da2ace3f3b14545808955388bd2b74b
 DIST rxvt-unicode-9.30.tar.bz2 877186 BLAKE2B 645164e37e9e484c66f5047836689e4e4727575dfdcbefc64affb70d9110497529fdcc7d476f77737efed5cee4af314e1e1ccbcb42b506bb7e653b827c24a0c7 SHA512 048d5f635a61bc1a739d5cbc09e7a9f77cee18c81df468ce1ff0a62866ced06fc4ec258bb015d2484a7e7bad2339f0bdd79bd824d649c2553a80bdef9f199e99
-EBUILD rxvt-unicode-9.26-r2.ebuild 3021 BLAKE2B 80d258c5d5e5319b98370e9d59d0200e5a7fa8540a4c0b1a3884004d7399e0d3c22c0555554cd81c8a23a5f854c322451adfd447f549cb5fe268d2816fec8070 SHA512 ed19df722eb87d6c18bbe0155e8a5e15738d3353a7fbfccf95baf769eb0ca39bc5e3b24b75acbab086cdd65a1c181bbe1c3f1f15a9b0848f99602d332ed50369
-EBUILD rxvt-unicode-9.30.ebuild 3069 BLAKE2B 914399f6f4faf9c0d495551e06d6c4e22ed29a5ae508b54ee6eee7651d740895bb03d131410f0cc497dd3230f9e3f9595f48c4bd8bd4744973385cd70f4e2f25 SHA512 94d49a9038ad2f7ebd7db755717743c0ec366e968c6252053d59b6327275978e7608e482a28842d1e4168a042df2e319c22949096195c1ede7d1f631b258aac4
-MISC metadata.xml 1577 BLAKE2B ca4f7c5d7697dd6a3bb087b59a1fa76501372cb802061285b0c35c55a014cd044a2c1a67db94d4f5c3cf86afc5307e3052dbd533287664fa3f855f79bd575e77 SHA512 65ee848f71db806ae5e8016243d328b786b2135705e4d2d5fae30e8b018b1d215327a8310be2845b0958c6af92be75082bc16e5007f1f2b888dba74e9f8e74b8
+EBUILD rxvt-unicode-9.30.ebuild 3044 BLAKE2B 9f3f8da493490bb0a5900a9f00ee9fba111fa482fa193bc80cea2d1c6f8a89ef5fe3acddc5419127382c92d965dcbe2c547401bd3f3a84c4d98763d1e952401b SHA512 a1d0390fbd0df39467ce69a4701ca12576d8759e01ae27d3a66c2e2bba8fbc3b7bfd03da057249671087e85b6530e41fda40ea2a390839740fd0fb94e66b7be1
+MISC metadata.xml 1483 BLAKE2B 0b1ff5db1ccf4276d822923c1140ed9ac7509c5173cb132013749104fd3ba59278239de3097f2fdd7511e1a6c42406673e0b43b4242879c2cf78cdb6b8a1aef3 SHA512 ff7c2255e05af9d8c25c1c754f8e6f77983cb636900eb151f976a2289969a56587a9100fe656fdd0d946cace26aa836042e1808be5a74aa93dcaed03fea701a0
diff --git a/x11-terms/rxvt-unicode/metadata.xml b/x11-terms/rxvt-unicode/metadata.xml
index fc597b93c849..875018610709 100644
--- a/x11-terms/rxvt-unicode/metadata.xml
+++ b/x11-terms/rxvt-unicode/metadata.xml
@@ -22,8 +22,6 @@
 		<flag name="mousewheel">Enable scrolling via mouse wheel or buttons 4 and 5</flag>
 		<flag name="perl">Enable perl script support. You can still disable this at runtime with -pe ""</flag>
 		<flag name="unicode3">Use 21 instead of 16 bits to represent unicode characters</flag>
-		<flag name="utmp">Enable utmp support</flag>
-		<flag name="wtmp">Enable wtmp support</flag>
 	</use>
 	<upstream>
 		<remote-id type="cpe">cpe:/a:rxvt-unicode:rxvt-unicode</remote-id>
diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-9.26-r2.ebuild b/x11-terms/rxvt-unicode/rxvt-unicode-9.26-r2.ebuild
deleted file mode 100644
index 131c98ce2cc3..000000000000
--- a/x11-terms/rxvt-unicode/rxvt-unicode-9.26-r2.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop systemd prefix
-
-COLOUR_PATCH_NAME="${PN}-9.26_24-bit-color_aur-20210516+eautoreconf.patch"
-
-DESCRIPTION="rxvt clone with xft and unicode support"
-HOMEPAGE="http://software.schmorp.de/pkg/rxvt-unicode.html"
-SRC_URI="http://dist.schmorp.de/rxvt-unicode/Attic/${P}.tar.bz2
-	https://dev.gentoo.org/~marecki/dists/${PN}/${COLOUR_PATCH_NAME}.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
-IUSE="24-bit-color 256-color blink fading-colors +font-styles gdk-pixbuf iso14755 +mousewheel
-	+perl startup-notification unicode3 +utmp +wtmp xft"
-
-RDEPEND=">=sys-libs/ncurses-5.7-r6:=
-	media-libs/fontconfig
-	x11-libs/libX11
-	x11-libs/libXrender
-	x11-libs/libXt
-	gdk-pixbuf? ( x11-libs/gdk-pixbuf )
-	kernel_Darwin? ( dev-perl/Mac-Pasteboard )
-	perl? ( dev-lang/perl:= )
-	startup-notification? ( x11-libs/startup-notification )
-	xft? ( x11-libs/libXft )"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-9.06-case-insensitive-fs.patch
-	"${FILESDIR}"/${PN}-9.21-xsubpp.patch
-)
-DOCS=(
-	Changes
-	README.FAQ
-	doc/README.xvt
-	doc/changes.txt
-	doc/etc/${PN}.term{cap,info}
-	doc/rxvt-tabbed
-)
-
-src_prepare() {
-	default
-
-	# Current patch is too aggressive to apply unconditionally, see Bug #801571
-	if use 24-bit-color; then
-		eapply "${WORKDIR}"/${COLOUR_PATCH_NAME}
-	fi
-
-	# kill the rxvt-unicode terminfo file - #192083
-	sed -i -e "/rxvt-unicode.terminfo/d" doc/Makefile.in || die "sed failed"
-
-	# use xsubpp from Prefix - #506500
-	hprefixify -q '"' -w "/xsubpp/" src/Makefile.in
-}
-
-src_configure() {
-	# --enable-everything goes first: the order of the arguments matters
-	local myconf=(
-		--enable-everything
-		$(use_enable 256-color)
-		$(use_enable blink text-blink)
-		$(use_enable fading-colors fading)
-		$(use_enable font-styles)
-		$(use_enable gdk-pixbuf pixbuf)
-		$(use_enable iso14755)
-		$(use_enable mousewheel)
-		$(use_enable perl)
-		$(use_enable startup-notification)
-		$(use_enable unicode3)
-		$(use_enable utmp)
-		$(use_enable wtmp)
-		$(use_enable xft)
-	)
-	if use 24-bit-color; then
-		myconf+=( --enable-24-bit-color )
-	fi
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	default
-
-	sed -i \
-		-e 's/RXVT_BASENAME = "rxvt"/RXVT_BASENAME = "urxvt"/' \
-		"${S}"/doc/rxvt-tabbed || die
-}
-
-src_install() {
-	default
-
-	systemd_douserunit "${FILESDIR}"/urxvtd.service
-	systemd_douserunit "${FILESDIR}"/urxvtd.socket
-
-	make_desktop_entry urxvt rxvt-unicode utilities-terminal \
-		"System;TerminalEmulator"
-}
-
-pkg_postinst() {
-	if use 24-bit-color; then
-		ewarn
-		ewarn "You have enabled 24-bit colour support in ${PN}, which is UNOFFICIAL and INCOMPLETE."
-		ewarn "You may or may not encounter visual glitches or stability issues. When in doubt,"
-		ewarn "rebuild =${CATEGORY}/${PF} with USE=-24-bit-color (the default setting)."
-		ewarn
-	fi
-}
diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-9.30.ebuild b/x11-terms/rxvt-unicode/rxvt-unicode-9.30.ebuild
index 8ed6dbcc8ffd..627d10b5c1db 100644
--- a/x11-terms/rxvt-unicode/rxvt-unicode-9.30.ebuild
+++ b/x11-terms/rxvt-unicode/rxvt-unicode-9.30.ebuild
@@ -10,11 +10,11 @@ COLOUR_PATCH_NAME="${PN}-9.29_24-bit-color_aur-9.26-20210712.patch"
 DESCRIPTION="rxvt clone with xft and unicode support"
 HOMEPAGE="http://software.schmorp.de/pkg/rxvt-unicode.html"
 SRC_URI="http://dist.schmorp.de/rxvt-unicode/Attic/${P}.tar.bz2
-	https://dev.gentoo.org/~marecki/dists/${PN}/${COLOUR_PATCH_NAME}.xz"
+	https://dev.gentoo.org/~marecki/dists/${CATEGORY}/${PN}/${COLOUR_PATCH_NAME}.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 IUSE="24-bit-color 256-color blink fading-colors +font-styles gdk-pixbuf iso14755 +mousewheel
 	perl startup-notification unicode3 xft"
 
@@ -28,7 +28,6 @@ RDEPEND=">=sys-libs/ncurses-5.7-r6:=
 	x11-libs/libXrender
 	x11-libs/libXt
 	gdk-pixbuf? ( x11-libs/gdk-pixbuf )
-	kernel_Darwin? ( dev-perl/Mac-Pasteboard )
 	perl? ( dev-lang/perl:= )
 	startup-notification? ( x11-libs/startup-notification )
 	xft? ( x11-libs/libXft )"