gentoo resync : 15.12.2019

5 files changed, 22 insertions, 21 deletions

diff --git a/app-misc/sphinx/Manifest b/app-misc/sphinx/Manifest
index 5f1bc7d48aa1..0cf8668b8436 100644
--- a/app-misc/sphinx/Manifest
+++ b/app-misc/sphinx/Manifest
@@ -2,8 +2,8 @@ AUX searchd.rc 656 BLAKE2B 5ba2679b18b0a26d7779a69896958b6ed0cca32e4fa22303d5f3b
 AUX sphinx-2.0.1_beta-darwin8.patch 538 BLAKE2B aaac41e383404736d2f18421af2cf2bd03404d99488b778bcab5bec85a36d75a32234d5e4184ae912027b189fd31d41d07caa3e10b35b28318dd0a4369982039 SHA512 342d4ecd3e75c208e358a39de6e5cd2a2bd9dc627f53893869c2280ba5b50546c7edf8476c07cf681c8d1921eeadbeaf48c75337efba0349b951c7a4569f0c14
 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.1.9.ebuild 2376 BLAKE2B 996c4d2a42f92a73a74baa7716abd352b2fa446373dbdeff5f936e9eb7db664df2584ffa17e09f315d2f26558e41f0699691545721bed32ed4ab1c976c8e1265 SHA512 79c16793a6c613234adc6f892ecbf939c8431bdb76f685501872328113618beea8d1d5181eb4ab1a53b91b9e00cb1b9bc681d1c9462894078b5f45aa708e6ab0
-EBUILD sphinx-2.2.11-r1.ebuild 2773 BLAKE2B e9d0bb5f8dade5b9802160be4477b7d514f372357816607fd15ef497d9f9bb82b9b0a44d8a657a9219280113d7abed9fc1599f86027a312f2d2faf8ab8d7646f SHA512 20e0e2819a83b609623dc62887f09d9ea1a6eb93a533370f8f8b21ebcebb1869839171e238b0bedffda722e405d0ffb140dc5d31d22d8bef770a6737840c635f
-EBUILD sphinx-2.2.11-r2.ebuild 2840 BLAKE2B a3b67ed5334f21c3ca8313740e57cc47bd5f76983e30ca483f64c16ced32e63f886f4f3d5cfe7350cdd4e363d7fded6f08384d79420c11da12a600d71890f916 SHA512 65bfae7ebad420e08b540ea7395f47e302ee1fb8b5c59ce40f4ab3fac0784547a199128c28dd12b10867323e3ec1a093ae18b8bdd7dffb913d4a099efdf08de8
-EBUILD sphinx-2.2.11.ebuild 2403 BLAKE2B d48c34fd604e6df0c652845bedb1f2c35046c1db6601ed995602fbfbd042a035d7296c1824eb29cd611d35408d821fb2c3cfb75b14ed87c865d416fe8806ac8a SHA512 6be2c83feb3edfa0c4b8fc80311fcf17099215da2006e706df7c5f556b248bcd269fa9f5aa752d0466c5bb6cdf656af0c4562ef9783c40bcbe84207b7a264585
+EBUILD sphinx-2.1.9.ebuild 2276 BLAKE2B 23dadec2287d6daa353ff4de49e92cfe08f74f221c09a2c566c16d300eb55e64919eed03036e40f1710438fcc5fca32650c7a7604c0a354dde3fd451cb8f764b SHA512 3f19e5176e557a0b6ab8f58e4bd6c1b9415cf709dfbc138d901c1f9133c2430f02a41ae5f8fbe47ab7375a244e9277952d910e396d01ec52549dbadeb10dedae
+EBUILD sphinx-2.2.11-r1.ebuild 2649 BLAKE2B 716a99dcb60197e6ecab580859584193e316188cd7506c082e13e7d426b9b91faf1473ff17f76bccb1df0a52d31dc728d1c3dd0f478bdedf264ff52a9c7406c0 SHA512 4668953ca23357159cb06bc37fa16faf964c9384836b1662483decd0f6c44d4638c03f72ed0d3f0a9a9d7f5dde85a74eb55061d91997f4148f3e6c25808f89b8
+EBUILD sphinx-2.2.11-r2.ebuild 2716 BLAKE2B ba78dcc03cdb71dbe8bb5d8e1dc7ce08cf6bd54a34b50882176e99c1d0196e1da2a1eafd108005cb7a7f50c8a41473bc3858c84b061d1ee1cf5e80de0073c2a5 SHA512 cfce0dd3e4ce121f7f8aa37d1b5070dab63d6a6cf42b30dd9c8a7e3b9ca1c1ec6d79770ebfe58c002cfdba3e4f27269e0b5526e89c55600db9c4ac242df5bac9
+EBUILD sphinx-2.2.11.ebuild 2279 BLAKE2B 601dcbe740021c053557f2d0716160f62cf48c0e1e851762b1f8ca67a044b04a7c57183ca749edeb060bca2cec7e8473f2488a0c2e2a5cc22f54a214069dd40b SHA512 63c115cc1468c29bd3509ef7ec607c36cdc182be53a3744118c31652e4b029a07fc2d6c7b0ac5f251fc6992a01141ee67a39fce42d6795144e6c360f5bc5c54d
 MISC metadata.xml 495 BLAKE2B 6ce04a8baaefb4f99722a9880c05774fae70dac6af652e31ba3e64f057cf7fe923aa035894673f5570bcfc98df0992e3f9a03ef22b5c5991fdab36eeb54dbaf2 SHA512 40351ff70a81c80367af1f1454fc18a1da6ff3e9f5d921547f40d4c05ab36fc0f13228176e54237956de7ca8ee78c3d14facd15c85171c39c03867eb2288d975
