gentoo resync : 25.04.2020

4 files changed, 5 insertions, 312 deletions

diff --git a/dev-libs/xapian-bindings/Manifest b/dev-libs/xapian-bindings/Manifest
index 7226c3358c8d..722800132966 100644
--- a/dev-libs/xapian-bindings/Manifest
+++ b/dev-libs/xapian-bindings/Manifest
@@ -1,9 +1,7 @@
 DIST xapian-bindings-1.2.25.tar.xz 1711860 BLAKE2B 66367dbc503333c4f59da8bb5bd4885fe9678aace45365573bac8e0e8e2c712795af2021ff52de9eeabb91f65a2f0447d1963424b1ae6558be95b737d1279e98 SHA512 5d27b2ae2722409ea99a1b9e6bf3f5c61ed9195b67121c090f1533340d3b11c546014985d0989a0725b60a07b392b9705bce054495f423bd3a7c99835aa336c7
 DIST xapian-bindings-1.4.14.tar.xz 1132008 BLAKE2B 3057f8f98cfd11e82555df4b554ad1ffed793ea92bf0f077ef4a495d09250da47116d76ded0deb07621f3b14ddd7f653aa0bb19add01d88fe077e637bee21ec4 SHA512 6d35c6c011c6d841254934f4dd59f4a2b842fe826af108e526cde9acbccec67b43517974331b21cbee5e828d0743aa5b9b973a96e1940065fbcfc342b8f23ead
 DIST xapian-bindings-1.4.15.tar.xz 1132248 BLAKE2B ba9f60263881ca558f9d3deab09bd07271e6f54e06a13d09bcb59bfaf9a637e959b3a62a9e9db0724ae2262e605fc3fd2160559d53702b2af5012f47177ea66a SHA512 dec8a0431c9070fc70d79b67bddc2e0adb10ef5366c4b9d7a135365ea6c6680d2e7682dbfd60c29eca51da48eaa0715509e30b13d5482d5a38bfd0d0156c43f9
-DIST xapian-bindings-1.4.7.tar.xz 1121700 BLAKE2B f8492113b76aba322c975aa2b957a627a32e5209d8b79f435dc85c899cf14619af6165265e624e2ba8806f3c91dd35d71d98c4a47f5d6f4fba1b7fb83700c0d0 SHA512 c904cd3abf19d68495b0487ea77265fdc92a3cd8b1c2437b89034efd349ce41198bbc4abca49f259f71a1ba0fd269b2cf9b6dd4c1607678a73cbed4de9c5a1d5
 EBUILD xapian-bindings-1.2.25.ebuild 5545 BLAKE2B 971788479ed9732f0cd64fbba81c1b30db4cc1ab606dcd7ff3389dc30d88c9f46d40fb0446f8eab106194e0b718140bb2dead274988f2ba33eae4fdd449b727b SHA512 6f6dc696c2af464df8c2d675fc3ac28c81b77ef209239e2d91d24b23ef902611bcd61214d1536a8655612f01c20ff7bcd20e8f09b11614517aa7067ae57c674f
