gentoo resync : 28.04.2021

4 files changed, 15 insertions, 15 deletions

diff --git a/dev-libs/xapian/Manifest b/dev-libs/xapian/Manifest
index a947eec16b0e..73394339889a 100644
--- a/dev-libs/xapian/Manifest
+++ b/dev-libs/xapian/Manifest
@@ -1,7 +1,7 @@
 DIST xapian-core-1.2.25.tar.xz 3253292 BLAKE2B a130e26188c949d0433d017e8d13e7ecf6241a232d00125699ba8ed63eab9cb1651e02182fcc152f960f4e122709958632779daaaf5760fe50953a3b5b07a243 SHA512 a15b5d9b5770337519f671732f53f0642b31f08206824500d589ba309c9e91a05a30353d66ebf70a4c1cb1824b44e1c7b7630e799de3b15d645cf951a6017bfe
 DIST xapian-core-1.4.17.tar.xz 2997700 BLAKE2B 882bc28c9a55731212a5c3ac6da3ad2082e3345cb473eb2c09b80fdd05e700bb31cff6c9a0524b27da015b14655c30548e92a457b48af43279bfd3564cf3c3fa SHA512 3eaf45d31eb9318e292fa052b32b1d9e1035651bdd3c366a0134f4b39d03d987083c19426a3d4b10f60078190fc3388f05b332cba958263bab1abf236c7a3ca7
 DIST xapian-core-1.4.18.tar.xz 2984508 BLAKE2B e5d680578e0a4605a8e99470921fba29cdd3d137d017608b8bf571951726055d2a1d49e9649829f0df92af3d27d0565f90baaca5a4eb5c67cb368f5d1e592d28 SHA512 ba6240054c0d2f92b9f1059aa934cdf35388ee7c7e05f4ef6f9856bdaed8ad821095a348ed9a892afdf18c3c0ad20e163028ad0ed3a9934bd69b861e814678ef
-EBUILD xapian-1.2.25.ebuild 1847 BLAKE2B a2a10f3a42dd65c4b7f0f69ae49ec26feaad6d2d85c4ce0b235fabc6b053f4dc264f6ff6c75635effc580f18200d4c02f41c7c629c1583dbd048590c6927acb8 SHA512 75464258d2e41411043d53d4d3e9aa6cfb39d44cc4325cdfdc37ef3865ba3ca60cf304c310e898c1bb1789f12f62a4e7ff5aefe4d7b6098c3b41ac83f0550406
-EBUILD xapian-1.4.17.ebuild 1814 BLAKE2B e2929c4a13927bf231d2f8fb353e7847f044ee9f6cbc869ef6621fcd6ed99041b517ce6ab697e03f56ffbccc6f6dfa9e6589733019f062923140662f08ebe90c SHA512 2246efa98ecf88d19280b56f5e872f90d585f5437a56f9a8655bb8dcbe213393d784d90aafe40c871d2b1b00624bf0d6a67334887b01b78d9d6dd71b28166259
-EBUILD xapian-1.4.18.ebuild 1821 BLAKE2B 970eccbdc9ae049fd23249cb46a6d1bd65b6bfa239ff6ce4bfec4d2498405dc489df2465ce9960cb3d4e308e20f36a42d2a7cd685275abe7608a1932330ff4cf SHA512 c4c9de7cbe5d89a84e80fe7dd6c2fe88f7054c36276f97f06ea2e33aebc7fef111bec2b820c3decc3d0c09574c6a9ca200a3361dc5eefce1f6822bd659d6a9f8
+EBUILD xapian-1.2.25.ebuild 1846 BLAKE2B 4ff9216abc501a2f4f517074317d06e2bdc44d2828971c66c6e756b3a03770485eb5788c2cccc1f59bd4370f13712db70d8a33ab11edf67010e9e474e390d2b0 SHA512 63c427797d5d374164f176f60e0a38f42ad2d9b1ae5b0aead552a79302c692424ae788779112f44229b7d32db6d2a9da65af5dc9ffeae70500ee610e122084b5
+EBUILD xapian-1.4.17.ebuild 1811 BLAKE2B 3f94c8906bc29c3bc221616b80578eda444cb3b2f56bef639aaf03a22b86e938aa2b3a8cf66afa1dddc7fd243865c9fc704cef181699af1465a3775ea65a3af3 SHA512 0cf9f291f252f8871229e5e7705e4bf34a1c868de50b8e591ce888897ceeb19af8f75bf0dbb96762443ab6c8855ece59a30b79f4b167c5dc566b95f29ac87349
+EBUILD xapian-1.4.18.ebuild 1818 BLAKE2B 1d0f89fa2f4e92ab049e0e63d2974ecf8e538f2870090164272eae4b2d8df60defaf0e848ce12306d1ab19a31da96a4dadbf8d0a8fc6f688dfbfcac240e97069 SHA512 2f9786eb876caf81b091c3d80eec0a474332e771099bc0926bb84bcec58ea37d2b70ba05d3071619fc4e073d937f97610660031d5a8a8ff8307af1ca023b2e68
 MISC metadata.xml 934 BLAKE2B 2117e395836430d6d356b226e9b4f487141974aa36c36be8505a9e077cbaed2af0c77097be9f2426940b717f2d56200cac6715da50e95c6d6aa1c9db84c0cee7 SHA512 dd16bbd4e60c8ba983524471d0933d3578e932d982777ce04bebfda0a1cebe67be9de76b11b85240f719b24299453c1051bcc6149ec8e2476337249c309cf585
