From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B012C139085 for ; Sun, 1 Jan 2017 22:45:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E4EACE0D72; Sun, 1 Jan 2017 22:45:17 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BFB21E0D72 for ; Sun, 1 Jan 2017 22:45:17 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D333033BEFC for ; Sun, 1 Jan 2017 22:45:16 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 751F22607 for ; Sun, 1 Jan 2017 22:45:14 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1483310684.335949ee475f372a92f8a3a2ff28e2f5c0c3b931.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/sonnet/ X-VCS-Repository: repo/gentoo X-VCS-Files: kde-frameworks/sonnet/sonnet-5.26.0.ebuild kde-frameworks/sonnet/sonnet-5.29.0.ebuild X-VCS-Directories: kde-frameworks/sonnet/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 335949ee475f372a92f8a3a2ff28e2f5c0c3b931 X-VCS-Branch: master Date: Sun, 1 Jan 2017 22:45:14 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 0440a37a-e9b3-4b3b-8137-0ee073aa04cd X-Archives-Hash: 22735e92fcaf8a3e02944b32d64edca1 commit: 335949ee475f372a92f8a3a2ff28e2f5c0c3b931 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Jan 1 22:42:36 2017 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Jan 1 22:44:44 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=335949ee kde-frameworks/sonnet: Fix configure w/ future hunspell Package-Manager: portage-2.3.0 kde-frameworks/sonnet/sonnet-5.26.0.ebuild | 10 +++++++++- kde-frameworks/sonnet/sonnet-5.29.0.ebuild | 10 +++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/kde-frameworks/sonnet/sonnet-5.26.0.ebuild b/kde-frameworks/sonnet/sonnet-5.26.0.ebuild index 18c39b4..27fe13a 100644 --- a/kde-frameworks/sonnet/sonnet-5.26.0.ebuild +++ b/kde-frameworks/sonnet/sonnet-5.26.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -21,6 +21,14 @@ DEPEND="${RDEPEND} nls? ( $(add_qt_dep linguist-tools) ) " +src_prepare() { + kde5_src_prepare + + # ensure at least one version-free atom so that hunspell is found + sed -e "/FIND_LIBRARY(HUNSPELL_LIBRARIES/ s/\bhunspell\b-[0-9.]*/hunspell/" \ + -i cmake/FindHUNSPELL.cmake || die +} + src_configure() { local mycmakeargs=( $(cmake-utils_use_find_package aspell ASPELL) diff --git a/kde-frameworks/sonnet/sonnet-5.29.0.ebuild b/kde-frameworks/sonnet/sonnet-5.29.0.ebuild index 46783f1..5b0ae24 100644 --- a/kde-frameworks/sonnet/sonnet-5.29.0.ebuild +++ b/kde-frameworks/sonnet/sonnet-5.29.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -21,6 +21,14 @@ DEPEND="${RDEPEND} nls? ( $(add_qt_dep linguist-tools) ) " +src_prepare() { + kde5_src_prepare + + # ensure at least one version-free atom so that hunspell is found + sed -e "/FIND_LIBRARY(HUNSPELL_LIBRARIES/ s/\bhunspell\b-[0-9.]*/hunspell/" \ + -i cmake/FindHUNSPELL.cmake || die +} + src_configure() { local mycmakeargs=( $(cmake-utils_use_find_package aspell ASPELL)