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 94220138334 for ; Fri, 12 Oct 2018 22:40:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 44E51E08C8; Fri, 12 Oct 2018 22:40:22 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id F3000E08C8 for ; Fri, 12 Oct 2018 22:40:21 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4C750335C58 for ; Fri, 12 Oct 2018 22:40:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 24ECA3F6 for ; Fri, 12 Oct 2018 22:40:03 +0000 (UTC) From: "Chris Reffett" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Chris Reffett" Message-ID: <1539383926.6a34df8eae4ad4debd0d170f1fe73cc0b3e62ff8.creffett@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/sword/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-text/sword/sword-1.8.1-r1.ebuild app-text/sword/sword-1.8.1.ebuild X-VCS-Directories: app-text/sword/ X-VCS-Committer: creffett X-VCS-Committer-Name: Chris Reffett X-VCS-Revision: 6a34df8eae4ad4debd0d170f1fe73cc0b3e62ff8 X-VCS-Branch: master Date: Fri, 12 Oct 2018 22:40:03 +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: 365d96be-8f4c-45c7-96a8-193d911a9cd2 X-Archives-Hash: ec68a3de87593da7e3aca16de016e302 commit: 6a34df8eae4ad4debd0d170f1fe73cc0b3e62ff8 Author: Chris Reffett gentoo org> AuthorDate: Fri Oct 12 22:37:53 2018 +0000 Commit: Chris Reffett gentoo org> CommitDate: Fri Oct 12 22:38:46 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a34df8e app-text/sword: Revbump, switch to cmake build Switch to using CMake build system. Incidentally fixes 668296. Bug: https://bugs.gentoo.org/668296 Signed-off-by: Chris Reffett gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 .../{sword-1.8.1.ebuild => sword-1.8.1-r1.ebuild} | 41 +++++++++------------- 1 file changed, 16 insertions(+), 25 deletions(-) diff --git a/app-text/sword/sword-1.8.1.ebuild b/app-text/sword/sword-1.8.1-r1.ebuild similarity index 72% rename from app-text/sword/sword-1.8.1.ebuild rename to app-text/sword/sword-1.8.1-r1.ebuild index 1ddc808294c..263d19b2a7c 100644 --- a/app-text/sword/sword-1.8.1.ebuild +++ b/app-text/sword/sword-1.8.1-r1.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -inherit flag-o-matic +EAPI=6 +inherit flag-o-matic cmake-utils DESCRIPTION="Library for Bible reading software" HOMEPAGE="http://www.crosswire.org/sword/" @@ -27,38 +27,29 @@ DOCS="AUTHORS CODINGSTYLE ChangeLog README" RESTRICT="test" #Restricting for now, see bug 313207 src_prepare() { - sed -i \ - -e '/FLAGS/s:-g3::' -e '/FLAGS/s:-O0::' \ - -e '/FLAGS/s:-O2::' -e '/FLAGS/s:-O3::' \ - configure || die - - sed -i -e '/FLAGS/s:-Werror::' configure || die #408289 sed -i -e '/^#inc.*curl.*types/d' src/mgr/curl*.cpp || die #378055 - - cat <<-EOF > "${T}"/${PN}.conf - [Install] - DataPath=${EPREFIX}/usr/share/${PN}/ - EOF eapply "${FILESDIR}/${PN}-1.7.4-configure.patch" eapply "${FILESDIR}/${PN}-1.8.1-icu61.diff" eapply_user + + cmake-utils_src_prepare } src_configure() { - # TODO: Why is this here and can we remove it? - strip-flags - # bug 618776 append-cxxflags -std=c++14 - econf \ - $(use_enable static-libs static) \ - $(use_enable debug) \ - --with-zlib \ - $(use_with icu) \ - --with-conf \ - $(use_with curl) \ - $(use_with clucene) + local mycmakeargs=( + -DSYSCONF_INSTALL_DIR="${EPREFIX}/etc" + -DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)" + -DWITH_CLUCENE=$(usex clucene) + -DWITH_CURL=$(usex curl) + -DWITH_ICU=$(usex icu) + -DWITH_ZLIB=1 + ) + use static-libs && mycmakeargs+=( -DLIBSWORD_LIBRARY_TYPE=Static ) + + cmake-utils_src_configure } src_install() { @@ -74,7 +65,7 @@ src_install() { fi insinto /etc - doins "${T}"/${PN}.conf + cmake-utils_src_install } pkg_postinst() {