[gentoo-commits] repo/gentoo:master commit in: x11-terms/st/

[Jeroen Roovers]

commit:     d8f03dd933001bcaefd876347643a18f04fbef5b
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 16 20:21:46 2018 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Fri Mar 16 20:22:00 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8f03dd9

x11-terms/st: Define src_configure().

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 x11-terms/st/st-0.8.ebuild  | 23 +++++++++++++++++++----
 x11-terms/st/st-9999.ebuild | 17 ++++++++++-------
 2 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/x11-terms/st/st-0.8.ebuild b/x11-terms/st/st-0.8.ebuild
index 6ae06a264f5..185c4aa2643 100644
--- a/x11-terms/st/st-0.8.ebuild
+++ b/x11-terms/st/st-0.8.ebuild
@@ -26,22 +26,28 @@ DEPEND="
 "
 
 src_prepare() {
-       eapply_user
+       default
 
        sed -i \
-               -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 "s|pkg-config|$(tc-getPKG_CONFIG)|g" \
+               -e '/^X11INC/{s:/usr/X11R6/include:/usr/include/X11:}' \
                config.mk || die
        sed -i \
                -e '/tic/d' \
                Makefile || die
-       tc-export CC
 
        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
 
@@ -51,3 +57,12 @@ src_install() {
 
        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 81e45504808..6968b6d8c46 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;' ''