summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2013-08-03 22:56:46 +0000
committerUlrich Müller <ulm@gentoo.org>2013-08-03 22:56:46 +0000
commitd38be638442af0530472283258f47634a627ac20 (patch)
treefb2850a25dfa757451629ef05a6012fcf6bd4333 /app-editors/emacs
parent2.2.0_alpha193 version bump. This includes all of the fixes in 2.1.13.4. (diff)
downloadgentoo-2-d38be638442af0530472283258f47634a627ac20.tar.gz
gentoo-2-d38be638442af0530472283258f47634a627ac20.tar.bz2
gentoo-2-d38be638442af0530472283258f47634a627ac20.zip
Use pkg-config to detect ncurses, bug 457530.
(Portage version: 2.1.12.13/cvs/Linux x86_64, signed Manifest commit with key 9433907D693FB5B8!)
Diffstat (limited to 'app-editors/emacs')
-rw-r--r--app-editors/emacs/ChangeLog5
-rw-r--r--app-editors/emacs/emacs-18.59-r8.ebuild6
2 files changed, 8 insertions, 3 deletions
diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index aede1a94b3e9..b27ad2ee6fb9 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for app-editors/emacs
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.592 2013/08/03 06:52:22 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.593 2013/08/03 22:56:46 ulm Exp $
+
+ 03 Aug 2013; Ulrich Müller <ulm@gentoo.org> emacs-18.59-r8.ebuild:
+ Use pkg-config to detect ncurses, bug 457530.
03 Aug 2013; Agostino Sarubbo <ago@gentoo.org> emacs-24.3-r2.ebuild:
Stable for sparc, wrt bug #476702
diff --git a/app-editors/emacs/emacs-18.59-r8.ebuild b/app-editors/emacs/emacs-18.59-r8.ebuild
index 43b15f31b3f9..de9da52e5007 100644
--- a/app-editors/emacs/emacs-18.59-r8.ebuild
+++ b/app-editors/emacs/emacs-18.59-r8.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-18.59-r8.ebuild,v 1.9 2013/03/18 23:13:13 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-18.59-r8.ebuild,v 1.10 2013/08/03 22:56:46 ulm Exp $
EAPI=4
@@ -21,7 +21,8 @@ RDEPEND="sys-libs/ncurses
>=app-admin/eselect-emacs-1.2
amd64? ( !abi_x86_x32? ( app-emulation/emul-linux-x86-baselibs ) )"
# X? ( x11-libs/libX11[-xcb] )
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
src_prepare() {
epatch "${WORKDIR}/${P}-linux22x-elf-glibc21.diff"
@@ -58,6 +59,7 @@ src_configure() {
END
sed -i -e "s:/usr/lib/\([^ ]*\).o:/usr/$(get_libdir)/\1.o:g" \
+ -e "s:-lncurses:$("$(tc-getPKG_CONFIG)" --libs ncurses):" \
src/s-linux.h || die
# -O3 and -finline-functions cause segmentation faults at run time.