summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2014-10-31 11:20:24 +0000
committerJeroen Roovers <jer@gentoo.org>2014-10-31 11:20:24 +0000
commit72898f7de7b149f579c26b75aad1998c767011c1 (patch)
treec2660d31572330e4585dda460fc0fc71d0549d6a
parentremove old (diff)
downloadgentoo-2-72898f7de7b149f579c26b75aad1998c767011c1.tar.gz
gentoo-2-72898f7de7b149f579c26b75aad1998c767011c1.tar.bz2
gentoo-2-72898f7de7b149f579c26b75aad1998c767011c1.zip
Fix building against sys-libs/ncurses[tinfo] (bug #526356).
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key A792A613)
-rw-r--r--app-editors/dav/ChangeLog7
-rw-r--r--app-editors/dav/dav-0.8.5-r1.ebuild31
2 files changed, 20 insertions, 18 deletions
diff --git a/app-editors/dav/ChangeLog b/app-editors/dav/ChangeLog
index 59789fb2773b..d31a3c959b84 100644
--- a/app-editors/dav/ChangeLog
+++ b/app-editors/dav/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for app-editors/dav
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/dav/ChangeLog,v 1.19 2012/05/09 14:33:52 ago Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/dav/ChangeLog,v 1.20 2014/10/31 11:20:24 jer Exp $
+
+ 31 Oct 2014; Jeroen Roovers <jer@gentoo.org> dav-0.8.5-r1.ebuild:
+ Fix building against sys-libs/ncurses[tinfo] (bug #526356).
09 May 2012; Agostino Sarubbo <ago@gentoo.org> -dav-0.8.5.ebuild:
Remove old
diff --git a/app-editors/dav/dav-0.8.5-r1.ebuild b/app-editors/dav/dav-0.8.5-r1.ebuild
index a87605c80d33..0a76c48336c9 100644
--- a/app-editors/dav/dav-0.8.5-r1.ebuild
+++ b/app-editors/dav/dav-0.8.5-r1.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/dav/dav-0.8.5-r1.ebuild,v 1.5 2012/05/09 14:33:11 ago Exp $
-
-EAPI="3"
+# $Header: /var/cvsroot/gentoo-x86/app-editors/dav/dav-0.8.5-r1.ebuild,v 1.6 2014/10/31 11:20:24 jer Exp $
+EAPI=5
inherit eutils toolchain-funcs
DESCRIPTION="A minimal console text editor"
@@ -16,27 +15,27 @@ SRC_URI="http://dav-text.sourceforge.net/files/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="alpha amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-DEPEND="sys-libs/ncurses"
-RDEPEND="${DEPEND}"
+RDEPEND="sys-libs/ncurses"
+DEPEND="
+ ${RDEPEND}
+ virtual/pkgconfig
+"
src_prepare() {
- epatch "${FILESDIR}"/${P}-asneeded.patch \
+ epatch \
+ "${FILESDIR}"/${P}-asneeded.patch \
"${FILESDIR}"/${P}-davrc-buffer-overflow.patch
}
+# Makefile only
src_configure() { :; }
src_compile() {
- emake CFLAGS="${CFLAGS}" \
- LDFLAGS="${LDFLAGS} -lncurses" \
+ emake \
CC="$(tc-getCC)" \
- || die "emake failed"
+ CFLAGS="${CFLAGS}" \
+ LDFLAGS="${LDFLAGS} $( $(tc-getPKG_CONFIG) --libs ncurses)"
}
-src_install() {
- # no ./configure and doesn't hardcode /usr, so ED is fine
- emake DESTDIR="${ED}" install || die
- dodoc README
-}
+DOCS=( README )