gentoo resync : 15.11.2017

4 files changed, 36 insertions, 6 deletions

diff --git a/app-text/sword/Manifest b/app-text/sword/Manifest
index 7936bed4147d..b47bd5e67150 100644
--- a/app-text/sword/Manifest
+++ b/app-text/sword/Manifest
@@ -1,7 +1,8 @@
 AUX sword-1.6.2-gcc47.patch 1251 SHA256 3139272398bb95733b14af83dbe1a23dc895df484a073e901073adbe8ccf8b8e SHA512 2c131c963bbf4d181ee31ae5a6a28c0ea93daf3ad42f5a6dd3841edbb328011d2082c550a0311092eee08da9e5aa5692fdb1d02b3d3fb2cb186ee042dd021a71 WHIRLPOOL 616d54a3fc49fa29bd182acab3742850cd91e83c9b59c4153a6313e2d5ac7a0e808065849f0f8c4a1a716b1edd1b3f020d4cd5303bbf8e5fdedaeca97611b3c2
+AUX sword-1.7.4-configure.patch 816 SHA256 9c5288868bfa90791d08eabc872924a8760cc61ff375b59c434e83aa45bfe7cc SHA512 b6209e3a01a3408ca7d338ada40f3e9e2db93167b74274f29ea4a790a22b21d9e871037eb71875ec6d84f14477a78944a9ef2296fb623dbedfdfd3a849e44186 WHIRLPOOL 1eb471ac12886cb6073dd8568efa58e0fec9fcb5ce7aeda503dea343a31743b440ac46ba3b05e7c6b2c49b4cfaaa52af31149b992cb022bf5fb54f8fe8183461
 AUX sword-1.7.4-gcc6.patch 626 SHA256 c783f0cc82aad0b2523520f6f1c4681d072814357f991c97eaed30ae8bf27633 SHA512 8084f3ce8be27879a5b038c5c55ed6c0071e02c2f19ee390cdbc6eaf822fb5268c0f5f9450ba22dfc944b5a1d46f5e4feeebd81f3810532edc9f905921b95f04 WHIRLPOOL bfb3eb02865fe05e37230efcd04a07a49f11867ce7f1ca3001a71388e1f0516e9e3bb8d333f9acd904749ac26806e5a016cdece40183836ddd98449024b1e85c
 DIST sword-1.7.4.tar.gz 2157882 SHA256 995da8cf5a207c1f09809bf4b9db0bd7d267da5fcdb9d6666c9b313edd9d213d SHA512 4c8b183e613367364439cc7a8a842012f75180fccc8eb775b9af2dc4c10f39c152261d35f0aadaaa91a11df36ab1a4057c2edc50ea4b0b3bb0ab0a847ff68f75 WHIRLPOOL a998552c18b5913d88f091d7dfec307e409401a01eb6011b62c7b4d3ea81355f816f013d7a3165ada2fa54454fdea980574091d8006d05f161cf55438f1df14b
-EBUILD sword-1.7.4.ebuild 1806 SHA256 32c41c7ea310e9fe38c35edc98d3f2f253bb6ab67099b4df08c5b1eec1f04bfc SHA512 63e09d9cc09d52a46a53e16ecd465dc14d14089f2167c793d62b9e4fd2dd3a89db9410081abcda4a86c00e639de5566695c5ca8440aceecabc6e07f9bdb074d7 WHIRLPOOL f5d72be286c4ee93139f6bb2e3aefc34cb5b4ebe71a1235d5e8b966b211e89e37385965df91d2e3f18bc48a58529b148bfb818e51fad6add14b8b94c6108432f
+EBUILD sword-1.7.4-r1.ebuild 1930 SHA256 1c94dc8c22c4883a841a8ceb887c1356452e38af9ef8ea9e14190f3c312eab45 SHA512 d853ff2b48ac22f5f881739bc6983c2157fad2195e6a8e653000b9e776a854841e9f68e781729ea3a7d24650d12a0141a482ae97a728feefc9b4ab9da552bdc4 WHIRLPOOL c029a9551f3700de8c3e8b7bd1cbabfbe2d8ba6365db1e725cdaacf5ea150a83a4fb897f6059d2796be9b765cda303ff18327dc595c177eade20b10adb4233bb
 MISC ChangeLog 2899 SHA256 c9011d88f56f86d89f5926d322e0fe842e56dd696e170a5988d9ab1a156c176c SHA512 b644b5f463d06f21d5c020c2745337eb6ea4eaa96f4d61f525e3a7cbbfb2d9e7d7a03228dcfad1e169b1f5a04bb3336bcf9912f6da53dc1b760a4a501e05d6b4 WHIRLPOOL 6dae9178f384d86dd4b540d27ecd8ea25d66515ebc26c5fd480e728d59241c941ff2e064a931ab9a7e555c87d1e6c979336c39a44235573fc8892fb0f1f25718
 MISC ChangeLog-2015 9933 SHA256 44e85bc622ecf64881d56dcb7eaaea593f1d079f01985e8e2fd05c6f9fa673af SHA512 faa409e310dc4b2ee42426c0333f9b6b807ea7f47977ad4aaf3a2a4da82a5eae88448552232b2f3c2f9496ef48443d9ad18bc120adf80da9d97c22283dc8e62a WHIRLPOOL eb04fc90cd1784136b448d22b9c05aaf19a13ac61c7e66a6580e6c4e7adcbccbf4f85fa1bd2f375346789690af628baa0901de4f67fecb4dff1d634cf3152487
