gentoo Easter resync : 12.04.2020

11 files changed, 10 insertions, 465 deletions

diff --git a/dev-libs/xapian/Manifest b/dev-libs/xapian/Manifest
index d483e27be944..fe747b31714f 100644
--- a/dev-libs/xapian/Manifest
+++ b/dev-libs/xapian/Manifest
@@ -1,23 +1,11 @@
-DIST xapian-core-1.2.24.tar.xz 3210192 BLAKE2B 062f0c15ce87fb64b0eec5e5e54b76c443d0581feab44791bce6925f0f77385b423218dc7006d7e095cc9764fffc73a74a067923c44f51816d94b731d001f903 SHA512 1f8ae5848f94b5f0bee03024f12ae8c336b6d85e58f7b36e885fe604f9fb962c0525e1f44e6cfcd183e811226c61b23f0f2fcc35c7d2e63544b19347a0f96c80
 DIST xapian-core-1.2.25.tar.xz 3253292 BLAKE2B a130e26188c949d0433d017e8d13e7ecf6241a232d00125699ba8ed63eab9cb1651e02182fcc152f960f4e122709958632779daaaf5760fe50953a3b5b07a243 SHA512 a15b5d9b5770337519f671732f53f0642b31f08206824500d589ba309c9e91a05a30353d66ebf70a4c1cb1824b44e1c7b7630e799de3b15d645cf951a6017bfe
-DIST xapian-core-1.4.10.tar.xz 2973780 BLAKE2B 6ef86a4c02e6721f434e33ea27a37ddac9cee62f0c9eed8c6334cadb62dd544be66405dd359dd944cf1ab12742c10e786b7300c4987e33ce33da9d9df4e428d4 SHA512 fa716d6f8c04edb297d99dad4d7835f7874837ab3c39d7017e43708cde6992c596e579418be17b79772e002bd23b94169812523a1abd9519b1dd3df474f027d9
 DIST xapian-core-1.4.11.tar.xz 2975524 BLAKE2B c912e527ef1454c0b4b3e1aedd91a8a63d2e0b2dd186759eac00d6a0f64104669467c6c5b0bf3f132d4fa04bb2ef72d07ccfe92137a3360ba699e3420ee8bea4 SHA512 72ab7b0c774390f38319d241689b2dc3c2837fbbf933616574f6ad167f14a25c2eff747910022065508dc7c44f806dc2b71dae80a1b4f1f47e1675fb951bc785
-DIST xapian-core-1.4.12.tar.xz 2979052 BLAKE2B 26b20b22105493679052827a5e6b2890da922cdaa97fca1266b26f6ddb3de6b76d491c37ca10210ef5119ce4250700d87fdd22553456958f6869bc3af51b78ae SHA512 230b39e012366267cf5ea09d01d3b463818c0d05861b8c8643bc6fc238be21bd3f4862adeba864b4af2962b1c0748b3d380dfe845da467f5164b0d938288c430
-DIST xapian-core-1.4.13.tar.xz 2985532 BLAKE2B ffe40998f62625eb9b2ee0ebfecbbccaa1838d27229ff16e88a545a6ba514cb61d647c60560c5fcb425588511d1c03836eeda3dfd61a063e96e4bc88b9ca8692 SHA512 aa7b2262dd9d631339131e814f7c96acd85e386a4c4b6331eff86fc7227663589132779bd6b8c340a2b6f19bd66f8b53acbbe5bc985c74f9bdbe3ce3ccf4c1e7
 DIST xapian-core-1.4.14.tar.xz 2970624 BLAKE2B 5bfa5ab36ad4626fcc9a214427f88bdf55e60166939db3a65d3118b426b0ec6754efc10dbcf32456e033292eba3b29f7500679f69a49df15d40c4111322249ed SHA512 c08c9abe87e08491566b7cfa8cda9e2a80e4959a647428b6d82bce7af1c967b4cb463607ffb8976372a980c163923ced36117a66e0b5a1f35659393def3d371b