-EBUILD xapian-bindings-1.4.14.ebuild 6526 BLAKE2B 941a33ed03f622a0e69449ee60bb2fa60ffbf63009283ccebe7fa283079c9c82694de22f9bc1783c27e4d8909b7fa7d26b4d25305abd0357ddab1277f0c96e3e SHA512 bc8713fbeb95008dc448c3ee8a1d641dbbb88a6abd4aa3d0fe4f5498bc1fab421b7f5dbd8ae06ac66de441c3fccddf39a4553b8558cbff149b6f51ddc319dc57
-EBUILD xapian-bindings-1.4.15.ebuild 6532 BLAKE2B 89b750d9ea616eee0ed3b7c49c178e32623d035b2c1fa16c71995363a0a3eec333ddfc6afd612f7c20cb2a35d6587df81afbda1088b6f036466b5a2394865cb8 SHA512 48f42634cb8ac541f20239868abe3f157118284779c321ebe6df3e601cfd1214d01c91dbace51b68e82256513451b43dfdf9010698bfe122e9de594c5dfa95a0
-EBUILD xapian-bindings-1.4.7.ebuild 6490 BLAKE2B 8823da5b50c821d7ef8f32da57d0b31b33b6d47c31bbabee4d4f8b9304ebe792245e544931f609e396087f760a4b4fba505169a04c68a3ab2d55354663890506 SHA512 ad88c2a5af74c3888f71b10d6983108ad69be339711dd09697360a54e93d8fccb8384f139929809347330e97fe0823667ae8f3c4f5c54168c8cfffae309ffb63
+EBUILD xapian-bindings-1.4.14.ebuild 6539 BLAKE2B 61affb35c53857983b1343e356c79e1fa6d69cb7773c38cf92bd6d6ceaea055162df18504084ec92599d5727e11a5987e26b10ff5d1b807925808a7b45e170b6 SHA512 99050c1182e6a5e63d50190060a6a1e22cd5137995efbbc89b42d017d0d770216f9ff6fe0f76fa3e75ab46cf19a7fca6838cc717cc5d6e4c4ebfb54bed8ef54f
+EBUILD xapian-bindings-1.4.15.ebuild 6540 BLAKE2B c1e47eae8a9aa91c66a7e2baa0bb89dd8c0b49b2a7c99d00f4706bfbf801fefe9b84c75e30a1410f04b1d9c11599da02d3a6e3f0e8be3907a06b963b5a75eca2 SHA512 2c6bd849da83e6ad193aeeef1418575cff5845e4b5385494712e85739b469cf5d97ab55372ea56e0b21dc78dfec119f45134224db952269ead653b5e8760fa2b
 MISC metadata.xml 252 BLAKE2B f6282e2a99df668246ea8570c72345463f06d282b6adc6d9de2a08ef0827cf4572332c580caa594aad5ba8e200870d8d25494549ee4413798025f0d885b61a68 SHA512 cbda7bf9832872764ae776ce16b2966c37a2ba3a1982d9817006fd6b82d7b17146434cde428bf114062a483e9053d2acdcdd004695e6ebf428d19cdc09937c65
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.4.14.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.4.14.ebuild
index 159d070db12e..8785a8f8933b 100644
--- a/dev-libs/xapian-bindings/xapian-bindings-1.4.14.ebuild
+++ b/dev-libs/xapian-bindings/xapian-bindings-1.4.14.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} )
 PYTHON_REQ_USE="threads(+)"
 
 USE_PHP="php7-1 php7-2 php7-3 php7-4"
