gentoo resync : 19.03.2019

12 files changed, 186 insertions, 96 deletions

diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index 427aa1661c83..1ef7b4db4aec 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
diff --git a/x11-terms/gnome-terminal/Manifest b/x11-terms/gnome-terminal/Manifest
index a4962e072b5a..b47a82dbe6bd 100644
--- a/x11-terms/gnome-terminal/Manifest
+++ b/x11-terms/gnome-terminal/Manifest
@@ -4,8 +4,11 @@ DIST gnome-terminal-3.28.1-notify-open-title-transparency.patch.xz 33036 BLAKE2B
 DIST gnome-terminal-3.28.2.tar.xz 2094920 BLAKE2B 02f6e9b7273247169966e3125931e452ee4ac4669c53c79c93f49073511ef25a3f21df60510df0e7aefffad5e3ea14acdd1338a1c7ce934439863728e2d709ec SHA512 a20fe13fd2e533a90236410ce6ddd11e4da9da13f2d8952baa3cbf07379dbe253cf897b596421852084bbfc000264de11fb605c73909af8188baa93e46ddae8f
 DIST gnome-terminal-3.30.1-notify-open-title-transparency.patch.xz 32204 BLAKE2B d32cabea06df4290c592814a60443c3fb627ae7e837560bffdd0f803fd970b2962d7fc1d57a53f9bc62bd0ceb23ccade623e0d7099cb2610e599d9c2243c3ec2 SHA512 14e6e9baf1cd3fdd34ba320502de0ba99b0259598947562b5057472b099e85bcb6c60be8e5f58296c222deb85c35ddf5feefd1dbfac83710050e038f6e1b3a28
 DIST gnome-terminal-3.30.1.tar.xz 2099736 BLAKE2B a3100c7faf10f5d8ed3f16ae3ee28a7850e181dcf97ed52c0509143aa88114583466ddd3dfa1ea61372674cd6f16f9490c5ba9fafa4f5ce56eaeebe33ce259d5 SHA512 486fe7a9841114d49428208fdea195f1ce6a27ecfc66e2c77632385a7b106a28d3e6a0f1a198bd08f3e2a89d201ac49dafa376c002eab6470ff9d64cf30194ec
+DIST gnome-terminal-3.30.2-notify-open-title-transparency.patch.xz 31748 BLAKE2B 6a25547fcdd387ea90c3ba13e53f31a118cc01c50c72f1f597162452ea65509e2fc8adaa2f6487859d8a53e828173d77a6f952d172f5a685e2b51864a82cce7f SHA512 51f32879c93a5ca489db9a604b28585787c9ec1a444c5e8c76bf26edeaa68e35fe9f76f94f32e99716a0d01643ac859475be13232c62675c703b5503781cb8d0
+DIST gnome-terminal-3.30.2.tar.xz 2099952 BLAKE2B e66c2fcb3ed9940435cf4e4940f088f507b836808087ce6da21ac5fabf906bed3e6197a892790819cb5d3fe36841cf5bba1d58fd552bf41544e240c7e4a5183b SHA512 acbc854271b8dd8c60e04277228d5e0d2dbfaff42bc9c002d4bc42bb97052e2e3ab03da130c31c3cc1452644adfafcddd5103a6d79a10a659b4fe20d6063c61e
 DIST gnome-terminal-notify-open-title-transparency.patch.xz 37448 BLAKE2B 159bbcf6ca387af8ae2f05c23b48afcdf11351025420ecfd10d1b8a1dd9c2c8016d1c89c6fca20dde3bf8ffe3a6091232a989cfd520fa6761f65eec29b569d84 SHA512 9af0d56df105a5bdb81b2609794669557a7f442f71b240ee10a6411fab20ad74c14489dbb9a536e208515053ea17776b3a15afb3b949a75a66f8c2ab3dbbff96
 EBUILD gnome-terminal-3.24.2.ebuild 2604 BLAKE2B 5ed19f08bd6f5f0e1cf906d1936cff022af37e2338106e72317354ce2e13e740b3e7e2253b6164517c215687e5af703c144f21800b773ff5f02fb980711b1c7c SHA512 8321fd29e858800cf7b7c71e9e0cdc6cc1bed07cc0841df63fc12a5492e7d3a36bd68221384145b8be9da0af92d1a0e559cac71ccd71130c1433b1209dc75f8e
 EBUILD gnome-terminal-3.28.2.ebuild 2487 BLAKE2B 84deec3d63b57776fa69e418c4a9eba30bfc135d6a3dc51e89e9d542d2c3c30a39092c00dffcf901508b2c0d5956498e5b06e062d192b9d8c8732bcde6d443ee SHA512 d9df4b14da08a36c15860cbbe6bcf4be54bb2dcf95abbd730710e01aebff0200058d9dc2d23112df0ec0eb01174732aa43dd5bb6e70aa4cbbe28b3bc6dcf5ccd
 EBUILD gnome-terminal-3.30.1.ebuild 2699 BLAKE2B dfb6c17fd39d7152cb79cf179d203882e2fbb06dae8abb9935540b77e3736e37524589ad9910550dae454279d8913785dbb6858ac3925aa5d4c205f1bc82c643 SHA512 36f000d88db9ebc3747da6e8b8a7fbc0041e8f037ab1d768d752316c19e76a99785c103ff58ff3d98153f19df3a8f8dd905f627e90861127daeee5488c223d47
