gentoo resync : 08.07.2021

3 files changed, 20 insertions, 4 deletions

diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index 64d5e3e56684..11e5f81afe55 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
diff --git a/x11-terms/rxvt-unicode/Manifest b/x11-terms/rxvt-unicode/Manifest
index 45298e377810..048b020140ca 100644
--- a/x11-terms/rxvt-unicode/Manifest
+++ b/x11-terms/rxvt-unicode/Manifest
@@ -8,7 +8,8 @@ AUX urxvtd.socket 133 BLAKE2B d685c78de25a3f2d661f180a6a5cc227c500e873dab049587f
 DIST rxvt-unicode-9.22.tar.bz2 931198 BLAKE2B ea9a12e4a8396ed6be12b4d50ae260a0376902dbd47b0628bb14ce0509c5d89f5a80370b413fdb9df9b8b81728ec26e115cbf0d88ab6e9cb2a87b03b5d79c432 SHA512 b39f1b2cbe6dd3fbd2a0ad6a9d391a2b6f49d7c5e67bc65fe44a9c86937f8db379572c67564c6e21ff6e09b447cdfd4e540544e486179e94da0e0db679c04dd9
 DIST rxvt-unicode-9.22_24-bit-color_cpixl-20201108.patch.xz 8116 BLAKE2B 27940ad42ee3f26c357a50b7fae1e1539acec71f5ff43e7ed16167d0adb175c4de20ba84880f25eec0817703d937d097fda228541d16511811efe5816109e71b SHA512 2b8bbb90c6bb223f622c1e99d62a70a812604d1f8e57cea37a8faf0af578588d3888ea8009568d623710cc03e020a69269770e23476fd9ff9e46dbd9ea23f540
 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
 EBUILD rxvt-unicode-9.22-r9.ebuild 3305 BLAKE2B 10fa2f2fc53f8da9a499703af03be15e464775ed0f0411de2da90ba669061fa846a3a0bb3f75c61da5de6c71e950e9d79c657f9bc5f542be6e0dd6e420982786 SHA512 0907a7236e52c83777d76dbc758d655b27a78778e42d5c0965715b0f3dd60dd717356dce745cf9bb557a5ee1c4ffe55cad8c2d5d599b1bac6855fe6671dc70d9
-EBUILD rxvt-unicode-9.26.ebuild 2431 BLAKE2B 03c40cb09da82783a9fb8c378d9681ecda16a9e468e6b5c15cf98492331fc391324d09d9e158aee60c068ecbbc7f0c25f1034bac944c152d539d9f41e20c9362 SHA512 bb2c3ad2379bd96478769689a3816f413f74926f1946b2f428de8a61328b440ee098f45327ddd8f128c959a49aea3104dad41e745dfa280cf46d057d4ef4efd8
+EBUILD rxvt-unicode-9.26-r1.ebuild 2991 BLAKE2B 7d1bb895119ebfd3ee8c7e3d3b3c17a3205e1dd9d8d01ca046b685e221621595e5815502fc97af44a73968a797705d1296e823878275401b7212dc1d9f3cc9f6 SHA512 1e3a66b801942e0593f2ea8705d977d9b4d644a8742479a5cd566d70e664f6143741caa86bfadc4623e9acbab143525ff7c15a4aa465ddc25d91b59a61cd9547
 EBUILD rxvt-unicode-9999.ebuild 2163 BLAKE2B bbad76d956512288ef1284526f8ea4d1c039df62868e74078a93640dae7e95361f05d0062e2cf7dcf74e6b5f799e99cf6bd0712263290d9caef92dfd058507e5 SHA512 0b8d154abbc49368df6cbe4efa50e482f7b4226507f2babcc7932ed7ff39dc7d666e544e8f80d797de0f1a1a0047e1763c81254005ca319009a568b87ce84a89
 MISC metadata.xml 1789 BLAKE2B c39987eb81fcc288562d729cd49f6dadbc17229e0b486960ca28a8ab8b039b2486cb0c5c3ded5748340f2d21448f98c836b1d62a3445f9942f1a69a9c9e3c365 SHA512 1e3670faa96a27ae4bb7ec9ad41b475c39e17756c1f53786a172af68c157a774788fee75c22685d03be70b9450664b441408b4ead18e1e267ce69770f2e5afe4
diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-9.26.ebuild b/x11-terms/rxvt-unicode/rxvt-unicode-9.26-r1.ebuild
index 981de5a0d605..4fa68cb62a3e 100644
--- a/x11-terms/rxvt-unicode/rxvt-unicode-9.26.ebuild
+++ b/x11-terms/rxvt-unicode/rxvt-unicode-9.26-r1.ebuild
@@ -5,14 +5,17 @@ EAPI=7
 
 inherit autotools desktop flag-o-matic 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"
+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 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
-IUSE="256-color blink fading-colors +font-styles gdk-pixbuf iso14755 +mousewheel
+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:=
@@ -28,11 +31,12 @@ RDEPEND=">=sys-libs/ncurses-5.7-r6:=
 DEPEND="${RDEPEND}
 	x11-base/xorg-proto"
 BDEPEND="virtual/pkgconfig"
-# WARNING: will bdepend on >=sys-devel/autoconf-2.71 (masked as of 2021-05-16) if eautoreconf has to be called
+# WARNING: will bdepend on >=sys-devel/autoconf-2.71 (masked as of 2021-07-07) if eautoreconf has to be called
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-9.06-case-insensitive-fs.patch
 	"${FILESDIR}"/${PN}-9.21-xsubpp.patch
+	"${WORKDIR}"/${COLOUR_PATCH_NAME}
 )
 DOCS=(
 	Changes
@@ -56,6 +60,7 @@ src_prepare() {
 src_configure() {
 	# --enable-everything goes first: the order of the arguments matters
 	econf --enable-everything \
+		$(use_enable 24-bit-color) \
 		$(use_enable 256-color) \
 		$(use_enable blink text-blink) \
 		$(use_enable fading-colors fading) \
@@ -88,3 +93,13 @@ src_install() {
 	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
+}