From 862d6e352311abffefb66d102f2cd0be740ee34c Mon Sep 17 00:00:00 2001 From: Lars Wendler Date: Tue, 2 Mar 2021 13:10:51 +0100 Subject: [PATCH] Revert "net-fs/samba: pulls in icu only if spotlight" This reverts commit 52efcca88b5c4807885dc04014d58ccf7dd35ff2. Closes: https://bugs.gentoo.org/773970 Signed-off-by: Lars Wendler --- net-fs/samba/samba-4.12.11.ebuild | 2 +- net-fs/samba/samba-4.12.9-r1.ebuild | 2 +- net-fs/samba/samba-4.13.3-r1.ebuild | 2 +- net-fs/samba/samba-4.13.4.ebuild | 2 +- net-fs/samba/samba-4.14.0_rc4.ebuild | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/net-fs/samba/samba-4.12.11.ebuild b/net-fs/samba/samba-4.12.11.ebuild index f9bb1d6f5ea3c..4c218a5d0893b 100644 --- a/net-fs/samba/samba-4.12.11.ebuild +++ b/net-fs/samba/samba-4.12.11.ebuild @@ -42,7 +42,7 @@ MULTILIB_WRAPPED_HEADERS=( CDEPEND=" >=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}] dev-lang/perl:= - spotlight? ( dev-libs/icu:=[${MULTILIB_USEDEP}] ) + dev-libs/icu:=[${MULTILIB_USEDEP}] dev-libs/libbsd[${MULTILIB_USEDEP}] dev-libs/libtasn1[${MULTILIB_USEDEP}] dev-libs/popt[${MULTILIB_USEDEP}] diff --git a/net-fs/samba/samba-4.12.9-r1.ebuild b/net-fs/samba/samba-4.12.9-r1.ebuild index 98d3c2b94cc32..84df21f0f4981 100644 --- a/net-fs/samba/samba-4.12.9-r1.ebuild +++ b/net-fs/samba/samba-4.12.9-r1.ebuild @@ -42,7 +42,7 @@ MULTILIB_WRAPPED_HEADERS=( CDEPEND=" >=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}] dev-lang/perl:= - spotlight? ( dev-libs/icu:=[${MULTILIB_USEDEP}] ) + dev-libs/icu:=[${MULTILIB_USEDEP}] dev-libs/libbsd[${MULTILIB_USEDEP}] dev-libs/libtasn1[${MULTILIB_USEDEP}] dev-libs/popt[${MULTILIB_USEDEP}] diff --git a/net-fs/samba/samba-4.13.3-r1.ebuild b/net-fs/samba/samba-4.13.3-r1.ebuild index f40f5a08d6929..315792bf5681a 100644 --- a/net-fs/samba/samba-4.13.3-r1.ebuild +++ b/net-fs/samba/samba-4.13.3-r1.ebuild @@ -60,7 +60,7 @@ MULTILIB_WRAPPED_HEADERS=( COMMON_DEPEND=" >=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}] dev-lang/perl:= - spotlight? ( dev-libs/icu:=[${MULTILIB_USEDEP}] ) + dev-libs/icu:=[${MULTILIB_USEDEP}] dev-libs/libbsd[${MULTILIB_USEDEP}] dev-libs/libtasn1[${MULTILIB_USEDEP}] dev-libs/popt[${MULTILIB_USEDEP}] diff --git a/net-fs/samba/samba-4.13.4.ebuild b/net-fs/samba/samba-4.13.4.ebuild index f40f5a08d6929..315792bf5681a 100644 --- a/net-fs/samba/samba-4.13.4.ebuild +++ b/net-fs/samba/samba-4.13.4.ebuild @@ -60,7 +60,7 @@ MULTILIB_WRAPPED_HEADERS=( COMMON_DEPEND=" >=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}] dev-lang/perl:= - spotlight? ( dev-libs/icu:=[${MULTILIB_USEDEP}] ) + dev-libs/icu:=[${MULTILIB_USEDEP}] dev-libs/libbsd[${MULTILIB_USEDEP}] dev-libs/libtasn1[${MULTILIB_USEDEP}] dev-libs/popt[${MULTILIB_USEDEP}] diff --git a/net-fs/samba/samba-4.14.0_rc4.ebuild b/net-fs/samba/samba-4.14.0_rc4.ebuild index 7e9750b9d9eaa..197b80e679732 100644 --- a/net-fs/samba/samba-4.14.0_rc4.ebuild +++ b/net-fs/samba/samba-4.14.0_rc4.ebuild @@ -60,7 +60,7 @@ MULTILIB_WRAPPED_HEADERS=( COMMON_DEPEND=" >=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}] dev-lang/perl:= - spotlight? ( dev-libs/icu:=[${MULTILIB_USEDEP}] ) + dev-libs/icu:=[${MULTILIB_USEDEP}] dev-libs/libbsd[${MULTILIB_USEDEP}] dev-libs/libtasn1[${MULTILIB_USEDEP}] dev-libs/popt[${MULTILIB_USEDEP}]