Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/sonnet/
Date: Sun, 01 Jan 2017 22:45:18
Message-Id: 1483310684.335949ee475f372a92f8a3a2ff28e2f5c0c3b931.asturm@gentoo
1 commit: 335949ee475f372a92f8a3a2ff28e2f5c0c3b931
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jan 1 22:42:36 2017 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sun Jan 1 22:44:44 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=335949ee
7
8 kde-frameworks/sonnet: Fix configure w/ future hunspell
9
10 Package-Manager: portage-2.3.0
11
12 kde-frameworks/sonnet/sonnet-5.26.0.ebuild | 10 +++++++++-
13 kde-frameworks/sonnet/sonnet-5.29.0.ebuild | 10 +++++++++-
14 2 files changed, 18 insertions(+), 2 deletions(-)
15
16 diff --git a/kde-frameworks/sonnet/sonnet-5.26.0.ebuild b/kde-frameworks/sonnet/sonnet-5.26.0.ebuild
17 index 18c39b4..27fe13a 100644
18 --- a/kde-frameworks/sonnet/sonnet-5.26.0.ebuild
19 +++ b/kde-frameworks/sonnet/sonnet-5.26.0.ebuild
20 @@ -1,4 +1,4 @@
21 -# Copyright 1999-2016 Gentoo Foundation
22 +# Copyright 1999-2017 Gentoo Foundation
23 # Distributed under the terms of the GNU General Public License v2
24 # $Id$
25
26 @@ -21,6 +21,14 @@ DEPEND="${RDEPEND}
27 nls? ( $(add_qt_dep linguist-tools) )
28 "
29
30 +src_prepare() {
31 + kde5_src_prepare
32 +
33 + # ensure at least one version-free atom so that hunspell is found
34 + sed -e "/FIND_LIBRARY(HUNSPELL_LIBRARIES/ s/\bhunspell\b-[0-9.]*/hunspell/" \
35 + -i cmake/FindHUNSPELL.cmake || die
36 +}
37 +
38 src_configure() {
39 local mycmakeargs=(
40 $(cmake-utils_use_find_package aspell ASPELL)
41
42 diff --git a/kde-frameworks/sonnet/sonnet-5.29.0.ebuild b/kde-frameworks/sonnet/sonnet-5.29.0.ebuild
43 index 46783f1..5b0ae24 100644
44 --- a/kde-frameworks/sonnet/sonnet-5.29.0.ebuild
45 +++ b/kde-frameworks/sonnet/sonnet-5.29.0.ebuild
46 @@ -1,4 +1,4 @@
47 -# Copyright 1999-2016 Gentoo Foundation
48 +# Copyright 1999-2017 Gentoo Foundation
49 # Distributed under the terms of the GNU General Public License v2
50 # $Id$
51
52 @@ -21,6 +21,14 @@ DEPEND="${RDEPEND}
53 nls? ( $(add_qt_dep linguist-tools) )
54 "
55
56 +src_prepare() {
57 + kde5_src_prepare
58 +
59 + # ensure at least one version-free atom so that hunspell is found
60 + sed -e "/FIND_LIBRARY(HUNSPELL_LIBRARIES/ s/\bhunspell\b-[0-9.]*/hunspell/" \
61 + -i cmake/FindHUNSPELL.cmake || die
62 +}
63 +
64 src_configure() {
65 local mycmakeargs=(
66 $(cmake-utils_use_find_package aspell ASPELL)