[gentoo-commits] repo/gentoo:master commit in: dev-libs/xapian-bindings/files/, dev-libs/xapian-bindings/
commit: bb5b5e98f11b14f6df13f5cd6e4e214715cf027c
Author: Viorel Munteanu gentoo org>
AuthorDate: Sat Apr 1 10:08:35 2023 +
Commit: Viorel Munteanu gentoo org>
CommitDate: Sun Apr 2 09:59:14 2023 +
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 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 ..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__.@PYTHON3_CACHE_TAG@.pyc \
+- 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 ..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 ..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"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/xapian-bindings/files/, dev-libs/xapian-bindings/
commit: 658ab6db7eca2cc6c4bc7a9b5839a6db33770d0f
Author: Sam James gentoo org>
AuthorDate: Fri Oct 28 18:12:24 2022 +
Commit: Sam James gentoo org>
CommitDate: Fri Oct 28 18:47:47 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=658ab6db
dev-libs/xapian-bindings: drop 1.4.20, 1.4.20-r1
Bug: https://bugs.gentoo.org/790266
Signed-off-by: Sam James gentoo.org>
dev-libs/xapian-bindings/Manifest | 1 -
.../files/xapian-bindings-1.4.20-slibtool.patch| 133
.../xapian-bindings-1.4.20-r1.ebuild | 352 -
.../xapian-bindings/xapian-bindings-1.4.20.ebuild | 346
4 files changed, 832 deletions(-)
diff --git a/dev-libs/xapian-bindings/Manifest
b/dev-libs/xapian-bindings/Manifest
index d1e579516729..f1bd2e45ed4f 100644
--- a/dev-libs/xapian-bindings/Manifest
+++ b/dev-libs/xapian-bindings/Manifest
@@ -1,4 +1,3 @@
DIST xapian-bindings-1.4.18.tar.xz 1135644 BLAKE2B
7120c42d73794f8212bf15afb4566119e44cd39c711d50aab4fcc4320419babc440d4dd732af9e739c68397e740da192fa80cd08c5d2b59e1ae13afff3d6
SHA512
e965384febaa83c28fd63b82192bfa4d5d34b4eb7cfacf1ddfc1201deada4f0498df8e50a191713dc95feb8edb0b1a4e9d6983a639c564f086ee305b8a05397e
DIST xapian-bindings-1.4.19.tar.xz 1137596 BLAKE2B
46004a3449a3137db42164a8b4c5b8684d2eaf0edfa60fe7ca41d5565d1cc16b110ca8204100c9e654baa323a4c73536f80550b17989ce3ee4a132315c31a50e
SHA512
c3e353a192822be5d86d448b9d5e4c5eb15d5eb2d079560f7c457f8f7ca85d42e2b933891e784d384c188577f427ca1929c2b47732b9d637e36543e8b5b704d6
-DIST xapian-bindings-1.4.20.tar.xz 1143304 BLAKE2B
3ab6a9be536d10b0dd369c1c638acbdd7fdf855f6dc8726db9c3791a8369cd83196214771b923aa538e5dda320d2b417f5f0944181b5691cfe5d8e7ddc97dd96
SHA512
bdc876b8e1b946d27673122de6d298112c82fa41e19090a2bcbe0954905ddf66171d36e6753a1e8d46578b128edd729e2fd252311d60ff40a2aec9a4d57796ed
DIST xapian-bindings-1.4.21.tar.xz 1151620 BLAKE2B
5596d0784110b6b73efce4b330ad7c0750a7173c94c37d80b4c75865b949b16f32957ff7ca0d67c08592b85874a5b19e57a11d32ef26976fb3cae38f542f5ba0
SHA512
86cbdc8ba73be8aa947e209106dd49d111d264f0b00b5831356e19ba3299eb8f87f2c57ab051ea54c54fb5f1b8cc6a1175ee18f89094f5c7345b820ea805ad33
diff --git
a/dev-libs/xapian-bindings/files/xapian-bindings-1.4.20-slibtool.patch
b/dev-libs/xapian-bindings/files/xapian-bindings-1.4.20-slibtool.patch
deleted file mode 100644
index d73f8bcb19b9..
--- a/dev-libs/xapian-bindings/files/xapian-bindings-1.4.20-slibtool.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-Upstream-PR: https://github.com/xapian/xapian/pull/322
-
-From c513b0d31d2df31eb57ccbe08bbe46821863557d Mon Sep 17 00:00:00 2001
-From: orbea
-Date: Wed, 20 Jul 2022 13:37:20 -0700
-Subject: [PATCH] xapian-bindings: Fix the build with slibtool
-
-With slibtool the --config argument works differently than in GNU
-libtool which results in 'auto/Xapian/Xapian$(PERL_SO)' failing to be
-created. This can be worked around by using libtool --mode=install where
-slibtool can copy the module to the intended location.
-
-However GNU libtool still requires using --config otherwise it fails
-during --mode=install with the following error.
-
- /bin/bash ../libtool --mode=install cp Xapian.la
/home/runner/work/xapian/xapian/perl/auto/Xapian/Xapian.la
- libtool: error: error: cannot install 'Xapian.la' to a directory not
ending in /usr/local/lib/x86_64-linux-gnu/perl/5.26.1/auto/Xapian
-
-gentoo issue: https://bugs.gentoo.org/793428
- java/run-java-test | 21 +
- perl/Makefile.am| 9 +++--
- python3/Makefile.am | 9 +++--
- tcl8/run-tcl-test | 20 +---
- 4 files changed, 44 insertions(+), 15 deletions(-)
-
-diff --git a/java/run-java-test b/java/run-java-test
-index d0e97af300e..a838de98492 100755
a/java/run-java-test
-+++ b/java/run-java-test
-@@ -1,11 +1,24 @@
- #!/bin/sh
- # To run `jdb` instead of `java` set JAVA=jdb
- # To run under gdb, set JAVA='gdb --args java'
-+LIBTOOL="${LIBTOOL-../libtool}"
- arg=`echo "$1"|sed 's!.*/!!;s!\.class$!!'`
-+
-+# GNU libtool and slibtool have different and incompatible usage for --config.
-+if ${LIBTOOL} --config > libtoolconfig.$$ 2>/dev/null; then
-+ . ./libtoolconfig.$$
-+else
-+ objdir="built/libs"
-+ rm -rf "$objdir"
-+ mkdir -p "$objdir"
-+ ${LIBTOOL} --mode=install cp libxapian_jni.la "$objdir"
-+fi
-+rm -f libtoolconfig.$$
-+
- # Use libtool's -dlopen option to ensure that libxapian_jni.so (or whatever)
- # is in the shared library path.
--${LIBTOOL-../libtool} --config > libtoolconfig.$$
--. ./libtoolconfig.$$
--rm -f libtoolconfig.$$
--${LIBTOOL-../libtool} -dlopen libxapian_jni.la --mode=execute \
-+${LIBTOOL} -dlopen libxapian_jni.la --mode=execute \
- $OSX_SIP_HACK_ENV ${JAVA-java} -Djava.library.path="$objdir" -classpath
built/xapian.jar${PATHSEP-:}. "$arg"
-+rc=$?
-+rm -rf built/libs
-+exit $rc
-diff --git a/perl/Makefile.am b/perl/Makefile.am
-index
[gentoo-commits] repo/gentoo:master commit in: dev-libs/xapian-bindings/files/, dev-libs/xapian-bindings/
commit: 517e71a4480460f13ca2283a9adfac6b0f1f0182
Author: Anthony G. Basile gentoo org>
AuthorDate: Sat May 14 17:59:30 2016 +
Commit: Anthony G. Basile gentoo org>
CommitDate: Sat May 14 17:59:47 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=517e71a4
dev-libs/xapian-bindings: allow ruby 2.0 for version 1.3.6
Package-Manager: portage-2.2.26
.../files/xapian-bindings-1.3.6-allow-ruby-2.0.patch | 12
dev-libs/xapian-bindings/xapian-bindings-1.3.6.ebuild| 3 +++
2 files changed, 15 insertions(+)
diff --git
a/dev-libs/xapian-bindings/files/xapian-bindings-1.3.6-allow-ruby-2.0.patch
b/dev-libs/xapian-bindings/files/xapian-bindings-1.3.6-allow-ruby-2.0.patch
new file mode 100644
index 000..7851bfe
--- /dev/null
+++ b/dev-libs/xapian-bindings/files/xapian-bindings-1.3.6-allow-ruby-2.0.patch
@@ -0,0 +1,12 @@
+diff -Naur xapian-bindings-1.3.6.orig/configure xapian-bindings-1.3.6/configure
+--- xapian-bindings-1.3.6.orig/configure 2016-05-09 06:19:59.0
-0400
xapian-bindings-1.3.6/configure2016-05-14 13:53:35.223526344 -0400
+@@ -18695,7 +18695,7 @@
+ fi
+ RUBY=
+ ;;
+-[01].*|2.0.*)
++[01].*)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $version (too old)" >&5
+ $as_echo "$version (too old)" >&6; }
+ if test yes = "$with_ruby" ; then
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.3.6.ebuild
b/dev-libs/xapian-bindings/xapian-bindings-1.3.6.ebuild
index c9d87b0..e71fefe 100644
--- a/dev-libs/xapian-bindings/xapian-bindings-1.3.6.ebuild
+++ b/dev-libs/xapian-bindings/xapian-bindings-1.3.6.ebuild
@@ -61,6 +61,9 @@ src_prepare() {
# http://trac.xapian.org/ticket/702
export XAPIAN_CONFIG="/usr/bin/xapian-config"
+
+ # Accept ruby 2.0 - patch configure directly to avoid autoreconf
+ epatch "${FILESDIR}"/${P}-allow-ruby-2.0.patch
}
src_configure() {
