gentoo resync : 28.04.2019

7 files changed, 154 insertions, 198 deletions

diff --git a/x11-terms/rxvt-unicode/Manifest b/x11-terms/rxvt-unicode/Manifest
index 4486c0bb1bea..686e7de4b6e3 100644
--- a/x11-terms/rxvt-unicode/Manifest
+++ b/x11-terms/rxvt-unicode/Manifest
@@ -8,8 +8,8 @@ AUX rxvt-unicode-9.19-secondary-wheel.patch 5009 BLAKE2B 4dfb1d665bc1311c50788c2
 AUX rxvt-unicode-9.21-xsubpp.patch 640 BLAKE2B 51b9f626436153239ca98df1094c5bbadaca463cf3624d39094cf5dce75a42c23568584292cd55b891439a45bc7d9e3fbf098ec80743b44267e6c3c1d0b339ca SHA512 70f4c5cb7b6a440f009f693c4dc2f8595051e198250d375cd18704c35059596d77938a3d062740bd26f947bfebdb67ea7d46f59f8cbf08fc73193a62267723ec
 DIST rxvt-unicode-9.21.tar.bz2 925293 BLAKE2B 3da715f5f7726e6dfd5199b7fbc30efa506b7249afcf54afdab6617b78a2e133b19f203a9b26f8f25b952c8813051be8c51d235605425790c3f56c4a645e9c45 SHA512 d50adf6b1e6ae3b13492b4f40455d3a56bb174a7c6db4d4525a1277736994adfb74a2cd1e7d3e8a8cfdc4509a9ae32c05a627829e295dc1bd4a5ba7cc2f80776
 DIST rxvt-unicode-9.22.tar.bz2 931198 BLAKE2B ea9a12e4a8396ed6be12b4d50ae260a0376902dbd47b0628bb14ce0509c5d89f5a80370b413fdb9df9b8b81728ec26e115cbf0d88ab6e9cb2a87b03b5d79c432 SHA512 b39f1b2cbe6dd3fbd2a0ad6a9d391a2b6f49d7c5e67bc65fe44a9c86937f8db379572c67564c6e21ff6e09b447cdfd4e540544e486179e94da0e0db679c04dd9
