gentoo resync : 18.08.2019

3 files changed, 2 insertions, 72 deletions

diff --git a/x11-terms/st/Manifest b/x11-terms/st/Manifest
index 281eef21bd6a..26019040de67 100644
--- a/x11-terms/st/Manifest
+++ b/x11-terms/st/Manifest
@@ -1,6 +1,4 @@
-DIST st-0.8.1.tar.gz 45423 BLAKE2B e7f5d731ba86f37db4cda1f612a8f191f955d7ea8fd57c3fb142c695c41fda4d3b82a483bb3c1fff2d4ff66d9277ed22339c026bca4f4af740fc80cbbc7f3620 SHA512 787d35b0cc8b1435dad7809e9995bed3c7f781e012a4a43dd5ae3d670ebc0e4bc03a56ba3872ff8a3bdba316a41ba771c626adc8de0559296457a59170756c6b
 DIST st-0.8.2.tar.gz 44788 BLAKE2B cc7fc9040c6db1c903d0f7290e5cfd1c636b2d17b42645956583cc8fa883bc1f0631ffbd683e735a834ff96f90171d9d423801d84ce4c0686564498baa97bbc6 SHA512 eaaf5f2fe050ee768d16a9c8c295ba13315775b3a8a3201e020237a3dd217bfb811832d58477249000596289a6cb3287fbb39d6327fc90986af1c363e4b5bf8d
-EBUILD st-0.8.1.ebuild 1390 BLAKE2B 301dfe3f377667dda33de383b9bdf896c1e349a47f743fa782e7a56b26ba149a80c403638a0bee8cfd7dc66469755158766911e84c0b60efb8a7d5fc7123b673 SHA512 9e3eea67968406faa141fb7b60377899903650aa3e1918270ce19ab9bf88ee4faca352fa2b95d33969428649f87e014776a5b8e5ae004591e1b80a4fbf9cb456
-EBUILD st-0.8.2.ebuild 1391 BLAKE2B 737c46847c40502d93d42a75834ebe8f87f8c87ed754c3103261abf103199d3b7e8b7a6c3bdb7aa0bdceb5ee801ccd58c3c7007a7b4c3b96e3592145e71a2711 SHA512 ec66f840ee5e48faca45659194a2298b38f22bbdb0fd66ab7d0e408e4f67637d20fbce13d88afb0e5c82e39d0686b20425b77b70a8ce86fd33434dc1770e351e
+EBUILD st-0.8.2.ebuild 1388 BLAKE2B 43e24c14163bc747844ffbc47c9bde4e206203412078dc65dcc4dfed5119d541b9fcff5fb4064f5870840037cb9dc9c1f6853f208f1b56e6a2c4ee251453c659 SHA512 9df999e435999f9b3e58e697855326a7b7540b6cd68fa69d973f7837b03c8fcd06e3a64357b47cda6a5b5a6602de5ae8ba8689b0dbee953ec7cdd49aa10d6b08
 EBUILD st-9999.ebuild 1367 BLAKE2B 17a55761d49fe1ae3c88a730ccae177895e4174b8755680d53836045bfeab38e2eae9cba338d8fbd4d66184b840f46035c9960972108d9d8239ee8c4c7107e5e SHA512 f30b676ff15da80725d672c35bf3581d7424c431dcede7c2412dfe2390fc31e4982de33c7cb2edd0a26d29de29a48a4a264ad9e86ca0518d36bca2f078f7cc4c
 MISC metadata.xml 210 BLAKE2B bb9591af5406abbf589664053ab6e5cb38933fe6ef97c11609405392b050b26cff8e94e04e85e5798124abd46283bee67b2a74923a5041616df15aaa9cff6da9 SHA512 f7cbe57a24b67a28696f91061ad8bd61d7d4cf3d59d20c3dcc6a4921e29672d00ecf3ece70a8813399d2467ebd626f8f829300e81fc722e9aaa527e213a5fb54
diff --git a/x11-terms/st/st-0.8.1.ebuild b/x11-terms/st/st-0.8.1.ebuild
deleted file mode 100644
index 149759a937fc..000000000000
--- a/x11-terms/st/st-0.8.1.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 ~arm64 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
-}
diff --git a/x11-terms/st/st-0.8.2.ebuild b/x11-terms/st/st-0.8.2.ebuild
index 185bb03fd8f3..a3818b9262ab 100644
--- a/x11-terms/st/st-0.8.2.ebuild
+++ b/x11-terms/st/st-0.8.2.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="