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

["Chris Reffett" <creffett@gentoo.org>]

commit:     6a34df8eae4ad4debd0d170f1fe73cc0b3e62ff8
Author:     Chris Reffett <creffett <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 12 22:37:53 2018 +0000
Commit:     Chris Reffett <creffett <AT> gentoo <DOT> 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 <creffett <AT> 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() {