+EBUILD gnome-terminal-3.30.2.ebuild 2699 BLAKE2B 085b42a293fcf01ebcafc0c58f575d62696f9ce6159eb15f8b0457cc0d44eaaa30faa790929a302b4ee7ec56e17dfcfd8f06bd2248ae0c463b929c44a7916d02 SHA512 82a2fd300dbc99a7ff1efe1d64fe2fca15fae1a27f4f456e5fb7bfd1341234e671471e8c92feab22f7dd211de63610aff24e897b0ef3c99a8b8f59a1805a063c
 MISC metadata.xml 417 BLAKE2B ddec99c80b9ff060709ef724996eb8e73a8e587e022947b9f237adcd1ecb049fc48b8f7e8b6cd725d2f5e3276b9aecdcdb5acacddadfbd7edcc61dd9346789ae SHA512 a41ea1b6fc9d3dcbdf296590b206f924cb42c7dea27b68f593eb3e50aa37c6dd3df20b47c34f8cca2671dacd4fba6ec0f86caebebe6f66d496b7936d3cf0a688
diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.30.2.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.30.2.ebuild
new file mode 100644
index 000000000000..6a0da47b20ff
--- /dev/null
+++ b/x11-terms/gnome-terminal/gnome-terminal-3.30.2.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2 readme.gentoo-r1
+
+DESCRIPTION="The Gnome Terminal"
+HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/"
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="debug +gnome-shell +nautilus vanilla"
+SRC_URI="${SRC_URI} !vanilla? ( https://dev.gentoo.org/~leio/distfiles/${P}-notify-open-title-transparency.patch.xz )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+
+# FIXME: automagic dependency on gtk+[X], just transitive but needs proper control, bug 624960
+RDEPEND="
+	>=dev-libs/glib-2.42:2
+	>=x11-libs/gtk+-3.20:3
+	>=x11-libs/vte-0.54.1:2.91[!vanilla?]
+	>=dev-libs/libpcre2-10
+	>=gnome-base/dconf-0.14
+	>=gnome-base/gsettings-desktop-schemas-0.1.0
+	sys-apps/util-linux
+	gnome-shell? ( gnome-base/gnome-shell )
+	nautilus? ( >=gnome-base/nautilus-3 )
+"
+# itstool required for help/* with non-en LINGUAS, see bug #549358
+# xmllint required for glib-compile-resources, see bug #549304
+DEPEND="${RDEPEND}
+	dev-libs/libxml2:2
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=dev-util/intltool-0.50
+	dev-util/itstool
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+DOC_CONTENTS="To get previous working directory inherited in new opened tab, or
+	notifications of long-running commands finishing, you will need
+	to add the following line to your ~/.bashrc:\n
+	. /etc/profile.d/vte-2.91.sh"
+
+src_prepare() {
+	if ! use vanilla; then
+		# https://bugzilla.gnome.org/show_bug.cgi?id=695371
+		# Fedora patches:
+		# Restore transparency support (with compositing WMs only)
+		# OSC 777 desktop notification support (notifications on tabs for long-running commands completing)
+		# Restore separate menuitems for opening tabs and windows
+		# Restore "Set title" support
+		# http://pkgs.fedoraproject.org/cgit/rpms/gnome-terminal.git/plain/gnome-terminal-notify-open-title-transparency.patch
+		# Depends on vte[-vanilla] for OSC 777 patch in VTE
+		eapply "${WORKDIR}"/${P}-notify-open-title-transparency.patch
+	fi
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		$(use_enable debug) \
+		$(use_enable gnome-shell search-provider) \
+		$(use_with nautilus nautilus-extension)
+}
+
+src_install() {
+	DOCS="AUTHORS ChangeLog HACKING NEWS"
+	gnome2_src_install
+	if ! use vanilla; then
+		# Separate "New Window/Tab" menu entries by default, instead of unified "New Terminal"
+		insinto /usr/share/glib-2.0/schemas
+		newins "${FILESDIR}"/separate-new-tab-window.gschema.override org.gnome.Terminal.gschema.override
+	fi
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	readme.gentoo_print_elog
+}
diff --git a/x11-terms/mate-terminal/Manifest b/x11-terms/mate-terminal/Manifest
index 63a7b5acf5d3..31f40dbbb67f 100644
--- a/x11-terms/mate-terminal/Manifest
+++ b/x11-terms/mate-terminal/Manifest
@@ -1,3 +1,5 @@
 DIST mate-terminal-1.18.2.tar.xz 1302216 BLAKE2B 9b2e0171f62e75e967389aa3b06bcf908a9884055d220bca895ac01f8f21a4102f21a759f2b5e2f06bf2d8c18af3688f000ed9414525df203a79d2b6e66d7443 SHA512 ac35890dc955743ccf7d8176e710820179cc5dd8a89a8322eb99c29796c27586a6abb1503288896faf1eeba6047fad12cf506e67674ee6221313679061acf8c8