-DIST xapian-core-1.4.5.tar.xz 2810612 BLAKE2B 7784e69e3ca064751d829173949fcde65661c2c2070fdc8392cf2b6d40874a3e5b1265e61f25dd39b33e179b3fe3842b67f33a55523c3a18e9b65528e6a23a1e SHA512 cff97a856a406583ca81164ddb704a0eeae7d8d6f94ce3b3f53d5208d657423e87dd06bdc7acb5e5904765bce1cefbc98365cde315c1d46f7b18cfba7b022ae6
+DIST xapian-core-1.4.15.tar.xz 2988752 BLAKE2B d68d69cdc55c1b62a746620fc90f028819813bb98c0ad0cc130c399a4dd62231b920d24363b61e58d002f65a79a117598455779028de1b26b7a808367f5f2de4 SHA512 f28209acae12a42a345382668f7f7da7a2ce5a08362d0e2af63c9f94cb2adca95366499a7afa0bd9008fbfcca4fd1f2c9221e594fc2a2c740f5899e9f03ecad3
 DIST xapian-core-1.4.7.tar.xz 2874172 BLAKE2B 917a35ca717ed4437f4a617ce0b6ac07d5936e07aac6bfa9d6878c12ed0c38e7ca994ad943b6dc7a5cd2fe131a445c5a7859f2286c2201dd048020569ce1a0bf SHA512 9e77a78bd63036966ebb9bbed91e36fef17b37c9465c8d4b7dc8041f0e24b040e6520de645babfeeade952771d145176a204328718cfa8bc2291bb6fdbe840d2
-DIST xapian-core-1.4.8.tar.xz 2880432 BLAKE2B 8468a33614d8c7617755cfe4cc79e72ab42612a79be9fb684525e268efe80c42ce902a60a44dc5548c70b719d752e15927ce24b4ab457905022ae806bffb1f11 SHA512 9ed1f34ec1bf53a4dc628ebb8d080af79a4ac6a315bf1ae52441f0ac3a63e5478ed02887382116b28157b926e685fdc730489426edce560aa4bba27cb7295e48
-DIST xapian-core-1.4.9.tar.xz 2880024 BLAKE2B 25272128fbbd7cb23dab92c87be03fee8dae5b742f26a66b9c51c649a7826639e52124f5f0748d3c12cce81a7875ed217931ddbe2b04303a08709c4a773a617f SHA512 1af23815ff9358d6407723d1a7d3dc00df8f45f4808ccaa4c57f38197763fdc2d62cb7b080fab737408db42ced85707021eac881d80767248ea22aff8a2e4aa3
-EBUILD xapian-1.2.24.ebuild 1581 BLAKE2B 7c534e771196a57ee524e0a2e8d3b68744dc61aae9e71790ac44b9cb450585858528b7f009db437b67132a97774f9b68e68c7e728eefb57240efccd3dee492bd SHA512 dc87ed148ebec1dec119e1e5e98063413c03bb5df02c57dfa99e872ff49fc08f1a53cab617b1b9664ffb1cec2d0d32ad873d914df843e7b14da1ac19784cb1fc
-EBUILD xapian-1.2.25.ebuild 1849 BLAKE2B d80aa67fdd21bd9e2c36a00f170634a41b639d5668964426ad07083be30de1c86ad5028e33a137be7d651916af7a922676d497ad8a9a57fb6582805f73201754 SHA512 22ab125320142c15fb947aa6affc6c8a17de41d88694ef12cb7456417e5cfdcb2e06e7ec63b541a1f64892685a8292f7fa1f9bfd1d9f727fe1ea96b2ba2ab247
-EBUILD xapian-1.4.10.ebuild 1880 BLAKE2B 0bec305e70baf1405b213aa35fb2be9dea8dbe364168484bacfe507d167777be73fc4897a8fdeb9b7e5443f53a31069d11ea2a11e7139607d2c7d0a196c32e69 SHA512 a007af7c24801e6f3c928e0a50224b0fbb6503c343d6fe6a71cafdd255dbfd9c2ce79370a0ee65d95a790b9db06a38ab07e92531f9273fa32dc718e02bc8ce2d
+EBUILD xapian-1.2.25.ebuild 1849 BLAKE2B 976319adb17d73cfb5aff1c29c7febd4c50b9a399cd2a554ac463396b20890913f1c86cbca6ab5d0c7c1185e0b38ca41949102fc7ba704090647dd78f2522805 SHA512 bf3a8c9ad433c52b6ef74479220b693044483dd5aa8d8b09ddfd244cf6f4cf6e0b80c30f1f67901a725cd783baa5dc623080c15a8c07dfdebf13269af37820d5
 EBUILD xapian-1.4.11.ebuild 1844 BLAKE2B 0ef54276319620157c37d20dd624ec50245d04f46d480e54fc1306491ff7b9989f426ae0659095efc0278e3114f19ab96630896e0ca6ac0f4c1059b1c915f33b SHA512 58d8597e88cb312251661f469c3ee5711e19ad39b6c7de0e0ca6756b2d1105dd3894229c854d8f59dcd39d61c58b17294d90b0904abbd18b7f60a85834f6ad61
