gentoo resync : 04.08.2018

3 files changed, 40 insertions, 33 deletions

diff --git a/app-misc/sphinx/Manifest b/app-misc/sphinx/Manifest
index 6cee465e682f..bc82f0557693 100644
--- a/app-misc/sphinx/Manifest
+++ b/app-misc/sphinx/Manifest
@@ -1,10 +1,8 @@
 AUX searchd.rc 656 BLAKE2B 5ba2679b18b0a26d7779a69896958b6ed0cca32e4fa22303d5f3ba593e71cc26f17042d037fdd5e298acb7005f1a7767f38e49acaa62a0f1eb34ddea1e14f657 SHA512 0b24b6dfe10a99c9bb18b7acdaadf2f5d7e3fab2ea80a719bd65b9ea6f6dc83f249d4c2ecb52c48eed73e515f8e76bff294ff39b1ab6375a947a9a137211949c
 AUX sphinx-2.0.1_beta-darwin8.patch 538 BLAKE2B aaac41e383404736d2f18421af2cf2bd03404d99488b778bcab5bec85a36d75a32234d5e4184ae912027b189fd31d41d07caa3e10b35b28318dd0a4369982039 SHA512 342d4ecd3e75c208e358a39de6e5cd2a2bd9dc627f53893869c2280ba5b50546c7edf8476c07cf681c8d1921eeadbeaf48c75337efba0349b951c7a4569f0c14
-DIST libstemmer_c-20091122.tgz 129207 BLAKE2B 8ebf49f4d2b7dd5d0e56e5a032f16e807cc7c400b4c4a0e73601ace17908b441789ceca87c0258c17b4201b43751df5fad890fecc3a1aaeba60f83c80beecf32 SHA512 d1b2203dcc3d0f421526d3ec2f7e04889f93221222efe50501b4a1c7e74dfc51905141d4ada5a76feab5cec8dbc64f55dd55b53f6e89f658c67e72dc6667091d
-DIST sphinx-2.0.10-release.tar.gz 2016687 BLAKE2B 176a14c2e1ecc859f5499eab2b2ee9cb9047ec6d07b407c0dbd3a405a9ca6198e1480166a245f7f523e3c3555bf8fe7ad7f0733bce5371f1b35ce6894dfafa6c SHA512 d22a0ce261cd6decda2e9e91fc9806699c818bb45a9c9c5e11a0944a698d47b5862c577eb55e7b57dd208db982e7f8bfc7163af37aaedc1c537841aff1409952
 DIST sphinx-2.1.9-release.tar.gz 2443797 BLAKE2B d741d0bc915ece01c3ddcbfacd44f34ef5d772d2bdf07aecb3a704dc0c5ef551e9d3829af200b1c96e41be2a037552c28a83647af78e827d7a9627f1d9d536a8 SHA512 7f4538011db5d68bd00c00978d476f780fc2d355113bd2819996bacbaef90b0de5b14c946a9aad83157b818d9b6b01ee0a26bc72862cfd151067ad9967c18f56
 DIST sphinx-2.2.11-release.tar.gz 3061998 BLAKE2B 63abdf3d08046ebafcdfd67d3445325b9b127e4dd66ba9d36b3b7053ba80f1f3308b74fd1e01caae6174850e1db22c743454894584bad4a4bec78d533a002668 SHA512 cf1a262a5b0fbf0bd2827ec6ec629edeaf709ce855a6e7b509b65342baaeb26c02717ca63f1578d32c83d21e2fd6d1e92dceb34660e6351b93cd96fd4e623689