-EBUILD rxvt-unicode-9.21.ebuild 3870 BLAKE2B e36fd0c466fd3d9f0fdeb35de756074e2ba249eb192f516aa250105232e4ff4908614c6cdaefae71dd1b27b1d83a5dba3ff7efdad9834ee0e833f7bb05c17a74 SHA512 0f90e5e980f1c06811665861c7bda923906918d0639cbf5e06ebf9fcab27a6313c78af62be89ab0fc06bf1c5ebac8c2d957150aee1c1410e159e64a76ee12ca5
-EBUILD rxvt-unicode-9.22-r1.ebuild 2057 BLAKE2B e103940c7dfe88787d51d33b44256db6862da4096ee1ed2c2f6b48847b319fe99ac05fb9a79729328557d0800cfadded95579d7075c7cff37fdb7773da13e6a4 SHA512 147e8501789786ae42d872f050a1375a3248f36832912c77bac440d05480bca90729bbb6a4a52d824be80c35697a74cb27c8359156531d998b690dc16c9ffa19
-EBUILD rxvt-unicode-9.22.ebuild 3881 BLAKE2B 70fd1e92677f7ce0b9ef837ce52fb3923f96813aa3f7f77a7df58b6d0f54369fc61dbf6c42f1e68fadd29894f94c9b764a6bd11bec84c4aa48303191aa2064db SHA512 fa82ae217561c1531a5baed290a35c9f603c04c316c21c151148b51ee0c76fc075250ef66e3a0d55e0992e4748d3051ad56322b4280d2cacb36aec8348de191f
-EBUILD rxvt-unicode-9999.ebuild 2018 BLAKE2B 4d46a3b5b0cfac49c3bd7b0241f6d79311a6a764b4a12071b005922a357bdf2888ce2bd5c086b22374012403b36455b931d4c8e32426daad5127743d46f016bb SHA512 231eb63904608786eca6677f035b226a6a85030b4ea490d4c1de903ff67b8a032bcdd158f472118d6f2c73be64f8db02d7341e1c74f75e94df02fcd999ff16fb
-MISC metadata.xml 1603 BLAKE2B 1dc70c8516630ed93fd431eadf814aa1a39cfaf00d02a8e6ce710ae673b6925e34f0ec468089f42cfa2651aa1c6a4a1fa6782da52ba6cb20a9f630105bc09163 SHA512 26bf3b229ba3ec60ee18779d8b4a67f23c8cc7358687adf1434fb3b9d4807187d22514467ce3cfeee1d82c925418b2e2f6efde691109897cd7d5b401b9e1d979
+EBUILD rxvt-unicode-9.21.ebuild 3886 BLAKE2B 6b2b107fc4740f0aeffb6635b3bbbb1c69ca14e79798d1d4f95940a74f2bed3576e06b9317e471446cd08b99346ebbe78fd9e591d77a7e12af7a3ea66811012c SHA512 a4722370cf239f3b5c7f5972f52bcd7cda2490c5cd33b736aa33b92e115b0b6a9b50de9b84f1794f06502076d26534340cda8646550981a1f1bca6bd24a538af
+EBUILD rxvt-unicode-9.22-r1.ebuild 2069 BLAKE2B 488c48ac0c7f5133a32d063f56f1e6608457c0838c94a8ce63211d20c91f79df28d2bd63759fa72e45e050984f0f5d62d570c24b59191df08b5c490128425f79 SHA512 4544df281aaa88cf1e6e0f3a51997d55e6a7982d180b68302790cf87252ceae557032dfd571a6ae481a9038ad71b368c17ea6ccaf43d7e5171a79a7599a7cbb3
+EBUILD rxvt-unicode-9.22-r3.ebuild 2141 BLAKE2B 18dbc7c36fe7ef2fd0690e836faf0a2af99c172d7b511978ea96565a8ab363c4cd82a5e6890be278c40999c67c37b513345bd8857460d567a1f79359fbd03de2 SHA512 bd065411153db259b93814ab20a92e88f1d4c32de5389b4dd9f7b5dab594c98add45799ef270d3dca5973a541c8417c960d6c6f895d7b5ca932134b0b4c77885
+EBUILD rxvt-unicode-9999.ebuild 2070 BLAKE2B ecb5c0fce4d0f6f99437f878e9a87b8a050372ea3af0362a9471568d5cf7397aa54dadddd86ff1e015fe7b5b2a0f0ea50c643d046245780008197d4d56f65c10 SHA512 cd692d00ea2aa8ccd668a1051cd3e074ceffcd3932822a41aead5368e9c9145483b69dc5a7f9f212211b4e0b0cfa89f94a98b5e1347fa31a46afebe251717927
+MISC metadata.xml 1675 BLAKE2B 6e68bfc33336edc6897f4170d2bde2b74325efa0e0f69b90a3a233202143e6f4132bf2d642d9f4a6291163e8d61881085598b9185d9b16b6ff8cc14c7009b6a1 SHA512 70e6e0f3b3e51ec07b12ca418ea234bbeaaf3f236460106685c75d54f431a336b9a5910b7c7d64f5760d30b89e0613ec667e8484ede0ae99b6a34f929676bbf6
diff --git a/x11-terms/rxvt-unicode/metadata.xml b/x11-terms/rxvt-unicode/metadata.xml
index 7d1c93339ec7..a7dc1d11bbc0 100644
--- a/x11-terms/rxvt-unicode/metadata.xml
+++ b/x11-terms/rxvt-unicode/metadata.xml
@@ -1,29 +1,29 @@
 <?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>