-EBUILD xapian-1.4.12.ebuild 1846 BLAKE2B d4a59440e986bfeb590a7176d829f74bfdf6778046e9a5a9274f29cdc320125283aa0f78febbddc18a45312a37be86182b69d8ad660e1e3d9bba050aeab26b18 SHA512 559b4ed1ac024a7cf3095382a245cc1b21aa40e57c0559a3bdfbb19a4678af6b6d3b8881e3c0bc874545b9bf056fc57cb85776c6ca476f1c636332d1fe9a7c7f
-EBUILD xapian-1.4.13.ebuild 1805 BLAKE2B b9bc48b5a638640d06558cb64b8ee69f85b34339772e9c417bd3028d932057bec33405f6d1c165d1c2cf495405f4e38ea6375b577cab5f48a212e68b90b51183 SHA512 679ac62036d6a4832e906a4677a0e2812a8ccb34c026a7782defb9096f264d42c6c5dd9d15b61faab53a8cf714dd1957b435e446d59d4d4db5a0bfdca13b94f0
-EBUILD xapian-1.4.14.ebuild 1805 BLAKE2B b9bc48b5a638640d06558cb64b8ee69f85b34339772e9c417bd3028d932057bec33405f6d1c165d1c2cf495405f4e38ea6375b577cab5f48a212e68b90b51183 SHA512 679ac62036d6a4832e906a4677a0e2812a8ccb34c026a7782defb9096f264d42c6c5dd9d15b61faab53a8cf714dd1957b435e446d59d4d4db5a0bfdca13b94f0
-EBUILD xapian-1.4.5.ebuild 1853 BLAKE2B a34bc7f3284fff413ea15a8ab5d0393c6f2a60d1a04735cb05bd696ae7640d696b6586fe0acd38bc75b46f4e5c5c04051aa7518dc6153770339cc09046d5b1d7 SHA512 b731911d7b693bf7df78b722cc24bb36574111c4e508de61556b1c9e8868cab6ff340d6222022efcc250ddb4fd78af2e0610a174ab4dfca8436f90221f079d8b
-EBUILD xapian-1.4.7.ebuild 1853 BLAKE2B 9d279e9c3f13b5f74dc0915064ad2985c6a647ed61ba3398bba7d67536a62fc1c18afda9d8a9fb8a80ddb52a7346c0b101cd08b858d55a79eb4d983f6622bc82 SHA512 31e03d942c316483fc4c12ed8fc808c70ceda743a283a5d0f2b8e090e68e58063410866a30c069745807482bb13b296c09b407fc9e21d1b529e87f604a27be84
-EBUILD xapian-1.4.8.ebuild 1860 BLAKE2B d613a766a6c6751176e41563e38722bce17775e9c0a8a088ecd76bdbbe245eb99e8cbbfb5b5bfd93af6951fbd2caf2743f6103932d427e301a8aeffedf3be229 SHA512 143942fda76f3fdbecf939e53e7d9eeb71f3a5007ead97a5f345d35daa00aed4409aee773f4a82d2982c4860a10a8a29d7e867e098c074b0ce4ce6f341a32870
-EBUILD xapian-1.4.9.ebuild 1860 BLAKE2B d613a766a6c6751176e41563e38722bce17775e9c0a8a088ecd76bdbbe245eb99e8cbbfb5b5bfd93af6951fbd2caf2743f6103932d427e301a8aeffedf3be229 SHA512 143942fda76f3fdbecf939e53e7d9eeb71f3a5007ead97a5f345d35daa00aed4409aee773f4a82d2982c4860a10a8a29d7e867e098c074b0ce4ce6f341a32870
+EBUILD xapian-1.4.14.ebuild 1799 BLAKE2B 3606db05531a84acd989d142de998f88f135cf033496535f6e6d62bc89af5f1e00f9313aa927fee795b4efdc832c8570e34baee7d434129a9ad454f4975f4157 SHA512 c678ab822870e76c27406bac016b166f684116255a24bde979b692a31ab18c65e36b25508818bf5526823fd1a2c7b5b96f7637c3b84cb6bc375d851079222cdc
+EBUILD xapian-1.4.15.ebuild 1805 BLAKE2B 5cd7b053f147e4813c5465c556f02f4c790f99ce032a1cd9a436967a43d7336da8134fef307632e6e24a8fc7582a7af8dbd197039889f6e348a2a4a250de89ac SHA512 4dda1f50d9d5908be95344dfdb2049381befdde663e17cefe0209a628fb830bea5183fb637013188f938be74fd3c70f6d33bf5c072669cf357a2028ea63172aa
+EBUILD xapian-1.4.7.ebuild 1854 BLAKE2B a16bcca3519f22f9968b037bf28e78caa1020155252c11cac443b062ba5adb542c6683cb6ea56a7c4bcf4d7f2d29580a551adcb8ad8eb20d2915c1f085857381 SHA512 42bfbf87a440fc28d9166b58237d0d344ac033ff55d69d4366faebe4ca137c8ffc8af4b276c14a8f2a14a5d24f1abf686c0f40965e86142d325e98f4ab32dcdc
 MISC metadata.xml 995 BLAKE2B 819460521f02526c8eed62539408148f86c76c0bc33c0104c5c3b52b0006c4396e7cc6b6458521398cd412a8e2e7f6bc34136e2efb2ac5effb6a854bb8642e03 SHA512 ceb0b1563cd98457eb65b42f39445d95a18b047e21bd9eb665caf5a83b23d7798727f0ba49042553e6b8e9a4ec88a2a4d7622c9adf8be50278bbb80aa0948fe8
