gentoo resync : 21.06.2020

5 files changed, 78 insertions, 2 deletions

diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index 1c152d573983..b83599c6b3e0 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
diff --git a/x11-terms/st/Manifest b/x11-terms/st/Manifest
index 067784b9cd42..f76cbd846724 100644
--- a/x11-terms/st/Manifest
+++ b/x11-terms/st/Manifest
@@ -1,6 +1,8 @@
 DIST st-0.8.2.tar.gz 44788 BLAKE2B cc7fc9040c6db1c903d0f7290e5cfd1c636b2d17b42645956583cc8fa883bc1f0631ffbd683e735a834ff96f90171d9d423801d84ce4c0686564498baa97bbc6 SHA512 eaaf5f2fe050ee768d16a9c8c295ba13315775b3a8a3201e020237a3dd217bfb811832d58477249000596289a6cb3287fbb39d6327fc90986af1c363e4b5bf8d
 DIST st-0.8.3.tar.gz 46292 BLAKE2B e84986dedd9aa8ff8e0b1c702cf5601c16cbed67f69623f41bc4908adb06fa29783b21de22576a50ccaa3cb49f515f284b1c4e72b6c5d9fd9b8efb05434b31c1 SHA512 2a824e43d9b3085d9c5c772e3411d744509be79301937c946b27f25451f68813f46c863dd37babbf67716506e86bc70d03645b39d7b124390b07f8f3e0c0c573
+DIST st-0.8.4.tar.gz 47330 BLAKE2B 709278a669414d7d44beba02ebb606853dbaa9cfe71650e40a11d3691d6bee2c0b2e8db57ca2df52776ca564a20f64f3ef7acec8dbad6d66408d314fe26fb794 SHA512 f6f95081f9d09d442228bac1149d75d36a9f4f049b5504cf5ce00b353563ff92c62a2628ce728663fec107a14bea0eeb22b7a72804c37090de33819243d7512a
 EBUILD st-0.8.2.ebuild 1395 BLAKE2B 13ec341a08d934219c584f1d308f0d12174be9ad41b2e35c08805367013c901407885383c13fc0cb42cac4851542ca9d12d5c49614a1f2c29f8972866f4ede58 SHA512 d961201fb17a883b9c083201fd457307e2601c33b91b12be68fcd53c4b57863731193cff39c895e921bcc40411fa9d19aee6a72ad1601d59acb978f2dc321c4b
 EBUILD st-0.8.3.ebuild 1398 BLAKE2B b2e5497c103ed053d93052a6f57346427670af48ec6f227a12a13e032bc0c1ba30899d671edcf8b71db16e3b47ddeedf5b0601620559f2bddf5e8431880245f4 SHA512 103f8ea25c28ed9d49d5a2b7afe9a3f6c15996c1bde1b3504bde0c20897e013aca0e404d5add218e2093606069270f61fea8e605202584bd3d73e010f77ff88e
+EBUILD st-0.8.4.ebuild 1398 BLAKE2B b2e5497c103ed053d93052a6f57346427670af48ec6f227a12a13e032bc0c1ba30899d671edcf8b71db16e3b47ddeedf5b0601620559f2bddf5e8431880245f4 SHA512 103f8ea25c28ed9d49d5a2b7afe9a3f6c15996c1bde1b3504bde0c20897e013aca0e404d5add218e2093606069270f61fea8e605202584bd3d73e010f77ff88e
 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.4.ebuild b/x11-terms/st/st-0.8.4.ebuild
new file mode 100644
index 000000000000..c377bfcdc276
--- /dev/null
+++ b/x11-terms/st/st-0.8.4.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit desktop 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 ~ppc64 ~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/terminology/Manifest b/x11-terms/terminology/Manifest
index 937ea8f62c60..c9da2ceb9325 100644
--- a/x11-terms/terminology/Manifest
+++ b/x11-terms/terminology/Manifest
@@ -1,3 +1,3 @@
 DIST terminology-1.7.0.tar.xz 4922616 BLAKE2B 40ca7bfff534e773b4c188970ecd82e44c2eee7a75eb2a6d4fc6a8635c57857e2037a319818a437843271faa42995f25b613091a4463c02427d835c6ae572722 SHA512 9635da6a51344fbbafd333592252c2539daa795600b4a1d5ea5710e294f18ff9f5667706c789a3c91378b493ae631df47faec2bc43b4cc48d0266506ab3f2e78
-EBUILD terminology-1.7.0.ebuild 863 BLAKE2B be914264f24ea3409404756bc6e47c706993acd1fa709acadf805e3a4ef09aea314985e8d0e4e47f54419d435e8f0cf3d2249f641eec6ab7cd8d7bf5a9dac54c SHA512 cd6dda2aadea2a97386771914a161443c2379936ff2eff3bfc47ab40605994d54e5e9f981cedc23bcca5a4c296e3eb309088f1fbe854e42087dae7aed9e91c6e
+EBUILD terminology-1.7.0-r1.ebuild 925 BLAKE2B 576eb4f1307cb5fbe3ee38f9d5dbdbe1fb6c717f5a1d608c0d82b31431998ca33c0431baedcb51f22e43ada748b40c8c03982f3516fffbfdacc0bfaec944076e SHA512 03ca28e8b7cc30a2a0b71ff13e102e2c4fe45a673bee375f6e0ab564836fe7335fae24ede6f16e6a5d250d1a0a468581f2d84711bcb51f96632d265f6420abfc
 MISC metadata.xml 335 BLAKE2B 284db47c691f29fa5b409845f970dde0aa4f2db13d11c4f383bf3b6d13ec8ce05786817a774755a1711e3c748a007733f6a55941a25f7fefa6a87d16df2de625 SHA512 050b1e1ebe7f891d60a1cdb1e6156535eeaa91e7a8064f9dfa9dd0ae948444b13c568761ff7d1f980d78c9afefdb9df1b33813fa2167b7347bcb3f43cb95fb96
diff --git a/x11-terms/terminology/terminology-1.7.0.ebuild b/x11-terms/terminology/terminology-1.7.0-r1.ebuild
index fd7f3fd7458a..6b3a9662a1c8 100644
--- a/x11-terms/terminology/terminology-1.7.0.ebuild
+++ b/x11-terms/terminology/terminology-1.7.0-r1.ebuild
@@ -14,7 +14,13 @@ SLOT="0"
 KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
 IUSE="extras nls"
 
-RDEPEND="|| ( dev-libs/efl[gles2] dev-libs/efl[opengl] )
+RDEPEND="|| (
+		|| (
+			>=dev-libs/efl-1.24.3[gles2-only]
+			<dev-libs/efl-1.24.3[gles2]
+		)
+		dev-libs/efl[opengl]
+	)
 	|| ( dev-libs/efl[X] dev-libs/efl[wayland] )
 	app-arch/lz4
 	dev-libs/efl[eet,fontconfig]"