summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikle Kolyada <zlogene@gentoo.org>2021-04-30 20:09:44 +0300
committerMikle Kolyada <zlogene@gentoo.org>2021-04-30 20:10:33 +0300
commit316ec2ace34362773c4b37295a79b517aeea0822 (patch)
tree4ccde5ef4750bc78800541b7c3e06c882ca2ed6c
parentapp-arch/unshield: remove libressl support (diff)
downloadgentoo-316ec2ac.tar.gz
gentoo-316ec2ac.tar.bz2
gentoo-316ec2ac.zip
app-arch/xar: remove libressl support
Package-Manager: Portage-3.0.18, Repoman-3.0.2 Signed-off-by: Mikle Kolyada <zlogene@gentoo.org>
-rw-r--r--app-arch/xar/xar-1.8-r2.ebuild5
-rw-r--r--app-arch/xar/xar-1.8-r3.ebuild5
-rw-r--r--app-arch/xar/xar-1.8-r4.ebuild6
3 files changed, 6 insertions, 10 deletions
diff --git a/app-arch/xar/xar-1.8-r2.ebuild b/app-arch/xar/xar-1.8-r2.ebuild
index 3f30d62f1a98..6fb089e9d2eb 100644
--- a/app-arch/xar/xar-1.8-r2.ebuild
+++ b/app-arch/xar/xar-1.8-r2.ebuild
@@ -12,13 +12,12 @@ SRC_URI="https://opensource.apple.com/tarballs/xar/xar-${APPLE_PV}.tar.gz"
LICENSE="BSD-2"
SLOT="0"
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="libressl kernel_Darwin"
+IUSE="kernel_Darwin"
RDEPEND="
!kernel_Darwin? (
!kernel_SunOS? ( virtual/acl )
- !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
- libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+ dev-libs/openssl:0=[${MULTILIB_USEDEP}]
)
app-arch/bzip2[${MULTILIB_USEDEP}]
sys-libs/zlib[${MULTILIB_USEDEP}]
diff --git a/app-arch/xar/xar-1.8-r3.ebuild b/app-arch/xar/xar-1.8-r3.ebuild
index d3b4fc4be1a4..c7375f6ef613 100644
--- a/app-arch/xar/xar-1.8-r3.ebuild
+++ b/app-arch/xar/xar-1.8-r3.ebuild
@@ -12,13 +12,12 @@ SRC_URI="https://opensource.apple.com/tarballs/xar/xar-${APPLE_PV}.tar.gz"
LICENSE="BSD-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="libressl kernel_Darwin"
+IUSE="kernel_Darwin"
RDEPEND="
!kernel_Darwin? (
!kernel_SunOS? ( virtual/acl )
- !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
- libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+ dev-libs/openssl:0=[${MULTILIB_USEDEP}]
)
app-arch/bzip2[${MULTILIB_USEDEP}]
sys-libs/zlib[${MULTILIB_USEDEP}]
diff --git a/app-arch/xar/xar-1.8-r4.ebuild b/app-arch/xar/xar-1.8-r4.ebuild
index d73ec3eae709..bd2ed21471e2 100644
--- a/app-arch/xar/xar-1.8-r4.ebuild
+++ b/app-arch/xar/xar-1.8-r4.ebuild
@@ -12,13 +12,11 @@ SRC_URI="https://opensource.apple.com/tarballs/xar/xar-${APPLE_PV}.tar.gz"
LICENSE="BSD-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="libressl"
DEPEND="
elibc_musl? ( sys-libs/fts-standalone )
kernel_linux? ( virtual/acl )
- !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
- libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+ dev-libs/openssl:0=[${MULTILIB_USEDEP}]
app-arch/bzip2[${MULTILIB_USEDEP}]
sys-libs/zlib[${MULTILIB_USEDEP}]
dev-libs/libxml2[${MULTILIB_USEDEP}]
@@ -54,7 +52,7 @@ src_prepare() {
# drop Darwin specific reliance on CommonCrypto Framework, for it
# depends on what version of Darwin we're on, and it is much simpler
- # to just use open/libressl instead, which we maintain and control
+ # to just use openessl instead, which we maintain and control
cd "${S}" || die
sed -i -e 's/__APPLE__/__NO_APPLE__/' \
include/archive.h \