diff --git a/dev-libs/xapian/xapian-1.2.24.ebuild b/dev-libs/xapian/xapian-1.2.24.ebuild
deleted file mode 100644
index 1054b3319f3a..000000000000
--- a/dev-libs/xapian/xapian-1.2.24.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils
-
-MY_P="${PN}-core-${PV}"
-
-DESCRIPTION="Xapian Probabilistic Information Retrieval library"
-HOMEPAGE="https://www.xapian.org/"
-SRC_URI="https://oligarchy.co.uk/xapian/${PV}/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0/1.2.22" # ABI version of libxapian.so, prefixed with 1.2.
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="doc static-libs -cpu_flags_x86_sse +cpu_flags_x86_sse2 +brass +chert +inmemory"
-
-DEPEND="sys-libs/zlib"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	local myconf=""
-
-	einfo
-	if use cpu_flags_x86_sse2; then
-		einfo "Using sse2"
-		myconf="${myconf} --enable-sse=sse2"
-	else
-		if use cpu_flags_x86_sse; then
-			einfo "Using sse"
-			myconf="${myconf} --enable-sse=sse"
-		else
-			einfo "Disabling sse and sse2"
-			myconf="${myconf} --disable-sse"
-		fi
-	fi
-	einfo
-
-	myconf="${myconf} $(use_enable static-libs static)"
-
-	use brass || myconf="${myconf} --disable-backend-brass"
-	use chert || myconf="${myconf} --disable-backend-chert"
-	use inmemory || myconf="${myconf} --disable-backend-inmemory"
-
-	myconf="${myconf} --enable-backend-flint --enable-backend-remote"
-
-	econf $myconf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	mv "${ED}usr/share/doc/xapian-core" "${ED}usr/share/doc/${PF}" || die
-	use doc || rm -rf "${ED}usr/share/doc/${PF}"
-
-	dodoc AUTHORS HACKING PLATFORMS README NEWS
-
-	find "${D}" -name "*.la" -type f -delete || die
-}
-
-src_test() {
-	emake check VALGRIND=
-}
diff --git a/dev-libs/xapian/xapian-1.2.25.ebuild b/dev-libs/xapian/xapian-1.2.25.ebuild
index 01bb84a0369d..a2bfb9c5cd38 100644
--- a/dev-libs/xapian/xapian-1.2.25.ebuild
+++ b/dev-libs/xapian/xapian-1.2.25.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://oligarchy.co.uk/xapian/${PV}/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0/1.2.22" # ABI version of libxapian.so, prefixed with 1.2.
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sparc ~x86 ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~x64-solaris"
 IUSE="doc static-libs -cpu_flags_x86_sse +cpu_flags_x86_sse2 +brass +chert +inmemory"
 
 DEPEND="sys-libs/zlib"
