gentoo resync : 31.08.2021

4 files changed, 9 insertions, 104 deletions

diff --git a/app-misc/sphinx/Manifest b/app-misc/sphinx/Manifest
index d8b30d0c2e43..f137ebe24734 100644
--- a/app-misc/sphinx/Manifest
+++ b/app-misc/sphinx/Manifest
@@ -2,7 +2,6 @@ AUX searchd.rc 656 BLAKE2B 5ba2679b18b0a26d7779a69896958b6ed0cca32e4fa22303d5f3b
 AUX sphinx-2.0.1_beta-darwin8.patch 538 BLAKE2B aaac41e383404736d2f18421af2cf2bd03404d99488b778bcab5bec85a36d75a32234d5e4184ae912027b189fd31d41d07caa3e10b35b28318dd0a4369982039 SHA512 342d4ecd3e75c208e358a39de6e5cd2a2bd9dc627f53893869c2280ba5b50546c7edf8476c07cf681c8d1921eeadbeaf48c75337efba0349b951c7a4569f0c14
 AUX sphinx-2.2.11-automake-1.16.patch 402 BLAKE2B 0e0ea346acb11b4f0a469b76e0491eb0942d0a29b9c566f2ae247401e357062c9366d070bdbb89983884d68576848c58e474c3015651fee92c4ed7e2b6694b2b SHA512 8babc7470036c762cb1d930ffa446aa0280637f6bbbe6854346bd94a46cfa36e466e38a402c3ef141c7a76d58188fb33000e66633a81680a7fab26ca5cee2b62
 DIST sphinx-2.2.11-release.tar.gz 3061998 BLAKE2B 63abdf3d08046ebafcdfd67d3445325b9b127e4dd66ba9d36b3b7053ba80f1f3308b74fd1e01caae6174850e1db22c743454894584bad4a4bec78d533a002668 SHA512 cf1a262a5b0fbf0bd2827ec6ec629edeaf709ce855a6e7b509b65342baaeb26c02717ca63f1578d32c83d21e2fd6d1e92dceb34660e6351b93cd96fd4e623689
-EBUILD sphinx-2.2.11-r2.ebuild 2703 BLAKE2B 658ce5fb5ec326fe86761ac7f855a001ab960f4495b1988249bc301656b000ff76ef147e0f09d787a19daab7148c05e3a14a3470eebf4da09b832258f5459c01 SHA512 6ca7b63f5482de6882992a83c14f3a0c9e65afad70174d3c9148dcc121f5cad599be3b81066b0fbfb99b79cdd2ae048f60e47ca4e04d9eb883fccbaf3c95ce51
-EBUILD sphinx-2.2.11-r3.ebuild 2690 BLAKE2B 94493fc53ce70e21fbd6bc7a51692e334ac7e174b7899bb40b6e01768026e4d3d66818c7a90a218d18141523d15d49b751faf3906fc5cfdd564a5d3d1978fab3 SHA512 61174a1cbd1ebd92ab53bdcd1682b13984cb9453ddc2e967a25cccf208d05fcd76918b366ca4d0de722e0ed0cd4bda802a8db8093f4bc8dd7f16317874170b05
-EBUILD sphinx-2.2.11.ebuild 2268 BLAKE2B 9d0c49eaf1019bd076664c214b22a7b49851deb055078cdd233e66f64e4ced68b2bc72d60fd611df95544c1ddefbd20d869a70d9536e1378714a84b38f74609a SHA512 362f2f8b50349540868744d1f1e20780b821a96b4fae954994b86a183e26541e276b826435264327a62b094055317b625005c781ee44616acff68f33398b1911
+EBUILD sphinx-2.2.11-r4.ebuild 2711 BLAKE2B d898e5a1b9d284f5af614c7a2e91e36bad5ca3b07c80f20e0d90000bbbf6e9f7da6602d6d1713e08d8bb1346d1adc1d14fdbf95e5fe0a983a241e823a220f085 SHA512 297c490bf425cb7f8a150309d31e41a4320e51cef85ff64edc5fbda3ff96ed71f572fb501374d308281989e44e067c93a065bd4aeaf90d311fd237e00143c6ac
+EBUILD sphinx-2.2.11-r5.ebuild 2696 BLAKE2B ebffeb10b70821831680abec5fcdd201dfd2f53a62bdb00852b87ddbd49fbb68e1be45f2ca884c5cc187968d1fbda34b54c7252d75b9e5502c9e7334497a3bea SHA512 1a1866e25dc71dbd364c2cefd06a43b55bc551ed683f2668f6751ba87f39886f58263b6741cadb7ffd3df2daa7c6760d8eea2be739afeeb28a2704edb6bb477f
 MISC metadata.xml 495 BLAKE2B 6ce04a8baaefb4f99722a9880c05774fae70dac6af652e31ba3e64f057cf7fe923aa035894673f5570bcfc98df0992e3f9a03ef22b5c5991fdab36eeb54dbaf2 SHA512 40351ff70a81c80367af1f1454fc18a1da6ff3e9f5d921547f40d4c05ab36fc0f13228176e54237956de7ca8ee78c3d14facd15c85171c39c03867eb2288d975
