gentoo resync : 25.11.2020

4 files changed, 54 insertions, 24 deletions

diff --git a/x11-terms/rxvt-unicode/Manifest b/x11-terms/rxvt-unicode/Manifest
index 667e14c97836..feb97cafe8a9 100644
--- a/x11-terms/rxvt-unicode/Manifest
+++ b/x11-terms/rxvt-unicode/Manifest
@@ -1,7 +1,8 @@
 AUX rxvt-unicode-9.06-case-insensitive-fs.patch 238 BLAKE2B 887eec8ec419900765ede1a8b75ea0acde945275af0e524e4382610a40d1e42b2f0be9879bf7c25cb00da6ae410e554567efdcc2f43ceff52e37c44060e6c4a7 SHA512 5257b1d33e25a6a390da2f23100fc3a2b8dcc4787205273933c2ba64ecf72e663cdc0cb86273a1ffa1a87b04bbeeff9edbc8c028c521ae612722f21cf6c40762
 AUX rxvt-unicode-9.21-xsubpp.patch 640 BLAKE2B 51b9f626436153239ca98df1094c5bbadaca463cf3624d39094cf5dce75a42c23568584292cd55b891439a45bc7d9e3fbf098ec80743b44267e6c3c1d0b339ca SHA512 70f4c5cb7b6a440f009f693c4dc2f8595051e198250d375cd18704c35059596d77938a3d062740bd26f947bfebdb67ea7d46f59f8cbf08fc73193a62267723ec
 DIST rxvt-unicode-9.22.tar.bz2 931198 BLAKE2B ea9a12e4a8396ed6be12b4d50ae260a0376902dbd47b0628bb14ce0509c5d89f5a80370b413fdb9df9b8b81728ec26e115cbf0d88ab6e9cb2a87b03b5d79c432 SHA512 b39f1b2cbe6dd3fbd2a0ad6a9d391a2b6f49d7c5e67bc65fe44a9c86937f8db379572c67564c6e21ff6e09b447cdfd4e540544e486179e94da0e0db679c04dd9
-EBUILD rxvt-unicode-9.22-r1.ebuild 2061 BLAKE2B 56b2bb1406c412205c25688f15ab9bfe526b2f6ac1e936ef577e126d742711d0a8c37dce61852d15a0e7495179ad83a5252b8b5ade0b23daf1d448013a53f1e8 SHA512 5e77c132295150fb58c5c95cd1c1893131d8a6cd59fe7f9fcd72f645f7ea48ef8bc50bc7cfd49b3d0452b09099d5f7432a38e235e32c2b02097088205f5486cd
-EBUILD rxvt-unicode-9.22-r3.ebuild 2131 BLAKE2B a2b63654c2c983ae159923d5683bd00902206dfbf25de1d01eb1728fa8416e7626e3657251cc4faa32150bedf57a44de6c3b4ed8eabc8e494315d2d5f45c96c9 SHA512 cd7b3ca4384906a863a172df692ed4f174a436a8b66f4ab765493508ca3ea676af50bef70fba17d06445507450c4ec1a06f47bd6d24bbd75c4e0b1b2190c69ff
+DIST rxvt-unicode-9.22_24-bit-color_cpixl-20201108.patch.xz 8116 BLAKE2B 27940ad42ee3f26c357a50b7fae1e1539acec71f5ff43e7ed16167d0adb175c4de20ba84880f25eec0817703d937d097fda228541d16511811efe5816109e71b SHA512 2b8bbb90c6bb223f622c1e99d62a70a812604d1f8e57cea37a8faf0af578588d3888ea8009568d623710cc03e020a69269770e23476fd9ff9e46dbd9ea23f540
+EBUILD rxvt-unicode-9.22-r3.ebuild 2125 BLAKE2B 01665c665a51995cdfb6c51ea5dee7dfdc399740159e70fde60af42289d541efde91fde02a2ad8c4d40300c78be488b78e6333afa69000dae0dc2cf86ef0ab42 SHA512 ed31c9577fd093ccd946cd4f8fc8c371c06fd7abfb596c5014842dcd9be48bd50d966eeac77f32360cab2f5709d887514050fde5f51660d4b4cd1cb558076bfc
+EBUILD rxvt-unicode-9.22-r5.ebuild 2683 BLAKE2B 09b9e3110d24d72efd7e9bda1e542a762ad2bd12ed0a671994f75e5942ab653e94db8596bed79f45faf736fd37d504ab014e24c5b97661901d286e5c568d58c2 SHA512 f69809a1c9b2bc039ff4c6c15d2110bc4b38fc4fdded21fd4dcb3d99a5a2871a1cfb33a234d058314cafab4078776fd7b5e98baf5f1134635b0fb972e4fdce41
 EBUILD rxvt-unicode-9999.ebuild 2070 BLAKE2B ecb5c0fce4d0f6f99437f878e9a87b8a050372ea3af0362a9471568d5cf7397aa54dadddd86ff1e015fe7b5b2a0f0ea50c643d046245780008197d4d56f65c10 SHA512 cd692d00ea2aa8ccd668a1051cd3e074ceffcd3932822a41aead5368e9c9145483b69dc5a7f9f212211b4e0b0cfa89f94a98b5e1347fa31a46afebe251717927