diff --git a/dev-libs/xapian/xapian-1.4.10.ebuild b/dev-libs/xapian/xapian-1.4.10.ebuild
deleted file mode 100644
index 465bd9228b1b..000000000000
--- a/dev-libs/xapian/xapian-1.4.10.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit eutils multilib-minimal
-
-MY_P="${PN}-core-${PV}"
-
-DESCRIPTION="Xapian Probabilistic Information Retrieval library"
-HOMEPAGE="https://www.xapian.org/"
-SRC_URI="https://oligarchy.co.uk/xapian/${PV}/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0/30" # ABI version of libxapian.so
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-solaris"
-IUSE="doc static-libs -cpu_flags_x86_sse +cpu_flags_x86_sse2 +glass +chert +inmemory"
-
-DEPEND="sys-libs/zlib"
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE="inmemory? ( chert )"
-
-S="${WORKDIR}/${MY_P}"
-
-multilib_src_configure() {
-	local myconf=""
-
-	if use cpu_flags_x86_sse2; then
-		myconf="${myconf} --enable-sse=sse2"
-	else
-		if use cpu_flags_x86_sse; then
-			myconf="${myconf} --enable-sse=sse"
-		else
-			myconf="${myconf} --disable-sse"
-		fi
-	fi
-
-	myconf="${myconf} $(use_enable static-libs static)"
-
-	use glass || myconf="${myconf} --disable-backend-glass"
-	use chert || myconf="${myconf} --disable-backend-chert"
-	use inmemory || myconf="${myconf} --disable-backend-inmemory"
-
-	myconf="${myconf} --enable-backend-remote --program-suffix="
-
-	ECONF_SOURCE=${S} econf $myconf
-}
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/xapian/postingsource.h
-	/usr/include/xapian/attributes.h
-	/usr/include/xapian/valuesetmatchdecider.h
-	/usr/include/xapian/version.h
-	/usr/include/xapian/version.h
-	/usr/include/xapian/types.h
-	/usr/include/xapian/positioniterator.h
-	/usr/include/xapian/registry.h
-)
-
-multilib_src_test() {
-	emake check VALGRIND=
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-}
-
-multilib_src_install_all() {
-	if use doc; then
-		rm -rf "${D}/usr/share/doc/xapian-core-${PV}" || die
-	fi
-
-	dodoc AUTHORS HACKING PLATFORMS README NEWS
-
-	find "${D}" -name "*.la" -type f -delete || die
-}
diff --git a/dev-libs/xapian/xapian-1.4.12.ebuild b/dev-libs/xapian/xapian-1.4.12.ebuild
deleted file mode 100644
index 2ea176e5a4b2..000000000000
--- a/dev-libs/xapian/xapian-1.4.12.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit eutils multilib-minimal
-
-MY_P="${PN}-core-${PV}"
-
-DESCRIPTION="Xapian Probabilistic Information Retrieval library"
-HOMEPAGE="https://www.xapian.org/"
-SRC_URI="https://oligarchy.co.uk/xapian/${PV}/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0/30" # ABI version of libxapian.so
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-solaris"
-IUSE="doc static-libs -cpu_flags_x86_sse +cpu_flags_x86_sse2 +glass +inmemory +remote"
-
-DEPEND="sys-libs/zlib"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-multilib_src_configure() {
-	local myconf=""
-
-	if use cpu_flags_x86_sse2; then
-		myconf="${myconf} --enable-sse=sse2"
-	else
-		if use cpu_flags_x86_sse; then
-			myconf="${myconf} --enable-sse=sse"
-		else
-			myconf="${myconf} --disable-sse"
-		fi
-	fi
-
-	myconf="${myconf} $(use_enable static-libs static)"
-
-	use glass || myconf="${myconf} --disable-backend-glass"
-	use inmemory || myconf="${myconf} --disable-backend-inmemory"
-	use remote || myconf="${myconf} --disable-backend-remote"
-
-	myconf="${myconf} --enable-backend-chert --program-suffix="
-
-	ECONF_SOURCE=${S} econf $myconf
-}
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/xapian/postingsource.h
-	/usr/include/xapian/attributes.h
-	/usr/include/xapian/valuesetmatchdecider.h
-	/usr/include/xapian/version.h
-	/usr/include/xapian/version.h
-	/usr/include/xapian/types.h
-	/usr/include/xapian/positioniterator.h
-	/usr/include/xapian/registry.h
-)
-
-multilib_src_test() {
-	emake check VALGRIND=
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-}
-
-multilib_src_install_all() {
-	if use doc; then
-		rm -rf "${D}/usr/share/doc/xapian-core-${PV}" || die
-	fi
-
-	dodoc AUTHORS HACKING PLATFORMS README NEWS
-
-	find "${D}" -name "*.la" -type f -delete || die
-}
diff --git a/dev-libs/xapian/xapian-1.4.14.ebuild b/dev-libs/xapian/xapian-1.4.14.ebuild
index 26a3827b326f..66333a587b65 100644
--- a/dev-libs/xapian/xapian-1.4.14.ebuild
+++ b/dev-libs/xapian/xapian-1.4.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -13,7 +13,7 @@ SRC_URI="https://oligarchy.co.uk/xapian/${PV}/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0/30" # ABI version of libxapian.so
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-solaris"
 IUSE="doc static-libs -cpu_flags_x86_sse +cpu_flags_x86_sse2 +inmemory +remote"
 
 DEPEND="sys-libs/zlib"