+DIST mate-terminal-1.22.0.tar.xz 1538540 BLAKE2B 490ff1e2a0d8c93b2ab2479c8a735867f551111585d82d353cd7a150f1fd5e4e1319dc25832628b464572734efc2fa4917b49b7d4fe5d63b78ce6ea5601e4611 SHA512 45932db8c50348386a58ee7acaf08af43e28bd495dac08b4dcff5defd1c10189163bdfd73c61015674d61f275dabc2f749b2e0cbf9981c7dfdef5a4060686645
 EBUILD mate-terminal-1.18.2.ebuild 750 BLAKE2B 7b19c0857d4811baa6bd37d72a9f90724d066ebcc3c6b957fc48df48d99281f466d16a65306deb4f06ac695e94028d34178b66f58c73ad314ddaf0a94e943c3d SHA512 ec47a5c0b80e3384beeff37faf971e9b5f14ca9bdbb79f9388db87a3c2ce457655ec45f9c3b5dc29bce2d6abca8891590ff92f636f015025c1b7eebaa9272b89
+EBUILD mate-terminal-1.22.0.ebuild 713 BLAKE2B 0d4696a0a12f81c0fadb8344f17bbec510e9a5029b3f17b179794922b696d5d966d64c6a34907c1db58ec41d89cb58227825b677568d14e41ffd7addc05d75d4 SHA512 61c9129bd7822c0c11b20d636977eb5acd6ca420a6887e02889dc2c9b2d90068906d85de8c99113e75fa5928f5fd8d0264ff995610f3d79957c906ddebec383d
 MISC metadata.xml 342 BLAKE2B 811cbd769e0b0c1b5766cde7b50689d7c921289cf776132d66c79203373555c83d9059505da2a441030c4aa576179130aa985c7deee4f75c8bb6c56f4968cc13 SHA512 9edc7ffa3bbd772e794786c786eeca99dc500d9f22632a54bc700ce648084f096d9fc7c1786af446711293bf0e294078abe5ce94073de091b9d48248875e7cb9