@@ -23,7 +23,7 @@ SRC_URI="https://oligarchy.co.uk/xapian/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="java lua mono perl php python ruby tcl"
 REQUIRED_USE="|| ( java lua mono perl php python ruby tcl )
 	python? ( ${PYTHON_REQUIRED_USE} )
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.4.15.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.4.15.ebuild
index 261fa82b7336..674147465eb2 100644
--- a/dev-libs/xapian-bindings/xapian-bindings-1.4.15.ebuild
+++ b/dev-libs/xapian-bindings/xapian-bindings-1.4.15.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} )
 PYTHON_REQ_USE="threads(+)"
 
 USE_PHP="php7-1 php7-2 php7-3 php7-4"
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.4.7.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.4.7.ebuild
deleted file mode 100644
index 16555fec4a0b..000000000000
--- a/dev-libs/xapian-bindings/xapian-bindings-1.4.7.ebuild
+++ /dev/null
@@ -1,305 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python{2_7,3_6} )
-PYTHON_REQ_USE="threads(+)"
-
-USE_PHP="php5-6 php7-1 php7-2"
-
-PHP_EXT_NAME="xapian"
-PHP_EXT_INI="yes"
-PHP_EXT_OPTIONAL_USE="php"
-
-USE_RUBY="ruby22 ruby23 ruby24"
-RUBY_OPTIONAL="yes"
-
-inherit java-pkg-opt-2 mono-env multibuild php-ext-source-r3 python-r1 ruby-ng toolchain-funcs
-
-DESCRIPTION="SWIG and JNI bindings for Xapian"
-HOMEPAGE="https://www.xapian.org/"
-SRC_URI="https://oligarchy.co.uk/xapian/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ~mips ppc ppc64 ~sparc ~x86"
-IUSE="java lua mono perl php python ruby tcl"
-REQUIRED_USE="|| ( java lua mono perl php python ruby tcl )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	ruby? ( || ( $(ruby_get_use_targets) ) )"
-
-COMMONDEPEND=">=dev-libs/xapian-1.4.7:0/30
-	lua? ( dev-lang/lua:= )
-	perl? ( dev-lang/perl:= )
-	python? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		${PYTHON_DEPS}
-	)
-	ruby? ( $(ruby_implementations_depend) )
-	tcl? ( dev-lang/tcl:= )
-	mono? ( dev-lang/mono )"
-DEPEND="${COMMONDEPEND}
-	virtual/pkgconfig
-	java? ( >=virtual/jdk-1.6 )"
-RDEPEND="${COMMONDEPEND}
-	java? ( >=virtual/jre-1.6 )"
-
-S="${WORKDIR}/${P}"
-
-has_basic_bindings() {
-	# Update this list if new bindings are added that are not built
-	# multiple times for multiple versions like php, python and ruby are
-	return $(use mono || use java || use lua || use perl || use tcl)
-}
-
-php_copy_sources() {
-	local MULTIBUILD_VARIANTS=($(php_get_slots))
-	multibuild_copy_sources
-}
-
-php_foreach_impl() {
-	local MULTIBUILD_VARIANTS=($(php_get_slots))
-	multibuild_foreach_variant "$@"
-}
-
-ruby_copy_sources() {
-	local MULTIBUILD_VARIANTS=($(ruby_get_use_implementations))
-	multibuild_copy_sources
-}
-
-ruby_foreach_impl() {
-	local MULTIBUILD_VARIANTS=($(ruby_get_use_implementations))
-	multibuild_foreach_variant "$@"
-}
-
-pkg_setup() {
-	use mono && mono-env_pkg_setup
-	use java && java-pkg-opt-2_pkg_setup
-}
-
-src_unpack() {
-	default
-
-	if use php; then
-		local php_slot
-		for php_slot in $(php_get_slots); do
-			# Unfortunately required for php-ext-source-r3_createinifiles().
-			mkdir "${WORKDIR}/${php_slot}"
-		done
-	fi
-}
-
-src_prepare() {
-	use java && java-pkg-opt-2_src_prepare
-
-	# https://trac.xapian.org/ticket/702
-	export XAPIAN_CONFIG="/usr/bin/xapian-config"
-
-	if use php; then
-		php_copy_sources
-	fi
-
-	if use python; then
-		python_copy_sources
-	fi
-
-	if use ruby; then
-		ruby_copy_sources
-	fi
-
-	eapply_user
-}
-
-src_configure() {
-	if has_basic_bindings ; then
-		local conf=(
-			--disable-documentation
-			$(use_with mono csharp)
-			$(use_with java)
-			$(use_with lua)
-			$(use_with perl)
-			$(use_with tcl)
-			--without-php
-			--without-php7
-			--without-python
-			--without-python3
-			--without-ruby
-		)
-
-		if use java; then
-			local -x CXXFLAGS="${CXXFLAGS} $(java-pkg_get-jni-cflags)"
-		fi
-
-		if use perl; then
-			local -x PERL_ARCH="$(perl -MConfig -e 'print $Config{installvendorarch}')"
-			local -x PERL_LIB="$(perl -MConfig -e 'print $Config{installvendorlib}')"
-		fi
-
-		if use lua; then
-			local -x LUA_INC="$("$(tc-getPKG_CONFIG)" --variable=INSTALL_INC lua)"
-			local -x LUA_LIB="$("$(tc-getPKG_CONFIG)" --variable=INSTALL_CMOD lua)"
-		fi
-
-		econf "${conf[@]}"
-	fi
-
-	php_configure() {
-		local myconf=(
-			--disable-documentation
-			--without-java
-			--without-lua
-			--without-csharp
-			--without-perl
-			--without-python
-			--without-python3
-			--without-ruby
-			--without-tcl
-		)
-		if [[ ${MULTIBUILD_VARIANT} == php5.* ]]; then
-			myconf+=(
-				--with-php
-				--without-php7
-			)
-			local -x PHP_CONFIG="${EPREFIX}/usr/$(get_libdir)/${MULTIBUILD_VARIANT/-/.}/bin/php-config"
-		elif [[ ${MULTIBUILD_VARIANT} == php7.* ]]; then
-			myconf+=(
-				--without-php
-				--with-php7
-			)
-			local -x PHP_CONFIG7="${EPREFIX}/usr/$(get_libdir)/${MULTIBUILD_VARIANT/-/.}/bin/php-config"
-		fi
-
-		econf "${myconf[@]}"
-	}
-
-	if use php; then
-		addpredict /usr/share/snmp/mibs/.index
-		addpredict /var/lib/net-snmp/mib_indexes
-
-		php_foreach_impl run_in_build_dir php_configure
-	fi
-
-	python_configure() {
-		local myconf=(
-			--disable-documentation
-			--without-java
-			--without-lua
-			--without-csharp
-			--without-perl
-			--without-php
-			--without-php7
-			--without-ruby
-			--without-tcl
-		)
-		if python_is_python3; then
-			myconf+=( --with-python3 )
-		else
-			myconf+=( --with-python )
-		fi
-
-		# Avoid sandbox failures when compiling modules
-		addpredict "$(python_get_sitedir)"
-
-		econf "${myconf[@]}"
-	}
-
-	if use python; then
-		python_foreach_impl run_in_build_dir python_configure
-	fi
-
-	ruby_configure() {
-		local myconf=(
-			--disable-documentation
-			--without-java
-			--without-lua
-			--without-csharp
-			--without-perl
-			--without-php
-			--without-php7
-			--without-python
-			--without-python3
-			--with-ruby
-			--without-tcl
-		)
-		local -x RUBY="${EPREFIX}/usr/bin/${MULTIBUILD_VARIANT}"
-
-		econf "${myconf[@]}"
-	}
-
-	if use ruby; then
-		ruby_foreach_impl run_in_build_dir ruby_configure
-	fi
-}
-
-src_compile() {
-	if has_basic_bindings ; then
-		default
-	fi
-
-	if use php; then
-		php_foreach_impl run_in_build_dir emake
-	fi
-
-	if use python; then
-		unset PYTHONDONTWRITEBYTECODE
-		python_foreach_impl run_in_build_dir emake
-	fi
-
-	if use ruby; then
-		ruby_foreach_impl run_in_build_dir emake
-	fi
-}
-
-src_test() {
-	if has_basic_bindings ; then
-		default
-	fi
-
-	if use php; then
-		php_foreach_impl run_in_build_dir emake check
-	fi
-
-	if use python; then
-		python_foreach_impl run_in_build_dir emake check
-	fi
-
-	if use ruby; then
-		ruby_foreach_impl run_in_build_dir emake check
-	fi
-}
-
-src_install() {
-	if has_basic_bindings ; then
-		emake DESTDIR="${D}" install
-	fi
-
-	if use java; then
-		java-pkg_dojar java/built/xapian.jar
-		# TODO: make the build system not install this...
-		java-pkg_doso java/.libs/libxapian_jni.so
-		rm -rf "${D}var" || die "could not remove java cruft!"
-	fi
-
-	if use php; then
-		php_foreach_impl run_in_build_dir emake DESTDIR="${D}" install
-		php-ext-source-r3_createinifiles
-		# php-ext-source-r3_createinifiles() changes current directory.
-		cd "${S}"
-	fi
-
-	if use python; then
-		python_foreach_impl run_in_build_dir emake DESTDIR="${D}" install
-	fi
-
-	if use ruby; then
-		ruby_foreach_impl run_in_build_dir emake DESTDIR="${D}" install
-	fi
-
-	# For some USE combinations this directory is not created
-	if [[ -d "${D}/usr/share/doc/xapian-bindings" ]]; then
-		mv "${D}/usr/share/doc/xapian-bindings" "${D}/usr/share/doc/${PF}" || die
-	fi
-
-	dodoc AUTHORS HACKING NEWS TODO README
-}