x11-terms/rxvt-unicode: switching to -r7

profiles/use.local.desc

@@ -0,0 +1,40 @@
+# This file is deprecated as per GLEP 56 in favor of metadata.xml. Please add
+# your descriptions to your package's metadata.xml ONLY.
+# * generated automatically using egencache *
+
+app-text/OCRmyPDF:jbig2enc - Uses media-libs/jbig2enc for better compression algorithm
+app-text/docbook-sgml-utils:jadetex - Add support for app-text/jadetex (for processing tex files produced by the TeX backend of Jade)
+dev-python/dublintraceroute:analysis - Additional analysis functionality, uses dev-python/pandas and dev-python/matplotlib
+dev-python/matrix-nio:e2e - Enable matrix end-to-end encryption
+net-analyzer/AS-Stats:as-stats-gui - Use the improved webUI
+net-analyzer/AS-Stats:ip2as - Use the perl module ip2as.pm
+net-analyzer/mtr:ipinfo - Disable support for IP address lookups
+net-analyzer/mtr:jansson - Enable JSON output support through dev-libs/jansson
+net-analyzer/net-snmp:elf - Enable the use of elf utils to check uptime on some systems
+net-analyzer/net-snmp:kmem - Enable usage of /dev/kmem
+net-analyzer/net-snmp:mfd-rewrites - Use MFD rewrites of mib modules where available
+net-analyzer/net-snmp:netlink - Use dev-libs/libnl to fetch TCP statistics instead of using /proc/net/tcp (Linux only).
+net-analyzer/net-snmp:pcap - Install snmppcap which reads from PCAP files and writes to the SNMP transport
+net-analyzer/net-snmp:pci - Use libpci (from sys-apps/pciutils) to look up network interface description. This feature is only available on Linux.
+net-analyzer/net-snmp:rpm - Enable monitoring of app-arch/rpm. This flag requires the bzip2 and zlib flags to be enabled as well.
+net-analyzer/net-snmp:smux - Enable support for the legacy smux protocol (superseded by agentx)
+net-analyzer/net-snmp:ucd-compat - Build UCD compatibility library. Increases significantly the install size.
+net-dialup/freeradius-client:scp - Add service type hints derived from username prefix
+net-dialup/freeradius-client:shadow - Enable shadow password support
+net-firewall/ipt_netflow:dot1d - Enable bridge support (to override interfaces)
+net-firewall/ipt_netflow:dot1q - Enable tagged VLAN support
+net-firewall/ipt_netflow:natevents - Netflow NAT translation events (NEL) support
+net-im/dino:gpg - Enable OpenPGP encryption plugin
+net-im/dino:http - Enable HTTP file upload plugin
+net-im/dino:omemo - Enable OMEMO encryption plugin
+net-misc/bird:client - Build the ncurses/readline full featured CLI
+net-misc/bird:libssh - Enables net-libs/libssh binding, mendatory for RPKI support
+net-misc/routinator:rta - Enables the command rta for validating Resource Tagged Assertions as described in draft-michaelson-rpki-rta
+net-wireless/hostapd:crda - Add CRDA support
+net-wireless/hostapd:internal-tls - Use internal TLSv1 implementation instead of depending on OpenSSL, LibreSSL or GnuTLS
+net-wireless/hostapd:logwatch - Install support files for sys-apps/logwatch
+net-wireless/hostapd:netlink - Adding support for using netlink to create VLANs
+net-wireless/hostapd:suiteb - Adding support for NSA Suite B Cryptography
+net-wireless/hostapd:wps - Add support for Wi-Fi Protected Setup
+www-apps/converse-js:omemo - Enable OMEMO encryption with www-apps/libsignal-protocol-javascript.
+x11-libs/vte:mouse - Enable mouse support.

x11-terms/rxvt-unicode/Manifest

@@ -1 +1,2 @@
 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

x11-terms/rxvt-unicode/metadata.xml

@@ -1,25 +1,39 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
+<catmetadata>
-<maintainer type="person">
+	<longdescription lang="en">
-<email>jer@gentoo.org</email>
+		The x11-terms category contains terminal emulators for X11 environments.
-<name>Jeroen Roovers</name>
+	</longdescription>
-</maintainer>
+	<longdescription lang="de">
-<use>
+		Die Kategorie x11-terms enthält Terminalemulatoren für verschiedene
-<flag name="256-color">Enable 256 color support</flag>
+		Desktopumgebungen und Window Manager.
-<flag name="blink">Enable blinking text</flag>
+	</longdescription>
-<flag name="fading-colors">Enable colors fading when off focus</flag>
+	<longdescription lang="es">
-<flag name="font-styles">Enable support for bold and italic fonts</flag>
+		La categoría x11-terms contiene emuladores de terminal para varios
-<flag name="gdk-pixbuf">Enable transparency support using <pkg>x11-libs/gdk-pixbuf</pkg></flag>
+		ambientes X11.
-<flag name="iso14755">Enable ISO-14755 support</flag>
+	</longdescription>
-<flag name="mouse">Enable mouse support.</flag>
+	<longdescription lang="ja">
-<flag name="mousewheel">Enable scrolling via mouse wheel or buttons 4 and 5</flag>
+		x11-termsカテゴリーにはX11環境で使うターミナル・エミュレーターが含まれています。
-<flag name="perl">Enable perl script support. You can still disable this at runtime with -pe ""</flag>
+	</longdescription>
-<flag name="unicode3">Use 21 instead of 16 bits to represent unicode characters</flag>
+	<longdescription lang="nl">
-<flag name="utmp">Enable utmp support</flag>
+		De x11-terms categorie bevat terminalemulators voor verschillende
-<flag name="wtmp">Enable wtmp support</flag>
+		desktopomgevingen en window managers.
-</use>
+	</longdescription>
-<upstream>
+	<longdescription lang="vi">
-<remote-id type="cpe">cpe:/a:rxvt-unicode:rxvt-unicode</remote-id>
+		Nhóm x11-term chứa các terminal emulator cho X11.
-</upstream>
+	</longdescription>
-</pkgmetadata>
+	<longdescription lang="sk">
+		Kategória x11-term obsahuje emulátory terminálu pre prostredia X11.
+	</longdescription>
+	<longdescription lang="it">
+		La categoria x11-terms contiene emulatori di terminale per gli ambienti X11.
+	</longdescription>
+	<longdescription lang="pt">
+		A categoria x11-terms contém emuladores de terminal para
+		ambientes X11.
+	</longdescription>
+	<longdescription lang="pl">
+		Kategoria x11-terms zawiera emulatory terminala dla środowisk X11.
+	</longdescription>
+</catmetadata>
+