diff --git a/x11-terms/mate-terminal/mate-terminal-1.22.0.ebuild b/x11-terms/mate-terminal/mate-terminal-1.22.0.ebuild
new file mode 100644
index 000000000000..284c36dd04e8
--- /dev/null
+++ b/x11-terms/mate-terminal/mate-terminal-1.22.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+DESCRIPTION="The MATE Terminal"
+LICENSE="GPL-3"
+SLOT="0"
+
+IUSE=""
+
+COMMON_DEPEND="dev-libs/atk
+	>=dev-libs/glib-2.50:2
+	>=gnome-base/dconf-0.13.4
+	x11-libs/gdk-pixbuf:2
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/pango
+	>=x11-libs/gtk+-3.22:3[X]
+	>=x11-libs/vte-0.46:2.91"
+
+RDEPEND="${COMMON_DEPEND}
+	>=mate-base/mate-desktop-1.6"
+
+DEPEND="${COMMON_DEPEND}
+	app-text/rarian
+	>=app-text/scrollkeeper-dtd-1:1.0
+	app-text/yelp-tools
+	>=dev-util/intltool-0.50.1
+	sys-devel/gettext:*
+	virtual/pkgconfig:*"
diff --git a/x11-terms/qterminal/Manifest b/x11-terms/qterminal/Manifest
index ab73092c2882..086e0e8b3fb5 100644
--- a/x11-terms/qterminal/Manifest
+++ b/x11-terms/qterminal/Manifest
@@ -1,5 +1,6 @@
-AUX qterminal-9999-nofetch.patch 992 BLAKE2B 32f739a0254f96f6a40c6905cd77ebc8cdd3a4ab6239897cc40229805a4cff0174f3cc362317c1368a9ea982c312875382dc551362b1add4342dc6383ead9b7e SHA512 d46bfb3d3785088e81274645c56f908fcc7978415394c3cdc4d9c164d57f7d8b7743d99d97446c348d6c09424cf7e839041b0450fb8cf5d8f84a1b90cac1b56e
+DIST qterminal-0.14.1.tar.xz 167520 BLAKE2B e496e53b1855f94c49ef5fe699d7c88ca8ad4da40eb24f87701e72c50982bc98a16f060b075597a99d105d32dd38790e6599cd5b36d2901ffe1f72d0114f0fba SHA512 bb9ac6519236bb834892c1be50bc27f86631b2c7ed60c1ddd4300fedd48f3ea8a08aa453fa03199693486159f667f9391af9491dea5402b4f807ee91e8a6e5cf
 DIST qterminal-0.9.0.tar.xz 107072 BLAKE2B 08673e6cde08d9b95a1197d8125a2997e3f28be4e2825bb7b3a757f01ba7a29808c71eb22d80ba1b3c92885230c275414b501120316be91af9f623f3ff05b4e0 SHA512 42553a847873e71543161855b6f07b521ebf7db8091a1753dfc4ad4bbdf7f074f74b7e7195e56ee482b5b9ff3ea3037250ba74fb64a8137fb3959fceaa2baa6e
+EBUILD qterminal-0.14.1.ebuild 774 BLAKE2B 8e725bee9edecc4ccfc963fb3c5e0a9f2ab00dd16af73818c195006fdadfb94259722fb8ac3f0b7ab700081a49a7d50240c29d231359f02dd9939a04ab004dc2 SHA512 8b0122458acef4851bcbbea8265030bd96d2a2e321eb29f5a8a62ca3f7c11276babe008c1a8613b5624027bad4f824d1e7ceec7fd7057fdb24a387e747ed397c
 EBUILD qterminal-0.9.0.ebuild 961 BLAKE2B 3d7b9fbf831626982355f2f846e084c94df3892367a9a2f5f66b806b0e38d3f4eec1f29ae32d2c8f02ea38c26039bc432d60e0227fad3ea2551423a48b591aa2 SHA512 99a5680f1361379eeb942109c3acbbf7ced70ab9bc3388d0b094a2a715be969a6d79694c0239b6a963137fa02a7efb0897c1a93e6eb2426b4769c0f8d8c54165
-EBUILD qterminal-9999.ebuild 666 BLAKE2B 8b5843fcfcaa6fea5b0ae3b2c1b992243952a7793f5630eb7114c0122e762b6f297c25d4a9347e4d8dbcc9c2bd7af857e19b59eb46aa3085268b8b950de418b7 SHA512 54127edc2c0e6d05c69767ad41925af43397d5fff094611e60b7545212e85da2677f726bbe42e6951a701a0fdc349cc9ee7fbf4d733e9eb0ef50c131e62be292
+EBUILD qterminal-9999.ebuild 744 BLAKE2B 58f7cd8c04f2bc7b30b479db553ea1aee87ee94c8bc258ffb3dc307e692345602759971b391f65a6d04ae289f6cf952a106e05804bbe414187a1a2410e53dc34 SHA512 02fc0394dc70b7dfb62c6509e688a8f8f4e69bbd4bf284c0d12d2d66906bb17724aa0a8fc7068fee79ab0b9113ce9b8f093598c80f0101bebacef790921196d3
 MISC metadata.xml 331 BLAKE2B 58ccd837daad6307e17695fe2ef3bc12680e0d146ed5a7d38bbc386a9f8f354549d337d7b5b6beb4b6f5e68d35d457a9beff1f2af58a3e358f56d3ad65f89f1e SHA512 6093916b3ba5afc8249b5b0444f021719336ab71c8749827c8c629ceb2b6b1edc0aeed5eae3f098f0e3fc120e80f691669ccf85a195386dd17bf6f343121bdd5
