summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Weber <xmw@gentoo.org>2013-02-23 15:12:43 +0000
committerMichael Weber <xmw@gentoo.org>2013-02-23 15:12:43 +0000
commit744f79856a91085a4c9c825fd3146a50cd254731 (patch)
tree16ce886911fa99bb3002619644fe1d40c0d1adec /x11-terms/st/st-9999.ebuild
parentFixed libpng dependency (diff)
downloadgentoo-2-744f79856a91085a4c9c825fd3146a50cd254731.tar.gz
gentoo-2-744f79856a91085a4c9c825fd3146a50cd254731.tar.bz2
gentoo-2-744f79856a91085a4c9c825fd3146a50cd254731.zip
Correct X11 paths (thanks Joe M, bug 458796), verbose build.
(Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)
Diffstat (limited to 'x11-terms/st/st-9999.ebuild')
-rw-r--r--x11-terms/st/st-9999.ebuild13
1 files changed, 8 insertions, 5 deletions
diff --git a/x11-terms/st/st-9999.ebuild b/x11-terms/st/st-9999.ebuild
index 8df10f32c2f4..07d4e6fce4a9 100644
--- a/x11-terms/st/st-9999.ebuild
+++ b/x11-terms/st/st-9999.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/st/st-9999.ebuild,v 1.7 2013/02/22 16:16:39 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/st/st-9999.ebuild,v 1.8 2013/02/23 15:12:43 xmw Exp $
EAPI=5
-inherit git-2 savedconfig toolchain-funcs
+inherit multilib savedconfig toolchain-funcs
DESCRIPTION="simple terminal implementation for X"
HOMEPAGE="http://st.suckless.org/"
@@ -15,8 +15,7 @@ SLOT="0"
KEYWORDS=""
IUSE="savedconfig"
-RDEPEND="
- media-libs/fontconfig
+RDEPEND="media-libs/fontconfig
x11-libs/libX11
x11-libs/libXext
x11-libs/libXft"
@@ -27,14 +26,18 @@ src_prepare() {
sed -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:}" \
-i config.mk || die
+ sed -e '/@echo/!s:@::' \
+ -i Makefile || die
tc-export CC
restore_config config.h
}
src_install() {
- emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install || die
+ emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install
tic -s -o "${ED}"/usr/share/terminfo st.info || die
dodoc TODO