diff --git a/dev-libs/xapian/xapian-1.2.25.ebuild b/dev-libs/xapian/xapian-1.2.25.ebuild
index 7289983d3f51..6fb5b4472847 100644
--- a/dev-libs/xapian/xapian-1.2.25.ebuild
+++ b/dev-libs/xapian/xapian-1.2.25.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-inherit eutils multilib-minimal
+inherit multilib-minimal
 
 MY_P="${PN}-core-${PV}"
 
@@ -42,7 +42,7 @@ multilib_src_configure() {
 
 	myconf="${myconf} --enable-backend-flint --enable-backend-remote"
 
-	ECONF_SOURCE=${S} econf $myconf
+	ECONF_SOURCE=${S} econf ${myconf}
 }
 
 MULTILIB_WRAPPED_HEADERS=(
@@ -61,11 +61,11 @@ multilib_src_install() {
 }
 
 multilib_src_install_all() {
-	use doc || rm -rf "${ED}usr/share/doc/xapian-core-${PV}"
+	use doc || rm -rf "${ED%/}/usr/share/doc/xapian-core-${PV}"
 
 	dodoc AUTHORS HACKING PLATFORMS README NEWS
 
-	find "${D}" -name "*.la" -type f -delete || die
+	find "${ED}" -name "*.la" -type f -delete || die
 }
 
 multilib_src_test() {
diff --git a/dev-libs/xapian/xapian-1.4.17.ebuild b/dev-libs/xapian/xapian-1.4.17.ebuild
index d2e1c0ec8fc4..d78cc9126d08 100644
--- a/dev-libs/xapian/xapian-1.4.17.ebuild
+++ b/dev-libs/xapian/xapian-1.4.17.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-inherit eutils multilib-minimal
+inherit multilib-minimal
 
 MY_P="${PN}-core-${PV}"
 
@@ -41,7 +41,7 @@ multilib_src_configure() {
 
 	myconf="${myconf} --enable-backend-glass --enable-backend-chert --program-suffix="
 
-	ECONF_SOURCE=${S} econf $myconf
+	ECONF_SOURCE=${S} econf ${myconf}
 }
 
 MULTILIB_WRAPPED_HEADERS=(
@@ -65,10 +65,10 @@ multilib_src_install() {
 
 multilib_src_install_all() {
 	if use doc; then
-		rm -rf "${D}/usr/share/doc/xapian-core-${PV}" || die
+		rm -rf "${ED}/usr/share/doc/xapian-core-${PV}" || die
 	fi
 
 	dodoc AUTHORS HACKING PLATFORMS README NEWS
 
-	find "${D}" -name "*.la" -type f -delete || die
+	find "${ED}" -name "*.la" -type f -delete || die
 }
diff --git a/dev-libs/xapian/xapian-1.4.18.ebuild b/dev-libs/xapian/xapian-1.4.18.ebuild
index af91a3119e61..6a4927607af9 100644
--- a/dev-libs/xapian/xapian-1.4.18.ebuild
+++ b/dev-libs/xapian/xapian-1.4.18.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-inherit eutils multilib-minimal
+inherit multilib-minimal
 
 MY_P="${PN}-core-${PV}"
 
@@ -41,7 +41,7 @@ multilib_src_configure() {
 
 	myconf="${myconf} --enable-backend-glass --enable-backend-chert --program-suffix="
 
-	ECONF_SOURCE=${S} econf $myconf
+	ECONF_SOURCE=${S} econf ${myconf}
 }
 
 MULTILIB_WRAPPED_HEADERS=(
@@ -65,10 +65,10 @@ multilib_src_install() {
 
 multilib_src_install_all() {
 	if use doc; then
-		rm -rf "${D}/usr/share/doc/xapian-core-${PV}" || die
+		rm -rf "${ED}/usr/share/doc/xapian-core-${PV}" || die
 	fi
 
 	dodoc AUTHORS HACKING PLATFORMS README NEWS
 
-	find "${D}" -name "*.la" -type f -delete || die
+	find "${ED}" -name "*.la" -type f -delete || die
 }