Merge branch 'edge' into next

5 files changed, 3 insertions, 158 deletions

diff --git a/dev-libs/xapian/Manifest b/dev-libs/xapian/Manifest
index fe747b31714f..ee921ccc372e 100644
--- a/dev-libs/xapian/Manifest
+++ b/dev-libs/xapian/Manifest
@@ -1,11 +1,7 @@
 DIST xapian-core-1.2.25.tar.xz 3253292 BLAKE2B a130e26188c949d0433d017e8d13e7ecf6241a232d00125699ba8ed63eab9cb1651e02182fcc152f960f4e122709958632779daaaf5760fe50953a3b5b07a243 SHA512 a15b5d9b5770337519f671732f53f0642b31f08206824500d589ba309c9e91a05a30353d66ebf70a4c1cb1824b44e1c7b7630e799de3b15d645cf951a6017bfe
-DIST xapian-core-1.4.11.tar.xz 2975524 BLAKE2B c912e527ef1454c0b4b3e1aedd91a8a63d2e0b2dd186759eac00d6a0f64104669467c6c5b0bf3f132d4fa04bb2ef72d07ccfe92137a3360ba699e3420ee8bea4 SHA512 72ab7b0c774390f38319d241689b2dc3c2837fbbf933616574f6ad167f14a25c2eff747910022065508dc7c44f806dc2b71dae80a1b4f1f47e1675fb951bc785
 DIST xapian-core-1.4.14.tar.xz 2970624 BLAKE2B 5bfa5ab36ad4626fcc9a214427f88bdf55e60166939db3a65d3118b426b0ec6754efc10dbcf32456e033292eba3b29f7500679f69a49df15d40c4111322249ed SHA512 c08c9abe87e08491566b7cfa8cda9e2a80e4959a647428b6d82bce7af1c967b4cb463607ffb8976372a980c163923ced36117a66e0b5a1f35659393def3d371b
 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
 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.14.ebuild 1799 BLAKE2B 3606db05531a84acd989d142de998f88f135cf033496535f6e6d62bc89af5f1e00f9313aa927fee795b4efdc832c8570e34baee7d434129a9ad454f4975f4157 SHA512 c678ab822870e76c27406bac016b166f684116255a24bde979b692a31ab18c65e36b25508818bf5526823fd1a2c7b5b96f7637c3b84cb6bc375d851079222cdc
+EBUILD xapian-1.4.14.ebuild 1797 BLAKE2B ce7eaab77ce89e4e1ca4c5bcdfaafdb88525dc4cc1dcaa830d63ae7ab378ad1ae8eed60fa35760c74a48ceb282fc024c601fc6230bea8f94373313ee6f97409f SHA512 0f7b6d5b74f3ecb5f7a5a3dc9f7ed3e32e32254ce0c940e7de70259322191fe030cb9b1ba043ac4ce7a62dcc62f4d204cebf3bff71edfed15cce6c42cd121a7f
 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
+MISC metadata.xml 934 BLAKE2B 2117e395836430d6d356b226e9b4f487141974aa36c36be8505a9e077cbaed2af0c77097be9f2426940b717f2d56200cac6715da50e95c6d6aa1c9db84c0cee7 SHA512 dd16bbd4e60c8ba983524471d0933d3578e932d982777ce04bebfda0a1cebe67be9de76b11b85240f719b24299453c1051bcc6149ec8e2476337249c309cf585
diff --git a/dev-libs/xapian/metadata.xml b/dev-libs/xapian/metadata.xml
index d403b02634a3..36cab194041e 100644
--- a/dev-libs/xapian/metadata.xml
+++ b/dev-libs/xapian/metadata.xml
@@ -17,7 +17,6 @@
 	<use>
 		<flag name="brass">Enabled brass backend db support</flag>
 		<flag name="chert">Enabled chert backend db support</flag>
-		<flag name="glass">Enabled glass backend db support</flag>
 		<flag name="inmemory">Enabled inmemory backend db support</flag>
 		<flag name="remote">Enabled remote backend db support</flag>
 	</use>
diff --git a/dev-libs/xapian/xapian-1.4.11.ebuild b/dev-libs/xapian/xapian-1.4.11.ebuild
deleted file mode 100644
index 4d2f6ddf80e8..000000000000
--- a/dev-libs/xapian/xapian-1.4.11.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 66333a587b65..cb7643fe28a1 100644
--- a/dev-libs/xapian/xapian-1.4.14.ebuild
+++ b/dev-libs/xapian/xapian-1.4.14.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 +inmemory +remote"
 
 DEPEND="sys-libs/zlib"
diff --git a/dev-libs/xapian/xapian-1.4.7.ebuild b/dev-libs/xapian/xapian-1.4.7.ebuild
deleted file mode 100644
index b5da2d4f5cb3..000000000000
--- a/dev-libs/xapian/xapian-1.4.7.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=
-}