diff --git a/app-misc/sphinx/sphinx-2.1.9.ebuild b/app-misc/sphinx/sphinx-2.1.9.ebuild
index bf55eea2001f..843e49c094ee 100644
--- a/app-misc/sphinx/sphinx-2.1.9.ebuild
+++ b/app-misc/sphinx/sphinx-2.1.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -18,6 +18,7 @@ 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 syslog test xml"
+RESTRICT="!test? ( test )"
 
 RDEPEND="mysql? ( virtual/mysql )
 	postgres? ( dev-db/postgresql:* )
@@ -64,9 +65,9 @@ src_configure() {
 }
 
 src_compile() {
-	emake AR="$(tc-getAR)" || die "emake failed"
+	emake AR="$(tc-getAR)"
 
-	emake -j 1 -C api/libsphinxclient || die "emake libsphinxclient failed"
+	emake -j 1 -C api/libsphinxclient
 }
 
 src_test() {
@@ -75,8 +76,8 @@ src_test() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	emake DESTDIR="${D}" -C api/libsphinxclient install || die "install libsphinxclient failed"
+	emake DESTDIR="${D}" install
+	emake DESTDIR="${D}" -C api/libsphinxclient install
 
 	dodoc doc/*
 
diff --git a/app-misc/sphinx/sphinx-2.2.11-r1.ebuild b/app-misc/sphinx/sphinx-2.2.11-r1.ebuild
index b3133ba92eb8..5f45a59d12a7 100644
--- a/app-misc/sphinx/sphinx-2.2.11-r1.ebuild
+++ b/app-misc/sphinx/sphinx-2.2.11-r1.ebuild
@@ -87,9 +87,9 @@ src_configure() {
 }
 
 src_compile() {
-	emake AR="$(tc-getAR)" || die "emake failed"
+	emake AR="$(tc-getAR)"
 
-	emake -j 1 -C api/libsphinxclient || die "emake libsphinxclient failed"
+	emake -j 1 -C api/libsphinxclient
 }
 
 src_test() {
@@ -99,8 +99,8 @@ src_test() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	emake DESTDIR="${D}" -C api/libsphinxclient install || die "install libsphinxclient failed"
+	emake DESTDIR="${D}" install
+	emake DESTDIR="${D}" -C api/libsphinxclient install
 
 	dodoc doc/*
 
diff --git a/app-misc/sphinx/sphinx-2.2.11-r2.ebuild b/app-misc/sphinx/sphinx-2.2.11-r2.ebuild
index 7bbac2622e51..459f921dc69a 100644
--- a/app-misc/sphinx/sphinx-2.2.11-r2.ebuild
+++ b/app-misc/sphinx/sphinx-2.2.11-r2.ebuild
@@ -88,9 +88,9 @@ src_configure() {
 }
 
 src_compile() {
-	emake AR="$(tc-getAR)" || die "emake failed"
+	emake AR="$(tc-getAR)"
 
-	emake -j 1 -C api/libsphinxclient || die "emake libsphinxclient failed"
+	emake -j 1 -C api/libsphinxclient
 }
 
 src_test() {
@@ -100,8 +100,8 @@ src_test() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	emake DESTDIR="${D}" -C api/libsphinxclient install || die "install libsphinxclient failed"
+	emake DESTDIR="${D}" install
+	emake DESTDIR="${D}" -C api/libsphinxclient install
 
 	dodoc doc/*
 
diff --git a/app-misc/sphinx/sphinx-2.2.11.ebuild b/app-misc/sphinx/sphinx-2.2.11.ebuild
index c49c70b819b1..3889473b1575 100644
--- a/app-misc/sphinx/sphinx-2.2.11.ebuild
+++ b/app-misc/sphinx/sphinx-2.2.11.ebuild
@@ -70,9 +70,9 @@ src_configure() {
 }
 
 src_compile() {
-	emake AR="$(tc-getAR)" || die "emake failed"
+	emake AR="$(tc-getAR)"
 
-	emake -j 1 -C api/libsphinxclient || die "emake libsphinxclient failed"
+	emake -j 1 -C api/libsphinxclient
 }
 
 src_test() {
@@ -82,8 +82,8 @@ src_test() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	emake DESTDIR="${D}" -C api/libsphinxclient install || die "install libsphinxclient failed"
+	emake DESTDIR="${D}" install
+	emake DESTDIR="${D}" -C api/libsphinxclient install
 
 	dodoc doc/*