-MISC metadata.xml 462 SHA256 8561ec0d9cadf7a9df9507c23736fc5caed222339248d244eb70b5936db6ff27 SHA512 df9a01114d4063b4ae82f1046cab4d22c790de4cd63b0b7b5f6f33d59918cc081c3601542299236c3b4ea9062ec0f315ed82db6295797ee4140408a75e0696c3 WHIRLPOOL f0288af7a0e2d2a3b8c76eaddd88a173e3e482e1b3bcc35ac0714375033ce0aface4ca8859ec6499071d210b4fa5fcd70eb4012504dfdb0d04115ee1f2248136
+MISC metadata.xml 564 SHA256 75359458be1fac1d9abd623b1e8609de32866299609f287752469373544c03ff SHA512 74ff38bf540aa48eb0195c7999adcf1226ede7ca4a6848a45b73913011f95e2bb7d84e0ca0534d2ee2610efee78234a52ae69f507704bb0ec80e4876a5d4aadc WHIRLPOOL e4ce4183854463101b779c23ababf937a75f9938eaf8d0a0d17090c0a27e34243c272e095210fb2cf17ccc29251d46f137a7dda65b782b735a9e41537550ee46
diff --git a/app-text/sword/files/sword-1.7.4-configure.patch b/app-text/sword/files/sword-1.7.4-configure.patch
new file mode 100644
index 000000000000..a098addcd0d2
--- /dev/null
+++ b/app-text/sword/files/sword-1.7.4-configure.patch
@@ -0,0 +1,23 @@
+--- a/configure
++++ b/configure
+@@ -16893,7 +16895,7 @@
+ # ---------------------------------------------------------------------
+ 
+ # NOTE the $libdir hack at the end of the c[xx]flags.  Apparently F16 finds that clucene is not multilib-save and places some include files in /usr/lib[64]/
++if test "x$with_clucene" != "xno"; then
+-with_clucene=no
+ if test "x$CLUCENE2_LIBS" != x; then
+    echo "clucene 2.x found - lucene searching options available"
+    AM_CXXFLAGS="$AM_CXXFLAGS $CLUCENE2_CFLAGS -DUSELUCENE -DCLUCENE2 -I$libdir"
+@@ -16914,6 +16912,11 @@
+    echo "lucene searching options not available"
+ fi
+ fi
++else
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: excluding support" >&5
++$as_echo "clucene manually disabled - excluding support" >&6; }
++with_clucene="no"
++fi
+ 
+ for ac_func in vsnprintf
+ do :
diff --git a/app-text/sword/metadata.xml b/app-text/sword/metadata.xml
index dd852d82e555..fb9230654d3a 100644
--- a/app-text/sword/metadata.xml
+++ b/app-text/sword/metadata.xml
@@ -9,4 +9,7 @@ The SWORD Project is the CrossWire Bible Society's free Bible software
 project. Its purpose is to create tools that allow programmers and Bible
 societies to write new Bible software more quickly and easily.
 </longdescription>
+<use>
+    <flag name="clucene">Use <pkg>dev-cpp/clucene</pkg> for lucene search support</flag>
+</use>
 </pkgmetadata>
diff --git a/app-text/sword/sword-1.7.4.ebuild b/app-text/sword/sword-1.7.4-r1.ebuild
index 2db87d10461d..be1fa4a33141 100644
--- a/app-text/sword/sword-1.7.4.ebuild
+++ b/app-text/sword/sword-1.7.4-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 inherit eutils flag-o-matic
 
 DESCRIPTION="Library for Bible reading software"
@@ -11,11 +11,12 @@ SRC_URI="http://www.crosswire.org/ftpmirror/pub/${PN}/source/v${PV%.*}/${P}.tar.
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~ppc x86 ~x86-fbsd ~ppc-macos"
-IUSE="curl debug doc icu static-libs"
+IUSE="clucene curl debug doc icu static-libs"
 
 RDEPEND="sys-libs/zlib
 	curl? ( net-misc/curl )
 	icu? ( dev-libs/icu:= )
+	clucene? ( dev-cpp/clucene )
 "
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
@@ -39,19 +40,21 @@ src_prepare() {
 	DataPath=${EPREFIX}/usr/share/${PN}/
 	EOF
 	epatch "${FILESDIR}/${PN}-1.7.4-gcc6.patch"
+	epatch "${FILESDIR}/${PN}-1.7.4-configure.patch"
+	eapply_user
 }
 
 src_configure() {
 	# TODO: Why is this here and can we remove it?
 	strip-flags
-
 	econf \
 		$(use_enable static-libs static) \
 		$(use_enable debug) \
 		--with-zlib \
 		$(use_with icu) \
 		--with-conf \
-		$(use_with curl)
+		$(use_with curl) \
+		$(use_with clucene)
 }
 
 src_install() {