-	<use>
-		<flag name="256-color">Enable 256 color support</flag>
-		<flag name="alt-font-width">Calculate the font width using a different method</flag>
-		<flag name="blink">Enable blinking text</flag>
-		<flag name="buffer-on-clear">Store visible output to history buffer when clearing the screen with ctrl-l.
-	Read https://bbs.archlinux.org/viewtopic.php?id=129302</flag>
-		<flag name="fading-colors">Enable colors fading when off focus</flag>
-		<flag name="focused-urgency">Enable the urgent flag when a terminal window is focused</flag>
-		<flag name="font-styles">Enable support for bold and italic fonts</flag>
-		<flag name="iso14755">Enable ISO-14755 support</flag>
-		<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="pixbuf">Enable transparency support using gtk's pixbuf</flag>
-		<flag name="secondary-wheel">Support for wheel scrolling on secondary screens (like mutt).
-	Read http://lists.schmorp.de/pipermail/rxvt-unicode/2011q4/001491.html</flag>
-		<flag name="unicode3">Use 21 instead of 16 bits to represent unicode characters</flag>
-		<flag name="wcwidth">Enable wide char width support</flag>
-	</use>
-	<upstream>
-		<remote-id type="cpe">cpe:/a:rxvt-unicode:rxvt-unicode</remote-id>
-	</upstream>
+<maintainer type="person">
+<email>jer@gentoo.org</email>
+<name>Jeroen Roovers</name>
+</maintainer>
+<use>
+<flag name="256-color">Enable 256 color support</flag>
+<flag name="alt-font-width">Calculate the font width using a different method</flag>
+<flag name="blink">Enable blinking text</flag>
+<flag name="buffer-on-clear">Store visible output to history buffer when clearing the screen with ctrl-l.  Read https://bbs.archlinux.org/viewtopic.php?id=129302</flag>
+<flag name="fading-colors">Enable colors fading when off focus</flag>
+<flag name="focused-urgency">Enable the urgent flag when a terminal window is focused</flag>
+<flag name="font-styles">Enable support for bold and italic fonts</flag>
+<flag name="iso14755">Enable ISO-14755 support</flag>
+<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="gdk-pixbuf">Enable transparency support using <pkg>x11-libs/gdk-pixbuf</pkg></flag>
+<flag name="secondary-wheel">Support for wheel scrolling on secondary screens (like mutt).  Read http://lists.schmorp.de/pipermail/rxvt-unicode/2011q4/001491.html</flag>
+<flag name="unicode3">Use 21 instead of 16 bits to represent unicode characters</flag>
+<flag name="utmp">Enable utmp support</flag>
+<flag name="wcwidth">Enable wide char width support</flag>
+<flag name="wtmp">Enable wtmp support</flag>
+</use>
+<upstream>
+<remote-id type="cpe">cpe:/a:rxvt-unicode:rxvt-unicode</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-9.21.ebuild b/x11-terms/rxvt-unicode/rxvt-unicode-9.21.ebuild
index 91c9ca6b1e95..88d63b06268e 100644
--- a/x11-terms/rxvt-unicode/rxvt-unicode-9.21.ebuild
+++ b/x11-terms/rxvt-unicode/rxvt-unicode-9.21.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,8 +13,8 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
 IUSE="
 	256-color alt-font-width blink buffer-on-clear +focused-urgency
-	fading-colors +font-styles iso14755 +mousewheel +perl pixbuf secondary-wheel
-	startup-notification xft unicode3 +vanilla wcwidth
+	fading-colors +font-styles gdk-pixbuf iso14755 +mousewheel +perl
+	secondary-wheel startup-notification xft unicode3 +vanilla wcwidth
 "
 
 RDEPEND="
@@ -22,7 +22,7 @@ RDEPEND="
 	kernel_Darwin? ( dev-perl/Mac-Pasteboard )
 	media-libs/fontconfig
 	perl? ( dev-lang/perl:= )
-	pixbuf? ( x11-libs/gdk-pixbuf x11-libs/gtk+:2 )
+	gdk-pixbuf? ( x11-libs/gdk-pixbuf x11-libs/gtk+:2 )
 	startup-notification? ( x11-libs/startup-notification )
 	x11-libs/libX11
 	x11-libs/libXrender
@@ -86,12 +86,12 @@ src_configure() {
 		$(use_enable blink text-blink) \
 		$(use_enable fading-colors fading) \
 		$(use_enable font-styles) \
+		$(use_enable gdk-pixbuf pixbuf) \
 		$(use_enable mousewheel) \
 		$(use_enable perl) \
-		$(use_enable pixbuf) \
 		$(use_enable startup-notification) \
-		$(use_enable xft) \
 		$(use_enable unicode3) \
+		$(use_enable xft) \
 		${myconf}
 }
 
diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r1.ebuild b/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r1.ebuild
index e80f81aa4608..cf6db15ce87f 100644
--- a/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r1.ebuild
+++ b/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r1.ebuild
@@ -10,10 +10,10 @@ 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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
 IUSE="
-	256-color blink fading-colors +font-styles iso14755 +mousewheel +perl
-	pixbuf startup-notification unicode3 xft
+	256-color blink fading-colors +font-styles gdk-pixbuf iso14755 +mousewheel
+	+perl startup-notification unicode3 xft
 "
 RESTRICT="test"
 
@@ -22,7 +22,7 @@ RDEPEND="
 	kernel_Darwin? ( dev-perl/Mac-Pasteboard )
 	media-libs/fontconfig
 	perl? ( dev-lang/perl:= )
-	pixbuf? ( x11-libs/gdk-pixbuf x11-libs/gtk+:2 )
+	gdk-pixbuf? ( x11-libs/gdk-pixbuf x11-libs/gtk+:2 )
 	startup-notification? ( x11-libs/startup-notification )
 	x11-libs/libX11
 	x11-libs/libXrender
@@ -55,10 +55,10 @@ src_configure() {
 		$(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 pixbuf) \
 		$(use_enable startup-notification) \
 		$(use_enable unicode3) \
 		$(use_enable xft)
diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r3.ebuild b/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r3.ebuild
new file mode 100644
index 000000000000..e82d0d90ff4d
--- /dev/null
+++ b/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r3.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools desktop
+
+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"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~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
+"
+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
+"
+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
+
+	# 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"
+}
diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-9.22.ebuild b/x11-terms/rxvt-unicode/rxvt-unicode-9.22.ebuild
deleted file mode 100644
index e60a08adddf4..000000000000
--- a/x11-terms/rxvt-unicode/rxvt-unicode-9.22.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils
-
-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"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
-IUSE="
-	256-color alt-font-width blink buffer-on-clear +focused-urgency
-	fading-colors +font-styles iso14755 +mousewheel +perl pixbuf secondary-wheel
-	startup-notification xft unicode3 +vanilla wcwidth
-"
-
-RDEPEND="
-	>=sys-libs/ncurses-5.7-r6:=
-	kernel_Darwin? ( dev-perl/Mac-Pasteboard )
-	media-libs/fontconfig
-	perl? ( dev-lang/perl:= )
-	pixbuf? ( x11-libs/gdk-pixbuf x11-libs/gtk+:2 )
-	startup-notification? ( x11-libs/startup-notification )
-	x11-libs/libX11
-	x11-libs/libXrender
-	xft? ( x11-libs/libXft )
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-	x11-base/xorg-proto
-"
-
-RESTRICT="test"
-REQUIRED_USE="vanilla? ( !alt-font-width !buffer-on-clear focused-urgency !secondary-wheel !wcwidth )"
-
-src_prepare() {
-	# fix for prefix not installing properly
-	epatch \
-		"${FILESDIR}"/${PN}-9.06-case-insensitive-fs.patch \
-		"${FILESDIR}"/${PN}-9.21-xsubpp.patch
-
-	if ! use vanilla; then
-		ewarn "You are going to include unsupported third-party bug fixes/features."
-		ewarn "If you want even more control over patches, then set USE=vanilla"
-		ewarn "and store your patch set in /etc/portage/patches/${CATEGORY}/${PF}/"
-
-		use wcwidth && epatch doc/wcwidth.patch
-
-		# bug #240165
-		use focused-urgency || epatch "${FILESDIR}"/${PN}-9.06-no-urgency-if-focused.diff
-
-		# bug #263638
-		epatch "${FILESDIR}"/${PN}-9.06-popups-hangs.patch
-
-		# bug #237271
-		epatch "${FILESDIR}"/${PN}-9.05_no-MOTIF-WM-INFO.patch
-
-		# support for wheel scrolling on secondary screens
-		use secondary-wheel && epatch "${FILESDIR}"/${PN}-9.19-secondary-wheel.patch
-
-		# ctrl-l buffer fix
-		use buffer-on-clear && epatch "${FILESDIR}"/${PN}-9.14-clear.patch
-
-		use alt-font-width && epatch "${FILESDIR}"/${PN}-9.06-font-width.patch
-	fi
-
-	# kill the rxvt-unicode terminfo file - #192083
-	sed -i -e "/rxvt-unicode.terminfo/d" doc/Makefile.in || die "sed failed"
-
-	epatch_user
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=''
-
-	use iso14755 || myconf='--disable-iso14755'
-
-	econf --enable-everything \
-		$(use_enable 256-color) \
-		$(use_enable blink text-blink) \
-		$(use_enable fading-colors fading) \
-		$(use_enable font-styles) \
-		$(use_enable mousewheel) \
-		$(use_enable perl) \
-		$(use_enable pixbuf) \
-		$(use_enable startup-notification) \
-		$(use_enable xft) \
-		$(use_enable unicode3) \
-		${myconf}
-}
-
-src_compile() {
-	emake || die "emake failed"
-
-	sed -i \
-		-e 's/RXVT_BASENAME = "rxvt"/RXVT_BASENAME = "urxvt"/' \
-		"${S}"/doc/rxvt-tabbed || die "tabs sed failed"
-}
-
-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 buffer-on-clear; then
-		ewarn "You have enabled the buffer-on-clear USE flag."
-		ewarn "Please note that, although this works well for most prompts,"
-		ewarn "there have been cases with fancy prompts, like bug #397829,"
-		ewarn "where it caused issues. Proceed with caution."
-		ewarn "  (keep this terminal open until you make sure it works)"
-	fi
-	if use secondary-wheel; then
-		elog "You have enabled the secondary-wheel USE flag."
-		elog "This allows you to scroll in secondary screens"
-		elog "(like mutt's message list/view or nano) using the mouse wheel."
-		elog
-		elog "To actually enable the feature you have to add"
-		elog "  URxvt*secondaryWheel: true"
-		elog "in your ~/.Xdefaults file"
-	fi
-}
diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-9999.ebuild b/x11-terms/rxvt-unicode/rxvt-unicode-9999.ebuild
index 9a25833630ec..f58563238431 100644
--- a/x11-terms/rxvt-unicode/rxvt-unicode-9999.ebuild
+++ b/x11-terms/rxvt-unicode/rxvt-unicode-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit autotools cvs eutils
+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"
@@ -14,19 +14,19 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS=""
 IUSE="