diff --git a/x11-terms/qterminal/files/qterminal-9999-nofetch.patch b/x11-terms/qterminal/files/qterminal-9999-nofetch.patch
deleted file mode 100644
index 72876c954a0e..000000000000
--- a/x11-terms/qterminal/files/qterminal-9999-nofetch.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Do not fetch translations using git at build time.
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -24,7 +24,6 @@
- endif()
- find_package(QTermWidget5 REQUIRED)
- find_package(lxqt-build-tools ${LXQTBT_MINIMUM_VERSION} REQUIRED)
--include(LXQtTranslateTs)
- include(LXQtCompilerSettings NO_POLICY_SCOPE)
- message(STATUS "Qt version: ${Qt5Core_VERSION}")
- 
-@@ -108,23 +107,6 @@
- qt5_wrap_ui( QTERM_UI ${QTERM_UI_SRC} )
- qt5_wrap_cpp( QTERM_MOC ${QTERM_MOC_SRC} )
- qt5_add_resources( QTERM_RCC ${QTERM_RCC_SRC} )
--lxqt_translate_ts(QTERM_QM
--    UPDATE_TRANSLATIONS
--        ${UPDATE_TRANSLATIONS}
--    SOURCES
--        ${QTERM_SRC}
--        ${QTERM_UI_SRC}
--        ${QTERM_MOC_SRC}
--    TRANSLATION_DIR "src/translations"
--    PULL_TRANSLATIONS
--        ${PULL_TRANSLATIONS}
--    CLEAN_TRANSLATIONS
--        ${CLEAN_TRANSLATIONS}
--    TRANSLATIONS_REPO
--        ${TRANSLATIONS_REPO}
--    TRANSLATIONS_REFSPEC
--        ${TRANSLATIONS_REFSPEC}
--)
- 
- include_directories(
-     "${PROJECT_SOURCE_DIR}"
diff --git a/x11-terms/qterminal/qterminal-0.14.1.ebuild b/x11-terms/qterminal/qterminal-0.14.1.ebuild
new file mode 100644
index 000000000000..a16a34b51c33
--- /dev/null
+++ b/x11-terms/qterminal/qterminal-0.14.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils xdg-utils
+
+DESCRIPTION="Qt-based multitab terminal emulator"
+HOMEPAGE="https://lxqt.org/"
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
+else
+	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+BDEPEND=">=dev-util/lxqt-build-tools-0.6.0"
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	x11-libs/libX11
+	~x11-libs/qtermwidget-${PV}
+"
+RDEPEND="${DEPEND}
+	!lxqt-base/lxqt-l10n
+"
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/x11-terms/qterminal/qterminal-9999.ebuild b/x11-terms/qterminal/qterminal-9999.ebuild
index f63d5d11ad3e..f7797f360159 100644
--- a/x11-terms/qterminal/qterminal-9999.ebuild
+++ b/x11-terms/qterminal/qterminal-9999.ebuild
@@ -3,18 +3,23 @@
 
 EAPI=7
 
-inherit cmake-utils git-r3 xdg-utils
+inherit cmake-utils xdg-utils
 
 DESCRIPTION="Qt-based multitab terminal emulator"
-HOMEPAGE="https://github.com/lxde/qterminal"
-EGIT_REPO_URI="https://github.com/lxde/qterminal.git"
+HOMEPAGE="https://lxqt.org/"
 
-LICENSE="GPL-2+"
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
+else
+	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
-IUSE=""
 
-BDEPEND="dev-util/lxqt-build-tools"
+BDEPEND=">=dev-util/lxqt-build-tools-0.6.0"
 DEPEND="
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
@@ -25,8 +30,6 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}/${P}-nofetch.patch" )
-
 pkg_postinst() {
 	xdg_icon_cache_update
 }
