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 7C2DD1382C5 for ; Sun, 13 Dec 2020 12:27:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C1DA9E0917; Sun, 13 Dec 2020 12:26:59 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 A7FA7E0917 for ; Sun, 13 Dec 2020 12:26:59 +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 89AF8341073 for ; Sun, 13 Dec 2020 12:26:58 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 021F44B for ; Sun, 13 Dec 2020 12:26:57 +0000 (UTC) From: "Marek Szuba" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Marek Szuba" Message-ID: <1607862409.dcfab2f6b9d7220d97871f94ad68d5f6fcd7d11b.marecki@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.9.0-r1.ebuild app-text/sword/sword-1.9.0.ebuild X-VCS-Directories: app-text/sword/ X-VCS-Committer: marecki X-VCS-Committer-Name: Marek Szuba X-VCS-Revision: dcfab2f6b9d7220d97871f94ad68d5f6fcd7d11b X-VCS-Branch: master Date: Sun, 13 Dec 2020 12:26:57 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 9536b208-14f4-479d-ae22-108ac30b48f9 X-Archives-Hash: b327042951dd6e7c400d38654c123fd2 commit: dcfab2f6b9d7220d97871f94ad68d5f6fcd7d11b Author: Marek Szuba gentoo org> AuthorDate: Sun Dec 13 12:26:17 2020 +0000 Commit: Marek Szuba gentoo org> CommitDate: Sun Dec 13 12:26:49 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcfab2f6 app-text/sword-1.9.0: drop USE=static-libs support No idea why we needed it in this package to begin with. Signed-off-by: Marek Szuba gentoo.org> app-text/sword/{sword-1.9.0.ebuild => sword-1.9.0-r1.ebuild} | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app-text/sword/sword-1.9.0.ebuild b/app-text/sword/sword-1.9.0-r1.ebuild similarity index 88% rename from app-text/sword/sword-1.9.0.ebuild rename to app-text/sword/sword-1.9.0-r1.ebuild index b53e698cb50..edd796fc48f 100644 --- a/app-text/sword/sword-1.9.0.ebuild +++ b/app-text/sword/sword-1.9.0-r1.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://www.crosswire.org/ftpmirror/pub/${PN}/source/v${PV%.*}/${P}.tar LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~ppc ~x86 ~ppc-macos" -IUSE="clucene curl debug doc icu static-libs" +IUSE="clucene curl debug doc icu" RDEPEND="sys-libs/zlib curl? ( net-misc/curl ) @@ -26,16 +26,17 @@ DOCS=( AUTHORS CODINGSTYLE ChangeLog README ) src_configure() { use doc && DOCS+=( examples/ samples/ ) + # Upstream default is to build both the shared and the static library, + # make sure we only build the shared one. local mycmakeargs=( -DSYSCONF_INSTALL_DIR="${EPREFIX}/etc" -DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)" + -DLIBSWORD_LIBRARY_TYPE="Shared" -DWITH_CLUCENE=$(usex clucene) -DWITH_CURL=$(usex curl) -DWITH_ICU=$(usex icu) -DWITH_ZLIB=1 ) - # Upstream default is to build both the shared and the static library - use static-libs || mycmakeargs+=( -DLIBSWORD_LIBRARY_TYPE="Shared" ) cmake_src_configure }