gentoo resync : 18.03.2018

3 files changed, 81 insertions, 8 deletions

diff --git a/x11-terms/st/Manifest b/x11-terms/st/Manifest
index 46b8e900442c..7011dfac6af8 100644
--- a/x11-terms/st/Manifest
+++ b/x11-terms/st/Manifest
@@ -1,4 +1,6 @@
 DIST st-0.7.tar.gz 42418 BLAKE2B 2f0eccaec964106b03c3daa75486d8f373582b2275c00a8d93e236f86e97a4bcb66e2fae6199cb23e4178515c4c67fe65bf95dd3aea98c279a662a7d1204ecef SHA512 9384820d373bfaaef1887290351d8c34abeef26cd7d50ddbae56ffb865864bcca9be798c6238bf1ce595ba7c317f2c1d97653055da0aa302e322eeee822768d4
+DIST st-0.8.tar.gz 45401 BLAKE2B 83a8ca385b6e94ded925b274983830664d84f3d746b4173fae9918f00464679f9e3b695a5a96554ca545c1f132a846a77d0627961ee1149b673133fd461e67a1 SHA512 47af80560f3bd803719b83e95affcb5425fed419fa4703dbd66ee2080f6671597aaba8110f3f7959190e8c3e2b02c62edf062fab950b2649f1d8c532c183de84
 EBUILD st-0.7.ebuild 1129 BLAKE2B cb0a011d05f95e6e2c9393736eb85208d5ef4c88f597a8385a36ae77771573d97279e5ac0f65c37a2a269796d018e2b3549105e7e51371169ae919c78fccaab1 SHA512 9d16f3b81a4c29c03b69a6a7e0875a0c53a41c4ad6b194a3f9863cec5d57d3416cf0f060de7b5825e6a7ede3aa94d0d8f089eafc1d71c56566b118e5a9ba795d
-EBUILD st-9999.ebuild 1407 BLAKE2B 7c2d4281002fbe6554762bf2058eeb4e42ed432681fcdf530478d6a97b7cca5ecd8d175ea126d3804e876992de1f36c050d11cfe8a941f8af8302939b003a260 SHA512 a33b717161fc26ea0e7e62b8a62d9444a7a7316f5c1a22e56e5e997558122a2a01e7ee142e295bf58e188ec38094529ba58bc8a4233315bdae6358d17a87ab60
+EBUILD st-0.8.ebuild 1383 BLAKE2B d5a3b5f5a931bfefce2fb8623f355759144a8dfafa9806c0b7b24ab557a215ba033be2f0df87a0a2eafe6f679b152e92417feffd87aa05e5725aaa3f778e8329 SHA512 8beeabd53d3484c46fb800eb04803921a303e84b8012d55ae731bdc184570799a31b81c9e3eb2d4dab8bb88cb1e43dcb0b753f4e085a3b4756f818ce7ac78cfe
+EBUILD st-9999.ebuild 1351 BLAKE2B 44dcf00f4a4f414c8ebc7e26f389daeb3a8a4888e0a5e963bd45f2cfbcc8675e0a63f06f4b9f012cf78ecb1164863cf507615b322561ebc62b3d0d79b8487515 SHA512 c68805bb6511c1a2ab892ee3f6247dbd324479cb80e581ae621c6400406df42d88c77939f9b6c42c9e4d0e1f33851a7e618df36d76511b11a9fabbc870731d99
 MISC metadata.xml 308 BLAKE2B 0b5b8fb79473744926b25e2bffcc047e5bc3a41cf4a8708e64bdcefcbd61bd6a3414e79d1c8a07498eda8b5203d5c786f36aa70a9530f82b88c540dcd4808556 SHA512 18e3f4a2e5cd9c0fc70a8069cb948383ff4ee7ebd4e02e6e5bb26d2b0650d42562602284d985484842a870c33693439614ba40b47d2d567a2fe1bc09e62d9fcb
diff --git a/x11-terms/st/st-0.8.ebuild b/x11-terms/st/st-0.8.ebuild
new file mode 100644
index 000000000000..185c4aa2643b
--- /dev/null
+++ b/x11-terms/st/st-0.8.ebuild
@@ -0,0 +1,68 @@
+# 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-proto/xproto
+"
+
+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-9999.ebuild b/x11-terms/st/st-9999.ebuild
index 81e455048081..6968b6d8c46c 100644
--- a/x11-terms/st/st-9999.ebuild
+++ b/x11-terms/st/st-9999.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
@@ -16,13 +16,11 @@ RDEPEND="
 	>=sys-libs/ncurses-6.0:0=
 	media-libs/fontconfig
 	x11-libs/libX11
-	x11-libs/libXext
 	x11-libs/libXft
 "
 DEPEND="
 	${RDEPEND}
 	virtual/pkgconfig
-	x11-proto/xextproto
 	x11-proto/xproto
 "
 
@@ -30,23 +28,28 @@ src_prepare() {
 	default
 
 	sed -i \
-		-e '/^CFLAGS/s:[[:space:]]-Wall[[:space:]]: :' \
-		-e '/^CFLAGS/s:[[:space:]]-O[^[:space:]]*[[:space:]]: :' \
-		-e '/^LDFLAGS/{s:[[:space:]]-s[[:space:]]: :}' \
-		-e '/^X11INC/{s:/usr/X11R6/include:/usr/include/X11:}' \
 		-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;' ''