diff --git a/x11-terms/root-tail/Manifest b/x11-terms/root-tail/Manifest
index 7a2464ee7ec6..856186ca7c20 100644
--- a/x11-terms/root-tail/Manifest
+++ b/x11-terms/root-tail/Manifest
@@ -1,5 +1,4 @@
 AUX root-tail-1.2-kde.patch 3188 BLAKE2B 122e2ade46725c9e1dacaf5e68f283b3efe2c968407e48d7ee0567e10d5d360f479588ac1b9f6da74a5d0fec52e83ac51ddc6789d8b560c43a83aba5b1ba5ac4 SHA512 f99c8cd04664d7e1afe21854d2ba9114387c55fa89268aca7cbeb88ecfeedad26529bdfd2b52dbe88d74959f4943571bda1f518fb41d8827f04f25e250bc7fb7
 DIST root-tail-1.2.tar.gz 20805 BLAKE2B 29891f0bbedc18d6b4e6e726234d7abaf107fa96b3da3a38a5a3aa91edd00403ae52166491cd5ec59f903b12c0edcddc92a3576db3127a837ae9ac3480823c40 SHA512 9e0b046d3e22ad8e85baa356ae8850885759e28624840901465c88c5791595db89da8d7908446cfa52cef180d2ae5a6d3857310679dc37545b6a9cabdd1d3e10
-EBUILD root-tail-1.2-r3.ebuild 1019 BLAKE2B 774c76402cf892e301ab37ce1239ae79559f1fbaebdbe42ba7fa3c33027df3b989fbe7ec61cfceffaff4f32b3c2dae9a5f81bbec4eb8601cbb03b48b6efc8dcb SHA512 4651e93ec7dc145b8b980eb727b2af7b9eca70070d8b2eb30d37b4d9a6462bd82ad092ff8ee7e4ebe40162448556a52db24fe5eb181c88d008ccf84619895e59
-EBUILD root-tail-1.2-r4.ebuild 965 BLAKE2B f3b8922dbc06b7b30b6b90a0733f09b6da019b94f4934cbf79eb28d87e3800d3b2e8272e686ca0bab9ba19f07a0525f9949e6781a99f4cda4c45b191208ff944 SHA512 2ae21cd0f0b1ea6c4a3ef91777b35c5dfb50cfae63200bbb56558782864fcbaa2fc060e5467a8280ae82247401135204ba9c026fda20b9799445e0f6fb286e9a
+EBUILD root-tail-1.2-r4.ebuild 961 BLAKE2B 88fc2283aefc2a9f4028b9d7a518c7ebb3c721cf78edc3a7540b4010598eb8631ed0ccd52be7321d06a994bf04a5ac75b4907957d2ccb34b1e7e4c2d6260edbe SHA512 9ad7ac179081a15d94220812a4e0b1532d224e09fd9cbf65037163e5e17fb69b8c69c2ccedf89252560d546c521d0e4c22d5a50c1d0226ba9728f91a2c97e124
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-terms/root-tail/root-tail-1.2-r3.ebuild b/x11-terms/root-tail/root-tail-1.2-r3.ebuild
deleted file mode 100644
index 1a3e1a6ce02f..000000000000
--- a/x11-terms/root-tail/root-tail-1.2-r3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="Terminal to display (multiple) log files on the root window"
-HOMEPAGE="http://oldhome.schmorp.de/marc/root-tail.html"
-SRC_URI="http://oldhome.schmorp.de/marc/data/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="kde debug"
-
-RDEPEND="x11-libs/libXext
-	x11-libs/libX11"
-DEPEND="x11-misc/imake
-	app-text/rman
-	x11-base/xorg-proto
-	x11-libs/libX11
-	x11-misc/gccmakedep"
-
-src_prepare() {
-	use kde && epatch "${FILESDIR}"/${P}-kde.patch
-}
-
-src_configure() {
-	xmkmf -a
-}
-
-src_compile() {
-	sed -i 's:/usr/X11R6/bin:/usr/bin:' Makefile || die "sed Makefile failed"
-	use debug && append-flags -DDEBUG
-	emake \
-		CC=$(tc-getCC) \
-		CCOPTIONS="${CFLAGS}" \
-		EXTRA_LDOPTIONS="${LDFLAGS}" \
-		|| die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install install.man || die "make install failed"
-	dodoc Changes README
-}
diff --git a/x11-terms/root-tail/root-tail-1.2-r4.ebuild b/x11-terms/root-tail/root-tail-1.2-r4.ebuild
index 465304ebd74e..410af2e42979 100644
--- a/x11-terms/root-tail/root-tail-1.2-r4.ebuild
+++ b/x11-terms/root-tail/root-tail-1.2-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://oldhome.schmorp.de/marc/data/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="kde debug"
 
 RDEPEND="x11-libs/libXext