-EBUILD sphinx-2.0.10.ebuild 2641 BLAKE2B a081bc6185d715bb9d0555bf84cba6c8aa4c0b492cc2d7154d7cb35dff8fd26266acb1dd90551c19868972b7a3aa55a96faa1947591dab69fc1903b47150e995 SHA512 a842cbc275b4139f09aa0b60ace1a15bf5b2c42c4bddcccbbcb22431b16d2c0d33e3af842e3dc2c189c9d94cb31b8a3f145b3b4bbed85cfa5204d2aeab553db6
 EBUILD sphinx-2.1.9.ebuild 2376 BLAKE2B 996c4d2a42f92a73a74baa7716abd352b2fa446373dbdeff5f936e9eb7db664df2584ffa17e09f315d2f26558e41f0699691545721bed32ed4ab1c976c8e1265 SHA512 79c16793a6c613234adc6f892ecbf939c8431bdb76f685501872328113618beea8d1d5181eb4ab1a53b91b9e00cb1b9bc681d1c9462894078b5f45aa708e6ab0
+EBUILD sphinx-2.2.11-r1.ebuild 2745 BLAKE2B 52ebf6d9a8ab39b2ce44154ec60da4b956355e26862b64962e62c5c1d51e2d86c59548c28cb3e6655b898a1b8bb36eac942491fec82387365a77be45d056f08c SHA512 d6ffd41b782bf57a92bac828fdc060b67f0b4fec7430c5060bb06607efca861821221870cda211ecae28bd4bc7e8513c69297c4eb5b433a3754f89fe7f5acf4f
 EBUILD sphinx-2.2.11.ebuild 2400 BLAKE2B d2339f0893edfd12ba370ffade39d9bf40ee585dac4efcf8858d2bc2e193bff70c2c18a93fa743ac6ff7d980cfad31387837afb46158e494d7d4240366d83de1 SHA512 629d6374605f457f009744a32183ce31086e93faa0ce82d436822c18866927fb5badfd8a7f8a4fc4036970f05ff4abcc6b570abe17b69e2f0d42136d0f481a4c
-MISC metadata.xml 436 BLAKE2B fd5aeae58f468becae46cbc4c5efb4d42507590f85d881427357c220a36db5ebb775e163bfdeab34199dbbffb2fbcc4d1c9aae8a831d3ecfd7b4505e39eb6a89 SHA512 3083764b80745c3f6dd81c1bc9c2f406edcef6a451d49a79f952969db07c7741447df2b82a82a627b5ebe680f3ea36f99128ae701b553895f15b7bed0d8abecd
+MISC metadata.xml 495 BLAKE2B 6ce04a8baaefb4f99722a9880c05774fae70dac6af652e31ba3e64f057cf7fe923aa035894673f5570bcfc98df0992e3f9a03ef22b5c5991fdab36eeb54dbaf2 SHA512 40351ff70a81c80367af1f1454fc18a1da6ff3e9f5d921547f40d4c05ab36fc0f13228176e54237956de7ca8ee78c3d14facd15c85171c39c03867eb2288d975
diff --git a/app-misc/sphinx/metadata.xml b/app-misc/sphinx/metadata.xml
index 80a8842e3c97..397dd2466c73 100644
--- a/app-misc/sphinx/metadata.xml
+++ b/app-misc/sphinx/metadata.xml
@@ -6,6 +6,7 @@
 </maintainer>
 <use>
   <flag name="id64">use 64-bit document and word IDs</flag>
+  <flag name="mariadb">Add mariadb database support</flag>
   <flag name="re2">use the <pkg>dev-libs/re2</pkg> regular expression library</flag>
   <flag name="stemmer">Enable language stemming support</flag>
 </use>
diff --git a/app-misc/sphinx/sphinx-2.0.10.ebuild b/app-misc/sphinx/sphinx-2.2.11-r1.ebuild
index b33e16db8467..32f06578cd75 100644
--- a/app-misc/sphinx/sphinx-2.0.10.ebuild
+++ b/app-misc/sphinx/sphinx-2.2.11-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 WANT_AUTOMAKE=1.15
 
@@ -10,37 +10,29 @@ inherit eutils autotools toolchain-funcs
 #MY_P=${P/_/-}
 MY_P=${P}-release
 
