[gentoo-commits] repo/gentoo:master commit in: dev-libs/xapian/files/, dev-libs/xapian/

2022-10-28 Thread Sam James 
commit: bf56dfd09bd04e2077953796ee7a4f5232965659
Author: Sam James  gentoo  org>
AuthorDate: Fri Oct 28 18:52:54 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Oct 28 19:15:28 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf56dfd0

dev-libs/xapian: drop 1.4.18-r1

Signed-off-by: Sam James  gentoo.org>

 dev-libs/xapian/Manifest   |  1 -
 .../xapian-1.4.17-gcc11-missing-include.patch  | 11 
 dev-libs/xapian/xapian-1.4.18-r1.ebuild| 75 --
 3 files changed, 87 deletions(-)

diff --git a/dev-libs/xapian/Manifest b/dev-libs/xapian/Manifest
index ec854306b30f..d1737a07dba6 100644
--- a/dev-libs/xapian/Manifest
+++ b/dev-libs/xapian/Manifest
@@ -1,3 +1,2 @@
-DIST xapian-core-1.4.18.tar.xz 2984508 BLAKE2B 
e5d680578e0a4605a8e99470921fba29cdd3d137d017608b8bf571951726055d2a1d49e9649829f0df92af3d27d0565f90baaca5a4eb5c67cb368f5d1e592d28
 SHA512 
ba6240054c0d2f92b9f1059aa934cdf35388ee7c7e05f4ef6f9856bdaed8ad821095a348ed9a892afdf18c3c0ad20e163028ad0ed3a9934bd69b861e814678ef
 DIST xapian-core-1.4.19.tar.xz 2994860 BLAKE2B 
9566df1646192370e346c1b0d1e1cda68034fe5d3ab94835709f969df643fd36da49a58a2d3b4177a42faf5af2e71df771277848169ae62f94fe0bb0378ba6aa
 SHA512 
d596058d7f9bfa0b73c5b6354331a799936b45f27012894f6792872ade8656bb0387b504aea8c1c3edfbd48787190452e7a49d2b62d181cb050c46edd3e67346
 DIST xapian-core-1.4.21.tar.xz 3018384 BLAKE2B 
61a25ee381c84e0a9f20650d94aa097225f2e947dafad7f6b5497db74f383f5b0fcf277a35ea27ff461b34cd2a9a0b6333f88264c5817cff09a2caf42fa3b398
 SHA512 
4071791daf47f5ae77f32f358c6020fcfa9aa81c15c8da25489b055eef30383695e449ab1cb73670f2f5db2b2a5f78056da0e8eea89d83aaad91dfe340a6b13a

diff --git a/dev-libs/xapian/files/xapian-1.4.17-gcc11-missing-include.patch 
b/dev-libs/xapian/files/xapian-1.4.17-gcc11-missing-include.patch
deleted file mode 100644
index 67693e968dff..
--- a/dev-libs/xapian/files/xapian-1.4.17-gcc11-missing-include.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-https://bugs.gentoo.org/788046
 a/api/omdocument.cc
-+++ b/api/omdocument.cc
-@@ -39,6 +39,7 @@
- 
- #include 
- #include 
-+#include 
- 
- using namespace std;
- 

diff --git a/dev-libs/xapian/xapian-1.4.18-r1.ebuild 
b/dev-libs/xapian/xapian-1.4.18-r1.ebuild
deleted file mode 100644
index 2cb7f29c2d2a..
--- a/dev-libs/xapian/xapian-1.4.18-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit 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 ~m68k ~mips ppc ppc64 ~riscv 
~s390 sparc x86 ~x64-macos ~x64-solaris"
-IUSE="doc static-libs cpu_flags_x86_sse cpu_flags_x86_sse2 +inmemory +remote"
-
-DEPEND="sys-apps/util-linux[${MULTILIB_USEDEP}]
-   sys-libs/zlib[${MULTILIB_USEDEP}]"
-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 inmemory || myconf="${myconf} --disable-backend-inmemory"
-   use remote || myconf="${myconf} --disable-backend-remote"
-
-   myconf="${myconf} --enable-backend-glass --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 "${ED}/usr/share/doc/xapian-core-${PV}" || die
-   fi
-
-   dodoc AUTHORS HACKING PLATFORMS README NEWS
-
-   find "${ED}" -name "*.la" -type f -delete || die
-}

[gentoo-commits] repo/gentoo:master commit in: dev-libs/xapian/files/, dev-libs/xapian/

2021-06-14 Thread Sam James 
commit: d836910165befa9b9cf98d3258784711176d96b3
Author: Sam James  gentoo  org>
AuthorDate: Mon Jun 14 18:46:42 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jun 14 22:11:12 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8369101

dev-libs/xapian: fix build with GCC 11 in 1.4.17

Note that 1.4.18 already seems to work but we may as well include the patch
given somebody posted it.

Closes: https://bugs.gentoo.org/788046
Signed-off-by: Sam James  gentoo.org>

 .../xapian/files/xapian-1.4.17-gcc11-missing-include.patch| 11 +++
 dev-libs/xapian/xapian-1.4.17.ebuild  |  4 
 2 files changed, 15 insertions(+)

diff --git a/dev-libs/xapian/files/xapian-1.4.17-gcc11-missing-include.patch 
b/dev-libs/xapian/files/xapian-1.4.17-gcc11-missing-include.patch
new file mode 100644
index 000..67693e968df
--- /dev/null
+++ b/dev-libs/xapian/files/xapian-1.4.17-gcc11-missing-include.patch
@@ -0,0 +1,11 @@
+https://bugs.gentoo.org/788046
+--- a/api/omdocument.cc
 b/api/omdocument.cc
+@@ -39,6 +39,7 @@
+ 
+ #include 
+ #include 
++#include 
+ 
+ using namespace std;
+ 

diff --git a/dev-libs/xapian/xapian-1.4.17.ebuild 
b/dev-libs/xapian/xapian-1.4.17.ebuild
index d78cc9126d0..28d37a14393 100644
--- a/dev-libs/xapian/xapian-1.4.17.ebuild
+++ b/dev-libs/xapian/xapian-1.4.17.ebuild
@@ -21,6 +21,10 @@ RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=(
+   "${FILESDIR}"/${PN}-1.4.17-gcc11-missing-include.patch
+)
+
 multilib_src_configure() {
local myconf=""