From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1009877-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 75E101382C5
for <garchives@archives.gentoo.org>; Fri, 16 Mar 2018 20:22:07 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 4FDF6E0864;
Fri, 16 Mar 2018 20:22:06 +0000 (UTC)
Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 16D03E0864
for <gentoo-commits@lists.gentoo.org>; Fri, 16 Mar 2018 20:22:05 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 6C27F335C81
for <gentoo-commits@lists.gentoo.org>; Fri, 16 Mar 2018 20:22:04 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 80644240
for <gentoo-commits@lists.gentoo.org>; Fri, 16 Mar 2018 20:22:02 +0000 (UTC)
From: "Jeroen Roovers" <jer@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Jeroen Roovers" <jer@gentoo.org>
Message-ID: <1521231720.d8f03dd933001bcaefd876347643a18f04fbef5b.jer@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-terms/st/
X-VCS-Repository: repo/gentoo
X-VCS-Files: x11-terms/st/st-0.8.ebuild x11-terms/st/st-9999.ebuild
X-VCS-Directories: x11-terms/st/
X-VCS-Committer: jer
X-VCS-Committer-Name: Jeroen Roovers
X-VCS-Revision: d8f03dd933001bcaefd876347643a18f04fbef5b
X-VCS-Branch: master
Date: Fri, 16 Mar 2018 20:22:02 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 8c96a5f6-3525-43ef-89d7-220e5a843077
X-Archives-Hash: 455338ffd24bef211cef99890a1a6422
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;' ''