[gentoo-commits] repo/gentoo:master commit in: app-text/sword/

["Marek Szuba" <marecki@gentoo.org>]

commit:     dcfab2f6b9d7220d97871f94ad68d5f6fcd7d11b
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 13 12:26:17 2020 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> 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 <marecki <AT> 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
 }