diff options
| author |   Steve Arnold <nerdboy@gentoo.org> | 2014-02-11 06:47:09 +0000 |
|---|---|---|
| committer | Steve Arnold <nerdboy@gentoo.org> | 2014-02-11 06:47:09 +0000 |
| commit | 7de533d06913a9ab6c0bbfcd1a393b256805e187 (patch) | |
| tree | 2268d2c78aad2ece31cefd169bbaa7183f9f5f4d /app-text/aspell | |
| parent | Added python-3.2 compat (diff) | |
| download | gentoo-2-7de533d06913a9ab6c0bbfcd1a393b256805e187.tar.gz gentoo-2-7de533d06913a9ab6c0bbfcd1a393b256805e187.tar.bz2 gentoo-2-7de533d06913a9ab6c0bbfcd1a393b256805e187.zip | |
Added fixes for bug #467602 and ncurses link issue when USE=tinfo.
(Portage version: 2.2.8/cvs/Linux x86_64, signed Manifest commit with key )
Diffstat (limited to 'app-text/aspell')
| -rw-r--r-- | app-text/aspell/ChangeLog | 5 | ||||
| -rw-r--r-- | app-text/aspell/aspell-0.60.6.1.ebuild | 21 |
2 files changed, 22 insertions, 4 deletions
diff --git a/app-text/aspell/ChangeLog b/app-text/aspell/ChangeLog index f8c2217d0d0d..fd0db229d6f2 100644 --- a/app-text/aspell/ChangeLog +++ b/app-text/aspell/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-text/aspell # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/aspell/ChangeLog,v 1.144 2014/01/05 11:33:24 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/aspell/ChangeLog,v 1.145 2014/02/11 06:47:09 nerdboy Exp $ + + 11 Feb 2014; Steve Arnold <nerdboy@gentoo.org> aspell-0.60.6.1.ebuild: + Added fixes for bug #467602 and ncurses link issue when USE=tinfo. 05 Jan 2014; Pacho Ramos <pacho@gentoo.org> metadata.xml: Cleanup due http://gentoo.2317880.n4.nabble.com/app-dicts-herd-is-empty- diff --git a/app-text/aspell/aspell-0.60.6.1.ebuild b/app-text/aspell/aspell-0.60.6.1.ebuild index 48db9c7672b7..22292d52df49 100644 --- a/app-text/aspell/aspell-0.60.6.1.ebuild +++ b/app-text/aspell/aspell-0.60.6.1.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-text/aspell/aspell-0.60.6.1.ebuild,v 1.11 2014/01/02 18:06:54 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/aspell/aspell-0.60.6.1.ebuild,v 1.12 2014/02/11 06:47:09 nerdboy Exp $ EAPI=4 @@ -44,7 +44,12 @@ RDEPEND="${COMMON_DEPEND} !=app-dicts/aspell-en-0.5*" src_prepare() { - #epatch "${FILESDIR}/${PN}-0.60.3-templateinstantiations.patch" + # fix for bug #467602 + if has_version ">=sys-devel/automake-1.13" ; then + sed -i -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' \ + "${S}"/configure.ac || die "sed failed" + fi + epatch "${FILESDIR}/${PN}-0.60.5-nls.patch" epatch "${FILESDIR}/${PN}-0.60.5-solaris.patch" epatch "${FILESDIR}/${PN}-0.60.6-darwin-bundles.patch" @@ -58,10 +63,20 @@ src_prepare() { # This has to be after automake has run so that we don't clobber # the default target that automake creates for us. echo 'install-filterLTLIBRARIES: install-libLTLIBRARIES' >> Makefile.in + } src_configure() { - econf \ + # if ncurses is built with separate tinfo libs, then... + if built_with_use sys-libs/ncurses tinfo ; then + if built_with_use sys-libs/ncurses unicode ; then + CURSES_LIB="-lncursesw -ltinfow" + else + CURSES_LIB="-lncurses -ltinfo" + fi + fi + + CURSES_LIB="${CURSES_LIB}" econf \ $(use_enable nls) \ --disable-static \ --sysconfdir="${EPREFIX}"/etc/aspell \ |