-	256-color blink fading-colors +font-styles iso14755 +mousewheel +perl
-	pixbuf startup-notification xft unicode3
+	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
-	sys-libs/ncurses:*
 	x11-libs/libX11
 	x11-libs/libXrender
+	gdk-pixbuf? ( x11-libs/gdk-pixbuf )
 	kernel_Darwin? ( dev-perl/Mac-Pasteboard )
 	perl? ( dev-lang/perl:= )
-	pixbuf? ( x11-libs/gdk-pixbuf x11-libs/gtk+:2 )
 	startup-notification? ( x11-libs/startup-notification )
 	xft? ( x11-libs/libXft )
 "
@@ -35,42 +35,45 @@ DEPEND="
 	virtual/pkgconfig
 	x11-base/xorg-proto
 "
-
-S=${WORKDIR}/${PN}
-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
 )
+S=${WORKDIR}/${PN}
 
 src_prepare() {
 	ecvs_clean
-
-	# kill the rxvt-unicode terminfo file - #192083
-	sed -i -e "/rxvt-unicode.terminfo/d" doc/Makefile.in || die
+	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() {
-	local myconf=''
-
-	use iso14755 || myconf='--disable-iso14755'
-
 	# --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 pixbuf) \
 		$(use_enable startup-notification) \
 		$(use_enable unicode3) \
+		$(use_enable utmp) \
+		$(use_enable wtmp) \
 		$(use_enable xft)
 }
 
@@ -85,9 +88,6 @@ 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"
 }