gentoo resync : 17.08.2021

3 files changed, 24 insertions, 13 deletions

diff --git a/app-misc/sphinx/Manifest b/app-misc/sphinx/Manifest
index c87eb411e44e..703a0b133746 100644
--- a/app-misc/sphinx/Manifest
+++ b/app-misc/sphinx/Manifest
@@ -1,7 +1,8 @@
 AUX searchd.rc 656 BLAKE2B 5ba2679b18b0a26d7779a69896958b6ed0cca32e4fa22303d5f3ba593e71cc26f17042d037fdd5e298acb7005f1a7767f38e49acaa62a0f1eb34ddea1e14f657 SHA512 0b24b6dfe10a99c9bb18b7acdaadf2f5d7e3fab2ea80a719bd65b9ea6f6dc83f249d4c2ecb52c48eed73e515f8e76bff294ff39b1ab6375a947a9a137211949c
 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-r1.ebuild 2638 BLAKE2B aef6a8d8e2edf129f40e2ed2aba6d312ae8ba0c739c4d259e09db0b275e9e7dbf0edf0b1720053baf38918212639e8682337d3fb5c9a3bf3b012d45a630da74a SHA512 be59d45ad13b7396597de13f4eae25e5d0156b4e5e198b87b745a5e8cda2ba6cefcc1555a6c60e8a52c85f2f06026bac680ad241da934da126a65bd357123495
 EBUILD sphinx-2.2.11-r2.ebuild 2705 BLAKE2B 8a3d28f62d1c5a52bdd668b45fe7b8447c9bc5e6c852eb80becc91292d57b50c88a7b508f89135adb9da09f0e1601c1e96e4641e514aec5f160aaed264f01581 SHA512 730337c6df180d2215bbb402817d69c82603b2e07af7fb649ab4a9733728b9232ddfc4b5a4da0112ef2b752febf876f89ab87b9ccf2c561601c874efa1c32bb3
+EBUILD sphinx-2.2.11-r3.ebuild 2690 BLAKE2B 94493fc53ce70e21fbd6bc7a51692e334ac7e174b7899bb40b6e01768026e4d3d66818c7a90a218d18141523d15d49b751faf3906fc5cfdd564a5d3d1978fab3 SHA512 61174a1cbd1ebd92ab53bdcd1682b13984cb9453ddc2e967a25cccf208d05fcd76918b366ca4d0de722e0ed0cd4bda802a8db8093f4bc8dd7f16317874170b05
 EBUILD sphinx-2.2.11.ebuild 2268 BLAKE2B 9d0c49eaf1019bd076664c214b22a7b49851deb055078cdd233e66f64e4ced68b2bc72d60fd611df95544c1ddefbd20d869a70d9536e1378714a84b38f74609a SHA512 362f2f8b50349540868744d1f1e20780b821a96b4fae954994b86a183e26541e276b826435264327a62b094055317b625005c781ee44616acff68f33398b1911
 MISC metadata.xml 495 BLAKE2B 6ce04a8baaefb4f99722a9880c05774fae70dac6af652e31ba3e64f057cf7fe923aa035894673f5570bcfc98df0992e3f9a03ef22b5c5991fdab36eeb54dbaf2 SHA512 40351ff70a81c80367af1f1454fc18a1da6ff3e9f5d921547f40d4c05ab36fc0f13228176e54237956de7ca8ee78c3d14facd15c85171c39c03867eb2288d975
diff --git a/app-misc/sphinx/files/sphinx-2.2.11-automake-1.16.patch b/app-misc/sphinx/files/sphinx-2.2.11-automake-1.16.patch
new file mode 100644
index 000000000000..da556ef2ef64
--- /dev/null
+++ b/app-misc/sphinx/files/sphinx-2.2.11-automake-1.16.patch
@@ -0,0 +1,10 @@
+diff --git a/api/libsphinxclient/Makefile.am b/api/libsphinxclient/Makefile.am
+index a4abfef..10d5914 100644
+--- a/api/libsphinxclient/Makefile.am
++++ b/api/libsphinxclient/Makefile.am
+@@ -10,4 +10,4 @@ libsphinxclient_la_LIBADD = @LTLIBOBJS@
+ libsphinxclient_la_LDFLAGS = -release @VERSION@
+ 
+ include_HEADERS =   sphinxclient.h 
+-test_LDADD = .libs/libsphinxclient.a
++test_LDADD = $(lib_LTLIBRARIES)
diff --git a/app-misc/sphinx/sphinx-2.2.11-r1.ebuild b/app-misc/sphinx/sphinx-2.2.11-r3.ebuild
index ae063ea14f8f..5ee036e63750 100644
--- a/app-misc/sphinx/sphinx-2.2.11-r1.ebuild
+++ b/app-misc/sphinx/sphinx-2.2.11-r3.ebuild
@@ -1,11 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-WANT_AUTOMAKE=1.15
-
-inherit epatch autotools toolchain-funcs
+inherit autotools toolchain-funcs
 
 #MY_P=${P/_/-}
 MY_P=${P}-release
@@ -16,8 +14,8 @@ SRC_URI="http://sphinxsearch.com/files/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris"
-IUSE="debug +id64 mariadb mysql odbc postgres re2 stemmer syslog xml"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris"
+IUSE="debug +id64 mariadb mysql odbc postgres stemmer syslog xml"
 
 REQUIRED_USE="mysql? ( !mariadb ) mariadb? ( !mysql )"
 
@@ -26,7 +24,6 @@ RDEPEND="
 	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"
@@ -34,7 +31,8 @@ RDEPEND="
 S=${WORKDIR}/${MY_P}
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.0.1_beta-darwin8.patch
+	eapply -p0 "${FILESDIR}"/${PN}-2.0.1_beta-darwin8.patch
+	eapply "${FILESDIR}"/${P}-automake-1.16.patch
 
 	# drop nasty hardcoded search path breaking Prefix
 	# We patch configure directly since otherwise we need to run
@@ -56,7 +54,7 @@ src_prepare() {
 
 	# Drop bundled code to ensure building against system versions. We
 	# cannot remove libstemmer_c since configure updates its Makefile.
-	rm -rf libexpat libre2 || die
+	rm -rf libexpat || die
 }
 
 src_configure() {
@@ -77,7 +75,6 @@ src_configure() {
 		${mysql_with} \
 		$(use_with odbc unixodbc) \
 		$(use_with postgres pgsql) \
-		$(use_with re2) \
 		$(use_with stemmer libstemmer) \
 		$(use_with syslog syslog) \
 		$(use_with xml libexpat )
@@ -102,10 +99,13 @@ src_install() {
 	emake DESTDIR="${D}" install
 	emake DESTDIR="${D}" -C api/libsphinxclient install
 
+	# Remove unneeded empty directories.
+	rmdir "${D}"/var/lib/{data,log}
+
 	dodoc doc/*
 
-	dodir /var/lib/sphinx
-	dodir /var/log/sphinx
+	keepdir /var/lib/sphinx
+	keepdir /var/log/sphinx
 
 	newinitd "${FILESDIR}"/searchd.rc searchd
 }