diff --git a/dev-libs/xapian/xapian-1.4.13.ebuild b/dev-libs/xapian/xapian-1.4.15.ebuild
index 26a3827b326f..669d3eb246de 100644
--- a/dev-libs/xapian/xapian-1.4.13.ebuild
+++ b/dev-libs/xapian/xapian-1.4.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
diff --git a/dev-libs/xapian/xapian-1.4.5.ebuild b/dev-libs/xapian/xapian-1.4.5.ebuild
deleted file mode 100644
index 5ab5beb116bf..000000000000
--- a/dev-libs/xapian/xapian-1.4.5.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit eutils multilib-minimal
-
-MY_P="${PN}-core-${PV}"
-
-DESCRIPTION="Xapian Probabilistic Information Retrieval library"
-HOMEPAGE="https://www.xapian.org/"
-SRC_URI="https://oligarchy.co.uk/xapian/${PV}/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0/30" # ABI version of libxapian.so
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~x64-solaris"
-IUSE="doc static-libs -cpu_flags_x86_sse +cpu_flags_x86_sse2 +glass +chert +inmemory"
-
-DEPEND="sys-libs/zlib"
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE="inmemory? ( chert )"
-
-S="${WORKDIR}/${MY_P}"
-
-multilib_src_configure() {
-	local myconf=""
-
-	if use cpu_flags_x86_sse2; then
-		myconf="${myconf} --enable-sse=sse2"
-	else
-		if use cpu_flags_x86_sse; then
-			myconf="${myconf} --enable-sse=sse"
-		else
-			myconf="${myconf} --disable-sse"
-		fi
-	fi
-
-	myconf="${myconf} $(use_enable static-libs static)"
-
-	use glass || myconf="${myconf} --disable-backend-glass"
-	use chert || myconf="${myconf} --disable-backend-chert"
-	use inmemory || myconf="${myconf} --disable-backend-inmemory"
-
-	myconf="${myconf} --enable-backend-remote --program-suffix="
-
-	ECONF_SOURCE=${S} econf $myconf
-}
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/xapian/postingsource.h
-	/usr/include/xapian/attributes.h
-	/usr/include/xapian/valuesetmatchdecider.h
-	/usr/include/xapian/version.h
-	/usr/include/xapian/version.h
-	/usr/include/xapian/types.h
-	/usr/include/xapian/positioniterator.h
-	/usr/include/xapian/registry.h
-)
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-}
-
-multilib_src_install_all() {
-	use doc || rm -rf "${D}usr/share/doc/xapian-core-${PV}"
-
-	dodoc AUTHORS HACKING PLATFORMS README NEWS
-
-	find "${D}" -name "*.la" -type f -delete || die
-}
-
-multilib_src_test() {
-	emake check VALGRIND=
-}
diff --git a/dev-libs/xapian/xapian-1.4.7.ebuild b/dev-libs/xapian/xapian-1.4.7.ebuild
index 45c899231780..b5da2d4f5cb3 100644
--- a/dev-libs/xapian/xapian-1.4.7.ebuild
+++ b/dev-libs/xapian/xapian-1.4.7.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://oligarchy.co.uk/xapian/${PV}/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0/30" # ABI version of libxapian.so
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sparc ~x86 ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sparc ~x86 ~x64-solaris"
 IUSE="doc static-libs -cpu_flags_x86_sse +cpu_flags_x86_sse2 +glass +chert +inmemory"
 
 DEPEND="sys-libs/zlib"
