diff options
author | Jeroen Roovers <jer@gentoo.org> | 2014-12-06 08:21:12 +0000 |
---|---|---|
committer | Jeroen Roovers <jer@gentoo.org> | 2014-12-06 08:21:12 +0000 |
commit | 7ed2733a30d195f2b6d1a6affa4eac1e083945b1 (patch) | |
tree | 5bf385d65fd980dfcb8f645324640ec7730f30bb /app-editors/moe | |
parent | app-misc/fdupes: ADd new HOME of the project, thanks John Wyant for contactin... (diff) | |
download | gentoo-2-7ed2733a30d195f2b6d1a6affa4eac1e083945b1.tar.gz gentoo-2-7ed2733a30d195f2b6d1a6affa4eac1e083945b1.tar.bz2 gentoo-2-7ed2733a30d195f2b6d1a6affa4eac1e083945b1.zip |
Fix building against sys-libs/ncurses[-tinfo] (bug #531764).
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Diffstat (limited to 'app-editors/moe')
-rw-r--r-- | app-editors/moe/ChangeLog | 6 | ||||
-rw-r--r-- | app-editors/moe/files/moe-1.6-tinfo.patch | 2 | ||||
-rw-r--r-- | app-editors/moe/moe-1.6.ebuild | 16 |
3 files changed, 16 insertions, 8 deletions
diff --git a/app-editors/moe/ChangeLog b/app-editors/moe/ChangeLog index 7dc13874a1ff..3e23dd97f372 100644 --- a/app-editors/moe/ChangeLog +++ b/app-editors/moe/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-editors/moe # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/moe/ChangeLog,v 1.8 2014/11/02 22:08:35 zlogene Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/moe/ChangeLog,v 1.9 2014/12/06 08:21:12 jer Exp $ + + 06 Dec 2014; Jeroen Roovers <jer@gentoo.org> moe-1.6.ebuild, + files/moe-1.6-tinfo.patch: + Fix building against sys-libs/ncurses[-tinfo] (bug #531764). 02 Nov 2014; Mikle Kolyada <zlogene@gentoo.org> +files/moe-1.6-tinfo.patch, -moe-1.5.ebuild, moe-1.6.ebuild: diff --git a/app-editors/moe/files/moe-1.6-tinfo.patch b/app-editors/moe/files/moe-1.6-tinfo.patch index 916f1935da0d..6b91460e8e53 100644 --- a/app-editors/moe/files/moe-1.6-tinfo.patch +++ b/app-editors/moe/files/moe-1.6-tinfo.patch @@ -5,7 +5,7 @@ INSTALL_DATA = $(INSTALL) -m 644 INSTALL_DIR = $(INSTALL) -d -m 755 -LIBS = -lncurses -+LIBS = -lncurses -ltinfo ++LIBS = $(shell ${PKG_CONFIG} --libs ncurses) SHELL = /bin/sh edobjs = basic_buffer.o block.o buffer.o buffer_handle.o \ diff --git a/app-editors/moe/moe-1.6.ebuild b/app-editors/moe/moe-1.6.ebuild index cbf764efd7bf..414217cfdbbb 100644 --- a/app-editors/moe/moe-1.6.ebuild +++ b/app-editors/moe/moe-1.6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/moe/moe-1.6.ebuild,v 1.3 2014/11/02 22:08:35 zlogene Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/moe/moe-1.6.ebuild,v 1.4 2014/12/06 08:21:12 jer Exp $ EAPI=5 @@ -14,13 +14,17 @@ LICENSE="GPL-3" SLOT="0" KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux" -DEPEND="$(unpacker_src_uri_depends) - sys-libs/ncurses" - -RDEPEND="${DEPEND}" +RDEPEND=" + sys-libs/ncurses +" +DEPEND=" + $(unpacker_src_uri_depends) + ${RDEPEND} + virtual/pkgconfig +" src_prepare() { - tc-export CXX + tc-export CXX PKG_CONFIG sed -i \ -e "/^CXXFLAGS=/d" \ -e "/^LDFLAGS=/d" \ |