diff --git a/app-misc/sphinx/sphinx-2.2.11-r2.ebuild b/app-misc/sphinx/sphinx-2.2.11-r4.ebuild
index 9b55c9c47208..0c4666a146d4 100644
--- a/app-misc/sphinx/sphinx-2.2.11-r2.ebuild
+++ b/app-misc/sphinx/sphinx-2.2.11-r4.ebuild
@@ -22,12 +22,12 @@ IUSE="debug +id64 mariadb mysql odbc postgres re2 stemmer syslog xml"
 REQUIRED_USE="mysql? ( !mariadb ) mariadb? ( !mysql )"
 
 RDEPEND="
-	mysql? ( dev-db/mysql-connector-c )
-	mariadb? ( dev-db/mariadb-connector-c )
+	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 )
+	re2? ( dev-libs/re2:= )
+	stemmer? ( dev-libs/snowball-stemmer:= )
 	xml? ( dev-libs/expat )
 	virtual/libiconv"
 
diff --git a/app-misc/sphinx/sphinx-2.2.11-r3.ebuild b/app-misc/sphinx/sphinx-2.2.11-r5.ebuild
index 5ee036e63750..66f738edfe48 100644
--- a/app-misc/sphinx/sphinx-2.2.11-r3.ebuild
+++ b/app-misc/sphinx/sphinx-2.2.11-r5.ebuild
@@ -20,11 +20,11 @@ IUSE="debug +id64 mariadb mysql odbc postgres stemmer syslog xml"
 REQUIRED_USE="mysql? ( !mariadb ) mariadb? ( !mysql )"
 
 RDEPEND="
-	mysql? ( dev-db/mysql-connector-c )
-	mariadb? ( dev-db/mariadb-connector-c )
+	mysql? ( dev-db/mysql-connector-c:= )
+	mariadb? ( dev-db/mariadb-connector-c:= )
 	postgres? ( dev-db/postgresql:* )
 	odbc? ( dev-db/unixODBC )
-	stemmer? ( dev-libs/snowball-stemmer )
+	stemmer? ( dev-libs/snowball-stemmer:= )
 	xml? ( dev-libs/expat )
 	virtual/libiconv"
 
diff --git a/app-misc/sphinx/sphinx-2.2.11.ebuild b/app-misc/sphinx/sphinx-2.2.11.ebuild
deleted file mode 100644
index 7b6c533c457e..000000000000
--- a/app-misc/sphinx/sphinx-2.2.11.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-WANT_AUTOMAKE=1.15
-
-inherit epatch autotools toolchain-funcs
-
-#MY_P=${P/_/-}
-MY_P=${P}-release
-
-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"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris"
-IUSE="debug +id64 mysql odbc postgres re2 stemmer syslog xml"
-
-RDEPEND="mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql:* )
-	odbc? ( dev-db/unixODBC )
-	re2? ( dev-libs/re2 )
-	stemmer? ( dev-libs/snowball-stemmer )
-	xml? ( dev-libs/expat )
-	virtual/libiconv"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.0.1_beta-darwin8.patch
-
-	# drop nasty hardcoded search path breaking Prefix
-	# We patch configure directly since otherwise we need to run
-	# eautoreconf twice and that causes problems, bug 425380
-	sed -i -e 's/\/usr\/local\//\/someplace\/nonexisting\//g' configure || die
-
-	# Fix QA compilation warnings.
-	sed -i -e '19i#include <string.h>' api/libsphinxclient/test.c || die
-
-	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
-
-	econf \
-		--sysconfdir="${EPREFIX}/etc/${PN}" \
-		$(use_enable id64) \
-		$(use_with debug) \
-		$(use_with mysql) \
-		$(use_with odbc unixodbc) \
-		$(use_with postgres pgsql) \
-		$(use_with re2) \
-		$(use_with stemmer libstemmer) \
-		$(use_with syslog syslog) \
-		$(use_with xml libexpat )
-
-	cd api/libsphinxclient || die
-	econf STRIP=:
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)"
-
-	emake -j 1 -C api/libsphinxclient
-}
-
-src_test() {
-	# Tests require a live database and only work from the source
-	# directory.
-	:
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	emake DESTDIR="${D}" -C api/libsphinxclient install
-
-	dodoc doc/*
-
-	dodir /var/lib/sphinx
-	dodir /var/log/sphinx
-
-	newinitd "${FILESDIR}"/searchd.rc searchd
-}