diff --git a/dev-libs/xapian/xapian-1.4.8.ebuild b/dev-libs/xapian/xapian-1.4.8.ebuild
deleted file mode 100644
index 0987e4b4f164..000000000000
--- a/dev-libs/xapian/xapian-1.4.8.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit eutils multilib-minimal
-
-MY_P="${PN}-core-${PV}"
-
-DESCRIPTION="Xapian Probabilistic Information Retrieval library"
-HOMEPAGE="https://www.xapian.org/"
-SRC_URI="https://oligarchy.co.uk/xapian/${PV}/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0/30" # ABI version of libxapian.so
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-solaris"
-IUSE="doc static-libs -cpu_flags_x86_sse +cpu_flags_x86_sse2 +glass +chert +inmemory"
-
-DEPEND="sys-libs/zlib"
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE="inmemory? ( chert )"
-
-S="${WORKDIR}/${MY_P}"
-
-multilib_src_configure() {
-	local myconf=""
-
-	if use cpu_flags_x86_sse2; then
-		myconf="${myconf} --enable-sse=sse2"
-	else
-		if use cpu_flags_x86_sse; then
-			myconf="${myconf} --enable-sse=sse"
-		else
-			myconf="${myconf} --disable-sse"
-		fi
-	fi
-
-	myconf="${myconf} $(use_enable static-libs static)"
-
-	use glass || myconf="${myconf} --disable-backend-glass"
-	use chert || myconf="${myconf} --disable-backend-chert"
-	use inmemory || myconf="${myconf} --disable-backend-inmemory"
-
-	myconf="${myconf} --enable-backend-remote --program-suffix="
-
-	ECONF_SOURCE=${S} econf $myconf
-}
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/xapian/postingsource.h
-	/usr/include/xapian/attributes.h
-	/usr/include/xapian/valuesetmatchdecider.h
-	/usr/include/xapian/version.h
-	/usr/include/xapian/version.h
-	/usr/include/xapian/types.h
-	/usr/include/xapian/positioniterator.h
-	/usr/include/xapian/registry.h
-)
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-}
-
-multilib_src_install_all() {
-	use doc || rm -rf "${D}usr/share/doc/xapian-core-${PV}"
-
-	dodoc AUTHORS HACKING PLATFORMS README NEWS
-
-	find "${D}" -name "*.la" -type f -delete || die
-}
-
-multilib_src_test() {
-	emake check VALGRIND=
-}
diff --git a/dev-libs/xapian/xapian-1.4.9.ebuild b/dev-libs/xapian/xapian-1.4.9.ebuild
deleted file mode 100644
index 0987e4b4f164..000000000000
--- a/dev-libs/xapian/xapian-1.4.9.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit eutils multilib-minimal
-
-MY_P="${PN}-core-${PV}"
-
-DESCRIPTION="Xapian Probabilistic Information Retrieval library"
-HOMEPAGE="https://www.xapian.org/"
-SRC_URI="https://oligarchy.co.uk/xapian/${PV}/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0/30" # ABI version of libxapian.so
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-solaris"
-IUSE="doc static-libs -cpu_flags_x86_sse +cpu_flags_x86_sse2 +glass +chert +inmemory"
-
-DEPEND="sys-libs/zlib"
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE="inmemory? ( chert )"
-
-S="${WORKDIR}/${MY_P}"
-
-multilib_src_configure() {
-	local myconf=""
-
-	if use cpu_flags_x86_sse2; then
-		myconf="${myconf} --enable-sse=sse2"
-	else
-		if use cpu_flags_x86_sse; then
-			myconf="${myconf} --enable-sse=sse"
-		else
-			myconf="${myconf} --disable-sse"
-		fi
-	fi
-
-	myconf="${myconf} $(use_enable static-libs static)"
-
-	use glass || myconf="${myconf} --disable-backend-glass"
-	use chert || myconf="${myconf} --disable-backend-chert"
-	use inmemory || myconf="${myconf} --disable-backend-inmemory"
-
-	myconf="${myconf} --enable-backend-remote --program-suffix="
-
-	ECONF_SOURCE=${S} econf $myconf
-}
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/xapian/postingsource.h
-	/usr/include/xapian/attributes.h
-	/usr/include/xapian/valuesetmatchdecider.h
-	/usr/include/xapian/version.h
-	/usr/include/xapian/version.h
-	/usr/include/xapian/types.h
-	/usr/include/xapian/positioniterator.h
-	/usr/include/xapian/registry.h
-)
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-}
-
-multilib_src_install_all() {
-	use doc || rm -rf "${D}usr/share/doc/xapian-core-${PV}"
-
-	dodoc AUTHORS HACKING PLATFORMS README NEWS
-
-	find "${D}" -name "*.la" -type f -delete || die
-}
-
-multilib_src_test() {
-	emake check VALGRIND=
-}