commit:     8b0d01d8b79eb1e80c0418ac5c1e77d0f94a6829
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 10 14:38:06 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jul 10 15:11:34 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b0d01d8

dev-libs/xapian: add missing multilib deps (util-linux, zlib)

- Missing util-linux entirely (for libuuid)
- Missing zlib multilib dependency

Closes: https://bugs.gentoo.org/611252
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-libs/xapian/{xapian-1.2.25.ebuild => xapian-1.2.25-r1.ebuild} | 3 ++-
 dev-libs/xapian/{xapian-1.4.17.ebuild => xapian-1.4.17-r1.ebuild} | 3 ++-
 dev-libs/xapian/{xapian-1.4.18.ebuild => xapian-1.4.18-r1.ebuild} | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/dev-libs/xapian/xapian-1.2.25.ebuild 
b/dev-libs/xapian/xapian-1.2.25-r1.ebuild
similarity index 95%
rename from dev-libs/xapian/xapian-1.2.25.ebuild
rename to dev-libs/xapian/xapian-1.2.25-r1.ebuild
index c756a3c880b..8dc1dcb06fb 100644
--- a/dev-libs/xapian/xapian-1.2.25.ebuild
+++ b/dev-libs/xapian/xapian-1.2.25-r1.ebuild
@@ -16,7 +16,8 @@ SLOT="0/1.2.22" # ABI version of libxapian.so, prefixed with 
1.2.
 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 +brass +chert 
+inmemory"
 
-DEPEND="sys-libs/zlib"
+DEPEND="sys-apps/util-linux[${MULTILIB_USEDEP}]
+       sys-libs/zlib[${MULTILIB_USEDEP}]"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}"

diff --git a/dev-libs/xapian/xapian-1.4.17.ebuild 
b/dev-libs/xapian/xapian-1.4.17-r1.ebuild
similarity index 95%
rename from dev-libs/xapian/xapian-1.4.17.ebuild
rename to dev-libs/xapian/xapian-1.4.17-r1.ebuild
index 28d37a14393..25d39cf439b 100644
--- a/dev-libs/xapian/xapian-1.4.17.ebuild
+++ b/dev-libs/xapian/xapian-1.4.17-r1.ebuild
@@ -16,7 +16,8 @@ SLOT="0/30" # ABI version of libxapian.so
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~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-libs/zlib"
+DEPEND="sys-apps/util-linux[${MULTILIB_USEDEP}]
+       sys-libs/zlib[${MULTILIB_USEDEP}]"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}"

diff --git a/dev-libs/xapian/xapian-1.4.18.ebuild 
b/dev-libs/xapian/xapian-1.4.18-r1.ebuild
similarity index 95%
rename from dev-libs/xapian/xapian-1.4.18.ebuild
rename to dev-libs/xapian/xapian-1.4.18-r1.ebuild
index e92a0c0daef..8d6ddbd3218 100644
--- a/dev-libs/xapian/xapian-1.4.18.ebuild
+++ b/dev-libs/xapian/xapian-1.4.18-r1.ebuild
@@ -16,7 +16,8 @@ SLOT="0/30" # ABI version of libxapian.so
 KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~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-libs/zlib"
+DEPEND="sys-apps/util-linux[${MULTILIB_USEDEP}]
+       sys-libs/zlib[${MULTILIB_USEDEP}]"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}"

Reply via email to