-MISC metadata.xml 1099 BLAKE2B f30d8fc667246ab2e113f8e9356941f0e7cd40aad88ed578cece7e5cba1622aa2c8ea0b5918d239b994483fb171f8c1fcc03ae6e2d5204f0c2d09a2b22819be1 SHA512 bbd5ec950a1a14975ba50860a0ee924e6a736890dd3bbf7add4b001d164cab6ddc8bebc94c71cb855524b5006c29c3176dbcb489817afad54de1dabaa0410978
+MISC metadata.xml 1536 BLAKE2B 3cb37fce2861ce60176fc096ed712ff5e7932a28d6527d8ffe296c85c1068d045e40d59fd6f3bb0e4480513d16388a570c1357cd89f5c104638329cae9bace47 SHA512 7facca26d8c97b8cd5f0030d89c86c272821f5a1a8f87f3ddeacda713ddde1cec71969c429bf711ff42745a1652552753c0f9fda42cb95543e6b7e13cf01c368
diff --git a/x11-terms/rxvt-unicode/metadata.xml b/x11-terms/rxvt-unicode/metadata.xml
index d350fb5c5bdf..e088706493d5 100644
--- a/x11-terms/rxvt-unicode/metadata.xml
+++ b/x11-terms/rxvt-unicode/metadata.xml
@@ -1,11 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>jer@gentoo.org</email>
-<name>Jeroen Roovers</name>
-</maintainer>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+	<!-- co-maintainers welcome! -->
 <use>
+<flag name="24-bit-color">Enable 24-bit color support. Note that this feature
+	is unofficial, may cause visual glitches due to the fact there is no
+	termcap/terminfo definition for rxvt-unicode-24bit yet so it is necessary
+	to use the one for 256 colours, visibly increases memory usage, and might
+	slow urxvt down dramatically when more than six fonts are in use in a terminal
+	instance.</flag>
 <flag name="256-color">Enable 256 color support</flag>
 <flag name="blink">Enable blinking text</flag>
 <flag name="fading-colors">Enable colors fading when off focus</flag>
diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r3.ebuild b/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r3.ebuild
index e075d7a655bd..4aa8203be051 100644
--- a/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r3.ebuild
+++ b/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="http://dist.schmorp.de/rxvt-unicode/Attic/${P}.tar.bz2"
 
 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 ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
 IUSE="
 	256-color blink fading-colors +font-styles gdk-pixbuf iso14755 +mousewheel
 	+perl startup-notification unicode3 +utmp +wtmp xft
diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r1.ebuild b/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r5.ebuild
index d18ed1c7b1ef..ce083fc2e2f3 100644
--- a/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r1.ebuild
+++ b/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r5.ebuild
@@ -1,31 +1,35 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit autotools eutils
+EAPI=7
+
+inherit autotools desktop
+
+COLOUR_PATCH_NAME="${PN}-9.22_24-bit-color_cpixl-20201108.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 ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
 IUSE="
-	256-color blink fading-colors +font-styles gdk-pixbuf iso14755 +mousewheel
-	+perl startup-notification unicode3 xft
+	-24-bit-color 256-color blink fading-colors +font-styles gdk-pixbuf iso14755 +mousewheel
+	+perl startup-notification unicode3 +utmp +wtmp xft
 "
 RESTRICT="test"
 
 RDEPEND="
 	>=sys-libs/ncurses-5.7-r6:=
-	kernel_Darwin? ( dev-perl/Mac-Pasteboard )
 	media-libs/fontconfig
-	perl? ( dev-lang/perl:= )
-	gdk-pixbuf? ( x11-libs/gdk-pixbuf x11-libs/gtk+:2 )
-	startup-notification? ( x11-libs/startup-notification )
 	x11-libs/libX11
 	x11-libs/libXrender
+	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="
@@ -36,6 +40,15 @@ DEPEND="
 PATCHES=(
 	"${FILESDIR}"/${PN}-9.06-case-insensitive-fs.patch
 	"${FILESDIR}"/${PN}-9.21-xsubpp.patch
+	"${WORKDIR}"/${COLOUR_PATCH_NAME}
+)
+DOCS=(
+	Changes
+	README.FAQ
+	doc/README.xvt
+	doc/changes.txt
+	doc/etc/${PN}.term{cap,info}
+	doc/rxvt-tabbed
 )
 
 src_prepare() {
@@ -49,8 +62,8 @@ src_prepare() {
 
 src_configure() {
 	# --enable-everything goes first: the order of the arguments matters
-	econf \
-		--enable-everything \
+	econf --enable-everything \
+		$(use_enable 24-bit-color) \
 		$(use_enable 256-color) \
 		$(use_enable blink text-blink) \
 		$(use_enable fading-colors fading) \
@@ -61,6 +74,8 @@ src_configure() {
 		$(use_enable perl) \
 		$(use_enable startup-notification) \
 		$(use_enable unicode3) \
+		$(use_enable utmp) \
+		$(use_enable wtmp) \
 		$(use_enable xft)
 }
 
@@ -75,9 +90,16 @@ src_compile() {
 src_install() {
 	default
 
-	dodoc \
-		README.FAQ Changes doc/README* doc/changes.txt doc/etc/* doc/rxvt-tabbed
-
 	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
+}