commit: bb5b5e98f11b14f6df13f5cd6e4e214715cf027c Author: Viorel Munteanu <ceamac <AT> gentoo <DOT> org> AuthorDate: Sat Apr 1 10:08:35 2023 +0000 Commit: Viorel Munteanu <ceamac <AT> gentoo <DOT> org> CommitDate: Sun Apr 2 09:59:14 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb5b5e98
dev-libs/xapian-bindings: add 1.4.22 Closes: https://bugs.gentoo.org/864193 Closes: https://bugs.gentoo.org/896736 Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org> dev-libs/xapian-bindings/Manifest | 1 + ...ian-bindings-1.4.22-fix-java-installation.patch | 15 + ...bindings-1.4.22-remove-precompiled-python.patch | 22 ++ .../xapian-bindings/xapian-bindings-1.4.22.ebuild | 346 +++++++++++++++++++++ 4 files changed, 384 insertions(+) diff --git a/dev-libs/xapian-bindings/Manifest b/dev-libs/xapian-bindings/Manifest index 46fff2f4ad5f..ce0af5766f43 100644 --- a/dev-libs/xapian-bindings/Manifest +++ b/dev-libs/xapian-bindings/Manifest @@ -1,2 +1,3 @@ DIST xapian-bindings-1.4.19.tar.xz 1137596 BLAKE2B 46004a3449a3137db42164a8b4c5b8684d2eaf0edfa60fe7ca41d5565d1cc16b110ca8204100c9e654baa323a4c73536f80550b17989ce3ee4a132315c31a50e SHA512 c3e353a192822be5d86d448b9d5e4c5eb15d5eb2d079560f7c457f8f7ca85d42e2b933891e784d384c188577f427ca1929c2b47732b9d637e36543e8b5b704d6 DIST xapian-bindings-1.4.21.tar.xz 1151620 BLAKE2B 5596d0784110b6b73efce4b330ad7c0750a7173c94c37d80b4c75865b949b16f32957ff7ca0d67c08592b85874a5b19e57a11d32ef26976fb3cae38f542f5ba0 SHA512 86cbdc8ba73be8aa947e209106dd49d111d264f0b00b5831356e19ba3299eb8f87f2c57ab051ea54c54fb5f1b8cc6a1175ee18f89094f5c7345b820ea805ad33 +DIST xapian-bindings-1.4.22.tar.xz 1074840 BLAKE2B 49c71ece1a159a21b95ff8b6d30c5786e6fd2d1744f0a2e27427b83a85ebced6106ab57655715f6e2089bc3e56da32d6f2ad3d71303a1b75316c7d1a61f84cd0 SHA512 0d1b615646d1bdf383e4e32ae152c1493a23ad173232929c8153bb311b3f5b6c6728f29f46f703854c9249ffb35cb620eda1d68cf742c2150f628c19ed55c10f diff --git a/dev-libs/xapian-bindings/files/xapian-bindings-1.4.22-fix-java-installation.patch b/dev-libs/xapian-bindings/files/xapian-bindings-1.4.22-fix-java-installation.patch new file mode 100644 index 000000000000..58cc6da9a68c --- /dev/null +++ b/dev-libs/xapian-bindings/files/xapian-bindings-1.4.22-fix-java-installation.patch @@ -0,0 +1,15 @@ +The build system installs stray pyc files. + +--- a/python3/Makefile.am ++++ b/python3/Makefile.am +@@ -40,9 +40,7 @@ + + # Install as _DATA rather than _SCRIPTS because we don't want to make these + # executable (they don't have a #! line). +-pkgpylib_DATA = xapian/__init__.py \ +- xapian/__pycache__/__init__.@[email protected] \ +- xapian/__pycache__/__init__.@PYTHON3_CACHE_OPT1_EXT@ ++pkgpylib_DATA = xapian/__init__.py + + pkgpylib_LTLIBRARIES = _xapian.la + diff --git a/dev-libs/xapian-bindings/files/xapian-bindings-1.4.22-remove-precompiled-python.patch b/dev-libs/xapian-bindings/files/xapian-bindings-1.4.22-remove-precompiled-python.patch new file mode 100644 index 000000000000..c8155ee2c36e --- /dev/null +++ b/dev-libs/xapian-bindings/files/xapian-bindings-1.4.22-remove-precompiled-python.patch @@ -0,0 +1,22 @@ +The build system installs the jni shared library in a wrong path. + +--- a/java/Makefile.am ++++ b/java/Makefile.am +@@ -137,7 +137,7 @@ + + jnidir = `pwd`/built + +-jni_LTLIBRARIES = libxapian_jni.la ++noinst_LTLIBRARIES = libxapian_jni.la + + # Remove the .la file - libxapian_jni.la is never linked against (it's a + # module) and JVMs don't use libltdl. Note that the library gets installed by +@@ -162,7 +162,7 @@ + endif + AM_CXXFLAGS = $(SWIG_CXXFLAGS) $(XAPIAN_CXXFLAGS) + AM_CPPFLAGS = $(JAVA_CPPFLAGS) +-libxapian_jni_la_LDFLAGS = -avoid-version -module $(SHREXT) $(NO_UNDEFINED) ++libxapian_jni_la_LDFLAGS = -avoid-version -module $(SHREXT) $(NO_UNDEFINED) -rpath $(libdir)/xapian-bindings + libxapian_jni_la_LIBADD = $(XAPIAN_LIBS) + libxapian_jni_la_SOURCES = xapian_wrap.cc + diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.4.22.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.4.22.ebuild new file mode 100644 index 000000000000..2503dbf242df --- /dev/null +++ b/dev-libs/xapian-bindings/xapian-bindings-1.4.22.ebuild @@ -0,0 +1,346 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +LUA_COMPAT=( lua5-{1,3,4} luajit ) + +PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_REQ_USE="threads(+)" + +USE_PHP="php8-0 php8-1 php8-2" + +PHP_EXT_NAME="xapian" +PHP_EXT_INI="yes" +PHP_EXT_OPTIONAL_USE="php" + +USE_RUBY="ruby30 ruby31 ruby32" +RUBY_OPTIONAL="yes" + +# mono-env does not support EAPI 8 +inherit autotools java-pkg-opt-2 lua mono-env multibuild php-ext-source-r3 python-r1 ruby-ng + +DESCRIPTION="SWIG and JNI bindings for Xapian" +HOMEPAGE="https://xapian.org/"; +SRC_URI="https://oligarchy.co.uk/xapian/${PV}/${P}.tar.xz"; +S="${WORKDIR}/${P}" # need this here, some inherited eclasses change it + +LICENSE="GPL-2" +SLOT="0" +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 ) + lua? ( ${LUA_REQUIRED_USE} ) + python? ( ${PYTHON_REQUIRED_USE} ) + ruby? ( || ( $(ruby_get_use_targets) ) ) +" + +COMMONDEPEND=" + >=dev-libs/xapian-1.4.21 + lua? ( ${LUA_DEPS} ) + mono? ( dev-lang/mono ) + perl? ( dev-lang/perl:= ) + php? ( dev-lang/php:=[-threads] ) + python? ( + dev-python/sphinx[${PYTHON_USEDEP}] + ${PYTHON_DEPS} + ) + ruby? ( $(ruby_implementations_depend) ) + tcl? ( dev-lang/tcl:= ) +" +DEPEND=" + ${COMMONDEPEND} + virtual/pkgconfig + java? ( >=virtual/jdk-1.8:* ) +" +RDEPEND=" + ${COMMONDEPEND} + java? ( >=virtual/jre-1.8:* ) +" + +PATCHES=( + "${FILESDIR}"/${P}-remove-precompiled-python.patch + "${FILESDIR}"/${P}-fix-java-installation.patch +) + +has_basic_bindings() { + # Update this list if new bindings are added that are not built + # multiple times for multiple versions like lua, php, python and ruby are + return $(use mono || use java || 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() { + eapply "${PATCHES[@]}" + eautoreconf + + use java && java-pkg-opt-2_src_prepare + + # https://trac.xapian.org/ticket/702 + export XAPIAN_CONFIG="/usr/bin/xapian-config" + + if use lua; then + lua_copy_sources + fi + + 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() { + # Needed to get e.g. test failure details + MAKEOPTS+=" VERBOSE=1" + + if has_basic_bindings ; then + local conf=( + --disable-documentation + $(use_with mono csharp) + $(use_with java) + $(use_with perl) + $(use_with tcl) + --without-lua + --without-php + --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 + + econf "${conf[@]}" + fi + + lua_configure() { + local myconf=( + --disable-documentation + --without-csharp + --without-java + --without-perl + --without-tcl + --without-php + --without-python + --without-python3 + --without-ruby + --with-lua + ) + + local -x LUA_INC="$(lua_get_include_dir)" + local -x LUA_LIB="$(lua_get_cmod_dir)" + + econf "${myconf[@]}" + + } + + if use lua; then + lua_foreach_impl run_in_build_dir lua_configure + fi + + php_configure() { + local myconf=( + --disable-documentation + --without-java + --without-lua + --without-csharp + --without-perl + --without-python + --without-python3 + --without-ruby + --without-tcl + --with-php + ) + local -x PHP_CONFIG="${EPREFIX}/usr/$(get_libdir)/${MULTIBUILD_VARIANT/-/.}/bin/php-config" + + 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-ruby + --without-tcl + --with-python3 + ) + + # 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-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 lua; then + lua_foreach_impl run_in_build_dir emake + 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 lua; then + lua_foreach_impl run_in_build_dir emake check + 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 + java-pkg_doso java/.libs/libxapian_jni.so + fi + + if use lua; then + lua_foreach_impl run_in_build_dir emake DESTDIR="${D}" install + 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 + python_foreach_impl python_optimize + fi + + if use ruby; then + ruby_foreach_impl run_in_build_dir emake DESTDIR="${D}" install + find "${ED}"/usr/share/doc/${PF}/ruby/rdocs/js -name \*.gz -delete || die + fi + + # For some USE combinations this directory is not created + if [[ -d "${ED}/usr/share/doc/xapian-bindings" ]]; then + mv "${ED}/usr/share/doc/xapian-bindings" "${ED}/usr/share/doc/${PF}" || die + fi + + dodoc AUTHORS HACKING NEWS TODO README +}