x11-terms/rxvt-unicode/rxvt-unicode-9.22-r7.ebuild

@@ -1,24 +1,27 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools desktop
+
+inherit autotools desktop systemd
+
+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 ~sparc-solaris"
-IUSE="
+IUSE="-24-bit-color 256-color blink fading-colors +font-styles gdk-pixbuf
-	256-color blink fading-colors +font-styles gdk-pixbuf iso14755 +mousewheel
+iso14755 +mousewheel mouse +perl -sgrmouse startup-notification unicode3 +utmp
-	mouse +perl startup-notification unicode3 +utmp +wtmp xft
++wtmp xft"
-"
+
 RESTRICT="test"
 
-RDEPEND="
+RDEPEND=">=sys-libs/ncurses-5.7-r6:=
-	>=sys-libs/ncurses-5.7-r6:=
 	media-libs/fontconfig
 	x11-libs/libX11
 	x11-libs/libXrender
@@ -26,16 +29,16 @@ RDEPEND="
 	kernel_Darwin? ( dev-perl/Mac-Pasteboard )
 	perl? ( dev-lang/perl:= )
 	startup-notification? ( x11-libs/startup-notification )
-	xft? ( x11-libs/libXft )
+	xft? ( x11-libs/libXft )"
-"
+DEPEND="${RDEPEND}
-DEPEND="
+	x11-base/xorg-proto"
-	${RDEPEND}
+BDEPEND="virtual/pkgconfig"
-	virtual/pkgconfig
+
-	x11-base/xorg-proto
-"
 PATCHES=(
 	"${FILESDIR}"/${PN}-9.06-case-insensitive-fs.patch
 	"${FILESDIR}"/${PN}-9.21-xsubpp.patch
+	"${FILESDIR}"/${PN}-9.22-sgr-mouse-mode-flag.patch
+	"${WORKDIR}"/${COLOUR_PATCH_NAME}
 )
 DOCS=(
 	Changes
@@ -60,6 +63,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) \
@@ -68,6 +72,7 @@ src_configure() {
 		$(use_enable iso14755) \
 		$(use_enable mousewheel) \
 		$(use_enable perl) \
+		$(use_enable sgrmouse) \
 		$(use_enable startup-notification) \
 		$(use_enable unicode3) \
 		$(use_enable utmp) \
@@ -86,6 +91,25 @@ src_compile() {
 src_install() {
 	default
 
+	systemd_douserunit "${FILESDIR}"/urxvtd.service
+
 	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
+
+	if use sgrmouse; then
+		ewarn
+		ewarn "Support for the SGR 1006 mouse extension in ${PN} is UNOFFICIAL and provided as-is."
+		ewarn "When in doubt, rebuild =${CATEGORY}/${PF} with USE=-sgrmouse (the default setting)."
+		ewarn
+	fi
+}

x11-terms/rxvt-unicode/rxvt-unicode-9999.ebuild

@@ -1,93 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools cvs desktop vcs-clean
-
-DESCRIPTION="rxvt clone with xft and unicode support"
-HOMEPAGE="http://software.schmorp.de/pkg/rxvt-unicode.html"
-ECVS_SERVER="cvs.schmorp.de/schmorpforge"
-ECVS_USER="anonymous"
-ECVS_MODULE="rxvt-unicode"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS=""
-IUSE="
-	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:=
-	media-libs/fontconfig
-	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="
-	${RDEPEND}
-	virtual/pkgconfig
-	x11-base/xorg-proto
-"
-DOCS=(
-	Changes
-	README.FAQ
-	doc/README.xvt
-	doc/changes.txt
-	doc/etc/${PN}.term{cap,info}
-	doc/rxvt-tabbed
-)
-S=${WORKDIR}/${PN}
-
-src_prepare() {
-	ecvs_clean
-	eapply \
-		"${FILESDIR}"/${PN}-9.06-case-insensitive-fs.patch \
-		"${FILESDIR}"/${PN}-9.21-xsubpp.patch
-
-	eapply_user
-
-	# kill the rxvt-unicode terminfo file - #192083
-	sed -i -e "/rxvt-unicode.terminfo/d" doc/Makefile.in || die "sed failed"
-
-	eautoreconf
-}
-
-src_configure() {
-	# --enable-everything goes first: the order of the arguments matters
-	econf --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)
-}
-
-src_compile() {
-	default
-
-	sed -i \
-		-e 's/RXVT_BASENAME = "rxvt"/RXVT_BASENAME = "urxvt"/' \
-		"${S}"/doc/rxvt-tabbed || die
-}
-
-src_install() {
-	default
-
-	make_desktop_entry urxvt rxvt-unicode utilities-terminal \
-		"System;TerminalEmulator"
-}