gentoo resync : 15.09.2018

11 files changed, 156 insertions, 129 deletions

diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index 7e247bcbce8a..978c03c71edc 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 51eeea35226d..81d8afe4d8ef 100644
--- a/x11-terms/gnome-terminal/Manifest
+++ b/x11-terms/gnome-terminal/Manifest
@@ -1,4 +1,7 @@
 DIST gnome-terminal-3.24.2.tar.xz 1960952 BLAKE2B c94303cd8b322a37c70487fbab0f6ecd27b8e831cf44cdc80c82b31d2758f7c6927704d31c229cbbe41be565748238bbfcfae72470f273f7f3a9378c218af8b5 SHA512 08cd7b1b08cf22618554b1a051dcfee4a967165bfe93b77a6bc8b0c935695101e773e8d53a482d71aadb9ba7be7ac991d82dbf53b7a6f74f1f5144e4158f8a93
+DIST gnome-terminal-3.28.1-notify-open-title-transparency.patch.xz 33036 BLAKE2B 76c35db10664e02d1537aae586b47062b2ad85a48279426478ab2c9a9a659f728a7c01af2caaf058a71f4918d3d1e35a14c01dd7c67a2cf1aa368b4f4bc6eae7 SHA512 87d77fe8d9ab5b9ca3ff7eddcd462bf718b0f2d9dc1a60a2744ef8015b0910b588e0dc57ab10964602efa47465fd59f91381969157d9255fb5370039319a5f44
+DIST gnome-terminal-3.28.2.tar.xz 2094920 BLAKE2B 02f6e9b7273247169966e3125931e452ee4ac4669c53c79c93f49073511ef25a3f21df60510df0e7aefffad5e3ea14acdd1338a1c7ce934439863728e2d709ec SHA512 a20fe13fd2e533a90236410ce6ddd11e4da9da13f2d8952baa3cbf07379dbe253cf897b596421852084bbfc000264de11fb605c73909af8188baa93e46ddae8f
 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
 MISC metadata.xml 417 BLAKE2B ddec99c80b9ff060709ef724996eb8e73a8e587e022947b9f237adcd1ecb049fc48b8f7e8b6cd725d2f5e3276b9aecdcdb5acacddadfbd7edcc61dd9346789ae SHA512 a41ea1b6fc9d3dcbdf296590b206f924cb42c7dea27b68f593eb3e50aa37c6dd3df20b47c34f8cca2671dacd4fba6ec0f86caebebe6f66d496b7936d3cf0a688
diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.28.2.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.28.2.ebuild
new file mode 100644
index 000000000000..35cefbb216de
--- /dev/null
+++ b/x11-terms/gnome-terminal/gnome-terminal-3.28.2.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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/gnome-terminal-3.28.1-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.52.2: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/yelp-tools required for help/* with non-en LINGUAS, see bug #549358
+# xmllint required for glib-compile-resources, see bug #549304
+DEPEND="${RDEPEND}
+	app-text/yelp-tools
+	dev-libs/libxml2
+	dev-util/gdbus-codegen
+	>=dev-util/intltool-0.50
+	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}"/${PN}-3.28.1-notify-open-title-transparency.patch
+	fi
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		--disable-migration \
+		$(use_enable debug) \
+		$(use_enable gnome-shell search-provider) \
+		$(use_with nautilus nautilus-extension)
+}
+
+src_install() {
+	DOCS="AUTHORS ChangeLog HACKING NEWS"
+	gnome2_src_install
+	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 040bdcf00781..23fc22e7b038 100644
--- a/x11-terms/mate-terminal/Manifest
+++ b/x11-terms/mate-terminal/Manifest
@@ -6,5 +6,5 @@ EBUILD mate-terminal-1.12.1-r1.ebuild 826 BLAKE2B acb174bb84906768e94f111ebe6785
 EBUILD mate-terminal-1.12.1.ebuild 821 BLAKE2B a479523ff16449f56372133ce46e8ac30f0da377810a801b2bce3c69db0f360bff4b980ad062cdc67c6b375d765e926e1b3d39e826b4b0b4ed013d318ba69872 SHA512 80f90a2640950924ba5c7133d11fbfa7f44ca1914d4c5b387b8712ea1dd62247051dca12cd978dd204cebd7400bdd223220a70f046ed651adefac2ad927e370a
 EBUILD mate-terminal-1.14.1-r1.ebuild 866 BLAKE2B 7d1162a088fc9b90ed036b571adb0b64b2adcde79764ff399d3a3ff9ea32935a8f9f94350da622828eed599d07b8a15125ed8a49b2d6c92ea8bef8de181dfddd SHA512 aeb95bf228187367d4f84e874982b7a9fd2a7fdbd7cf55b4b3f29ae8e7765d14558d8d22ee25dc95d96e771aa73a0f82069ada2bc0c12ff33a0c8bf706bb14c0
 EBUILD mate-terminal-1.16.3.ebuild 727 BLAKE2B 322a0b3055192fa1a470ef3262cd5b3c0ed019c5665d11067f4981dea847dda196784dd31a7c3ac7dcad5a012fee9c8b0260def69d45d1dba7ec736987b8c895 SHA512 34ddf000b0c34e5ff8deeccd003457b390028b3ed7584cbc389257e00501a9267b78a950a2624da1320eb87fe1972afd213860787698a0aa4c48fc58cb55eb03
-EBUILD mate-terminal-1.18.2.ebuild 734 BLAKE2B b50b4728f312e67e3bf5f7c2643ef9732d2e55e66016c11e32877752c1c24d3d5f0e9108f65c378c040f865fee869b149972da7942afea94d5df0b96df7901cc SHA512 35c07abb60bf50e1daaab549882841e4918862853419686fc458c6a35df90c906f56f8912172f4fa0aeb2c21085f6a6585a2602557e4acce9a25f43a47655db3
+EBUILD mate-terminal-1.18.2.ebuild 732 BLAKE2B e4a51cfa9050f1529e8c4f1973759933310cafc4e549aa5e1b813618f83a94cff3831004fdba2c876cd80a156f590eea6f4a04c8194014631e7045a591ac7d14 SHA512 4addb84d2e72e408030d8c39bbe5a716354cdefafecc4e271bbd75e29fbb84dd333ebdd73c319df63180c46c6d12270147894dd7c79b0171fd9196c33f0bc0d3
 MISC metadata.xml 418 BLAKE2B d1b548c3d32a7ace12f9b99517feb78a64263476a32bbb9dfb167f67039ae207e1cabed5201121f0576fbc1e507c8dbb7b6277598872710e4ffc1927d67e319b SHA512 fc7439e9cd6aee179e6e6bf2ad282c0a62dc78b53dc5a0b33798ac90006159ffcc00625c156cdf93a474ef592ee3be2134ac4c7778d5d8b2768fed1ae1464cee
diff --git a/x11-terms/mate-terminal/mate-terminal-1.18.2.ebuild b/x11-terms/mate-terminal/mate-terminal-1.18.2.ebuild
index 3dd7e3b47352..49f9068abe51 100644
--- a/x11-terms/mate-terminal/mate-terminal-1.18.2.ebuild
+++ b/x11-terms/mate-terminal/mate-terminal-1.18.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit mate
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 DESCRIPTION="The MATE Terminal"
diff --git a/x11-terms/sakura/Manifest b/x11-terms/sakura/Manifest
index a12bfea07304..9868131d9ee4 100644
--- a/x11-terms/sakura/Manifest
+++ b/x11-terms/sakura/Manifest
@@ -1,4 +1,6 @@
 AUX sakura-3.1.3-flags.patch 626 BLAKE2B 5d0d19c134e0dca10d564049e8b988616e5d84d8bf88c8ab6469bdf3e504b9d528a7754cb02d171fd71497eac2363bfd41f1b26551a9e2dc5a39f262ff3e92d6 SHA512 007a2f2ab722bd991cee0da708efba301b3c69bb86eff25a14519008ad485e8e6ed1c8e2ded6fcd88ff7066528ff539eced4d105a84d6774aa952150beddc57f
 DIST sakura-3.5.0.tar.bz2 55432 BLAKE2B 9accd09eac359b64637ff5c318e50e32f5bfa27cf7fb5d4a99c91391e14f145020bd19077e20585b78149e5ac5f281abaf1098dbbaf111e54fd5ad5fbb2f4887 SHA512 20c691342c68a2a6f7397da754c83b19c7622e25984ae9fe9fef47492e19cd7589dd9d1bd2ccb82bd9c6ab82f92c97c1b742795434a101a0e169c6f901f40d9e
+DIST sakura-3.6.0.tar.bz2 56044 BLAKE2B 746de744ad562c4202acf4cb6803917530bde6edb13799630124e64e3e423ee423770cdebd5f8f42b5c2bd56b8863c82eb2015c65b2f168933c87337026c1313 SHA512 4b9d2c15305a2b9a193031194afc0b50deeb32ae52f8b13967801cd57aa71424d7dedf0a9aedf7470aef8b58d8341c85ae37ef67b941b8b97912eb845c5df08f
 EBUILD sakura-3.5.0.ebuild 1374 BLAKE2B 8f582200acd5a4ab13b8ee1e2c2eaa95cae00999aa892b9af60def89b3135c3dea157eae1b5b2edc4256457094bea473b5dfb1899020c56076b6763634c5206f SHA512 6189f97dae9654625cd4d8764746d8a96cadb5411b8260a3f1445b03a1e1a4bd23e58729049974f2dc708548b5f371b795be305c30c6b8abba36b871b47ff4f8
+EBUILD sakura-3.6.0.ebuild 1382 BLAKE2B a79d51d96301f740285f99a20db398bcc8249afb6b24dd853841ef8c9b235da24eedc88249f1f64d06911fee869ba4e42af75f6f7f782ccc46d2f8bb0abd24d1 SHA512 82c6c09038a5649c7706d34d1ecc0529ae67454ff867e95b0517b5c213e25929591391fc8f623ab329fc309408182db340a8ff9cb2b9117f671bbe29c46596be
 MISC metadata.xml 928 BLAKE2B 91926b81400896fef6be017fe1d0dacc25bb2331e84b7604223464c2f0862b0935aadf944dcd272a989ae9de5b180f3576725f30fa2a161ba24f27c5ba1884e0 SHA512 95be972f218e92365f8084f3a796199c3f7a182bc42c098761096f2146323afcdb2fc45e6c4ec975f03decdac05b9c01083c768162bf97c88c61dab892419ffb
diff --git a/x11-terms/sakura/sakura-3.6.0.ebuild b/x11-terms/sakura/sakura-3.6.0.ebuild
new file mode 100644
index 000000000000..db76e0ca9c4c
--- /dev/null
+++ b/x11-terms/sakura/sakura-3.6.0.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit cmake-utils eutils flag-o-matic gnome2-utils xdg-utils
+
+DESCRIPTION="sakura is a terminal emulator based on GTK and VTE"
+HOMEPAGE="http://www.pleyades.net/david/projects/sakura/"
+SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-linux"
+
+RDEPEND="
+	>=dev-libs/glib-2.20:2
+	x11-libs/gtk+:3[X]
+	x11-libs/libX11
+	>x11-libs/vte-0.50:2.91
+"
+DEPEND="
+	${RDEPEND}
+	>=dev-lang/perl-5.10.1
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.1.3-flags.patch
+)
+
+DOCS=(
+	AUTHORS
+)
+
+src_prepare() {
+	sed -i "/FILES INSTALL/d" CMakeLists.txt || die
+
+	strip-linguas -i po/
+	local lingua
+	for lingua in po/*.po; do
+		lingua="${lingua/po\/}"
+		lingua="${lingua/.po}"
+		if ! has ${lingua} ${LINGUAS}; then
+			rm po/${lingua}.po || die
+		fi
+	done
+
+	cmake-utils_src_prepare
+	# sakura.c:1740:3: warning: implicit declaration of function ‘readlink’
+	# [-Wimplicit-function-declaration]
+	append-cppflags -D_DEFAULT_SOURCE
+
+	# sakura.c:1348:9: error: ‘for’ loop initial declarations are only allowed
+	# in C99 or C11 mode
+	append-cflags -std=c99
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/x11-terms/st/Manifest b/x11-terms/st/Manifest
index f6883362fd24..b9adca63dbf8 100644
--- a/x11-terms/st/Manifest
+++ b/x11-terms/st/Manifest
@@ -1,8 +1,4 @@
-DIST st-0.7.tar.gz 42418 BLAKE2B 2f0eccaec964106b03c3daa75486d8f373582b2275c00a8d93e236f86e97a4bcb66e2fae6199cb23e4178515c4c67fe65bf95dd3aea98c279a662a7d1204ecef SHA512 9384820d373bfaaef1887290351d8c34abeef26cd7d50ddbae56ffb865864bcca9be798c6238bf1ce595ba7c317f2c1d97653055da0aa302e322eeee822768d4
 DIST st-0.8.1.tar.gz 45423 BLAKE2B e7f5d731ba86f37db4cda1f612a8f191f955d7ea8fd57c3fb142c695c41fda4d3b82a483bb3c1fff2d4ff66d9277ed22339c026bca4f4af740fc80cbbc7f3620 SHA512 787d35b0cc8b1435dad7809e9995bed3c7f781e012a4a43dd5ae3d670ebc0e4bc03a56ba3872ff8a3bdba316a41ba771c626adc8de0559296457a59170756c6b
-DIST st-0.8.tar.gz 45401 BLAKE2B 83a8ca385b6e94ded925b274983830664d84f3d746b4173fae9918f00464679f9e3b695a5a96554ca545c1f132a846a77d0627961ee1149b673133fd461e67a1 SHA512 47af80560f3bd803719b83e95affcb5425fed419fa4703dbd66ee2080f6671597aaba8110f3f7959190e8c3e2b02c62edf062fab950b2649f1d8c532c183de84
-EBUILD st-0.7.ebuild 1111 BLAKE2B e24b1a3fbd6f4bd397769643331a10bfa4e647f3848e93da210ab2251c9f2f92f9ac9be2a5a8d079114e4c7dfb20e10b5236a218591d8c41bfae22152040d93a SHA512 24b5c1ff578db7b32d12037eff589b6e5e34e28e17ae384a27ddd5e47558e814b330058bc482adc63beb6b7b413ba01650ba0451824e52e46f2b8255c05f20c1
-EBUILD st-0.8.1.ebuild 1393 BLAKE2B b6282c5ea60d600935c3f428941da6c2d89944e6d8e0ee2d24040f08fe9450e156f2ac6fac71a10092a3cd26e598c5e345a621ccaa86a0478dfea6cb08da22c6 SHA512 7849fea6b5407c7220ad2973d66df8b6faed5e63fab5873b2e9b1687da96b21d916b9dc5e843c8b0f3c1b8a889e8e3e0d245f9c686c75ce4a5e436a10c11ea03
-EBUILD st-0.8.ebuild 1386 BLAKE2B 242bbb98b01ce09c633afb600ac0a36b21afeb822ba35a9af57dfd12ae9e8791267697316530285e3692917473bc153cf961c95a4159430909333c2af228e8b6 SHA512 c2b3d27213c0fb8270e5fb3689bd07d3ef8493bb2799a16c713216286d25c616726e0047ae78d7b8c6e23793e69c8ce563a4d3289f1db06bae3005058ac9a2ea
+EBUILD st-0.8.1.ebuild 1390 BLAKE2B 301dfe3f377667dda33de383b9bdf896c1e349a47f743fa782e7a56b26ba149a80c403638a0bee8cfd7dc66469755158766911e84c0b60efb8a7d5fc7123b673 SHA512 9e3eea67968406faa141fb7b60377899903650aa3e1918270ce19ab9bf88ee4faca352fa2b95d33969428649f87e014776a5b8e5ae004591e1b80a4fbf9cb456
 EBUILD st-9999.ebuild 1354 BLAKE2B 34d87affb824b194f43186063a2a9666c011e5c513f14ffc71b973357abfc7b317c47e6360ca6d251a24caf33f3540e21462739859250fa88db5ca70e45d799f SHA512 70f645d48ded672f8231ccf7cea587a350122f80b3bec5f0f7707ebb8f9cb2cc650b55418383512665beafd842f2cca01b3c6d4517efb658123d2c22db50d0ae
 MISC metadata.xml 308 BLAKE2B 0b5b8fb79473744926b25e2bffcc047e5bc3a41cf4a8708e64bdcefcbd61bd6a3414e79d1c8a07498eda8b5203d5c786f36aa70a9530f82b88c540dcd4808556 SHA512 18e3f4a2e5cd9c0fc70a8069cb948383ff4ee7ebd4e02e6e5bb26d2b0650d42562602284d985484842a870c33693439614ba40b47d2d567a2fe1bc09e62d9fcb
diff --git a/x11-terms/st/st-0.7.ebuild b/x11-terms/st/st-0.7.ebuild
deleted file mode 100644
index 22efcadcec5a..000000000000
--- a/x11-terms/st/st-0.7.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils multilib savedconfig toolchain-funcs
-
-DESCRIPTION="simple terminal implementation for X"
-HOMEPAGE="https://st.suckless.org/"
-SRC_URI="https://dl.suckless.org/st/${P}.tar.gz"
-
-LICENSE="MIT-with-advertising"
-SLOT="0"
-KEYWORDS="amd64 ~arm hppa x86"
-IUSE="savedconfig"
-
-RDEPEND="
-	>=sys-libs/ncurses-6.0:0=
-	media-libs/fontconfig
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXft
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-	x11-base/xorg-proto
-"
-
-src_prepare() {
-	eapply_user
-
-	sed -e '/^CFLAGS/s:[[:space:]]-O[^[:space:]]*[[:space:]]: :' \
-		-e '/^X11INC/{s:/usr/X11R6/include:/usr/include/X11:}' \
-		-e "/^X11LIB/{s:/usr/X11R6/lib:/usr/$(get_libdir)/X11:}" \
-		-i config.mk || die
-	sed -e '/@echo/!s:@::' \
-		-e '/tic/d' \
-		-i Makefile || die
-	tc-export CC
-
-	restore_config config.h
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install
-
-	dodoc TODO
-
-	make_desktop_entry ${PN} simpleterm utilities-terminal 'System;TerminalEmulator;' ''
-
-	save_config config.h
-}
diff --git a/x11-terms/st/st-0.8.1.ebuild b/x11-terms/st/st-0.8.1.ebuild
index aaa8318a7aa6..149759a937fc 100644
--- a/x11-terms/st/st-0.8.1.ebuild
+++ b/x11-terms/st/st-0.8.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dl.suckless.org/st/${P}.tar.gz"
 
 LICENSE="MIT-with-advertising"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
+KEYWORDS="amd64 ~arm ~arm64 hppa x86"
 IUSE="savedconfig"
 
 RDEPEND="
diff --git a/x11-terms/st/st-0.8.ebuild b/x11-terms/st/st-0.8.ebuild
deleted file mode 100644
index 46e232587d9a..000000000000
--- a/x11-terms/st/st-0.8.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils multilib savedconfig toolchain-funcs
-
-DESCRIPTION="simple terminal implementation for X"
-HOMEPAGE="https://st.suckless.org/"
-SRC_URI="https://dl.suckless.org/st/${P}.tar.gz"
-
-LICENSE="MIT-with-advertising"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~x86"
-IUSE="savedconfig"
-
-RDEPEND="
-	>=sys-libs/ncurses-6.0:0=
-	media-libs/fontconfig
-	x11-libs/libX11
-	x11-libs/libXft
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-	x11-base/xorg-proto
-"
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e "/^X11LIB/{s:/usr/X11R6/lib:/usr/$(get_libdir)/X11:}" \
-		-e '/^STLDFLAGS/s|= .*|= $(LDFLAGS) $(LIBS)|g' \
-		-e '/^X11INC/{s:/usr/X11R6/include:/usr/include/X11:}' \
-		config.mk || die
-	sed -i \
-		-e '/tic/d' \
-		Makefile || die
-
-	restore_config config.h
-}
-
-src_configure() {
-	sed -i \
-		-e "s|pkg-config|$(tc-getPKG_CONFIG)|g" \
-		config.mk || die
-
-	tc-export CC
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install
-
-	dodoc TODO
-
-	make_desktop_entry ${PN} simpleterm utilities-terminal 'System;TerminalEmulator;' ''
-
-	save_config config.h
-}
-
-pkg_postinst() {
-	if ! [[ "${REPLACING_VERSIONS}" ]]; then
-		elog "Please ensure a usable font is installed, like"
-		elog "    media-fonts/corefonts"
-		elog "    media-fonts/dejavu"
-		elog "    media-fonts/urw-fonts"
-	fi
-}