-# This has been added by Gentoo, to explicitly version libstemmer.
-# It is the date that http://snowball.tartarus.org/dist/libstemmer_c.tgz was
-# fetched.
-STEMMER_PV="20091122"
 DESCRIPTION="Full-text search engine with support for MySQL and PostgreSQL"
 HOMEPAGE="http://www.sphinxsearch.com/"
-SRC_URI="http://sphinxsearch.com/files/${MY_P}.tar.gz
-	stemmer? ( mirror://gentoo/libstemmer_c-${STEMMER_PV}.tgz )"
+SRC_URI="http://sphinxsearch.com/files/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
-IUSE="debug id64 mysql odbc postgres stemmer test"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
+IUSE="debug +id64 mariadb mysql odbc postgres re2 stemmer syslog xml"
 
-RDEPEND="mysql? ( virtual/mysql )
+REQUIRED_USE="mysql? ( !mariadb ) mariadb? ( !mysql )"
+
+RDEPEND="
+	mysql? ( dev-db/mysql-connector-c )
+	mariadb? ( dev-db/mariadb-connector-c )
 	postgres? ( dev-db/postgresql:* )
 	odbc? ( dev-db/unixODBC )
+	re2? ( dev-libs/re2 )
+	stemmer? ( dev-libs/snowball-stemmer )
+	xml? ( dev-libs/expat )
 	virtual/libiconv"
-DEPEND="${RDEPEND}
-	test? ( dev-lang/php )"
 
 S=${WORKDIR}/${MY_P}
 
-src_unpack() {
-	unpack ${MY_P}.tar.gz
-	if use stemmer; then
-		cd "${S}"
-		unpack libstemmer_c-${STEMMER_PV}.tgz
-	fi
-}
-
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-2.0.1_beta-darwin8.patch
 
@@ -49,26 +41,46 @@ src_prepare() {
 	# eautoreconf twice and that causes problems, bug 425380
 	sed -i -e 's/\/usr\/local\//\/someplace\/nonexisting\//g' configure || die
 
+	if use mariadb ; then
+		sed -i -e 's/mysql_config/mariadb_config/g' configure || die
+	fi
+
 	# Fix QA compilation warnings.
 	sed -i -e '19i#include <string.h>' api/libsphinxclient/test.c || die
 
+	eapply_user
+
 	pushd api/libsphinxclient || die
 	eautoreconf
 	popd || die
+
+	# Drop bundled code to ensure building against system versions. We
+	# cannot remove libstemmer_c since configure updates its Makefile.
+	rm -rf libexpat libre2 || die
 }
 
 src_configure() {
 	# fix libiconv detection
 	use !elibc_glibc && export ac_cv_search_iconv=-liconv
 
+	local mysql_with
+	if use mysql || use mariadb ; then
+		mysql_with="--with-mysql"
+	else
+		mysql_with="--without-mysql"
+	fi
+
 	econf \
 		--sysconfdir="${EPREFIX}/etc/${PN}" \
 		$(use_enable id64) \
 		$(use_with debug) \
-		$(use_with mysql) \
+		${mysql_with} \
 		$(use_with odbc unixodbc) \
 		$(use_with postgres pgsql) \
-		$(use_with stemmer libstemmer)
+		$(use_with re2) \
+		$(use_with stemmer libstemmer) \
+		$(use_with syslog syslog) \
+		$(use_with xml libexpat )
 
 	cd api/libsphinxclient || die
 	econf STRIP=:
@@ -81,8 +93,9 @@ src_compile() {
 }
 
 src_test() {
-	elog "Tests require access to a live MySQL database and may require configuration."
-	elog "You will find them in /usr/share/${PN}/test and they require dev-lang/php"
+	# Tests require a live database and only work from the source
+	# directory.
+	:
 }
 
 src_install() {
@@ -95,9 +108,4 @@ src_install() {
 	dodir /var/log/sphinx
 
 	newinitd "${FILESDIR}"/searchd.rc searchd
-
-	if use test; then
-		insinto /usr/share/${PN}
-		doins -r test
-	fi
 }