| 1 |
commit: 316ec2ace34362773c4b37295a79b517aeea0822 |
| 2 |
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Apr 30 17:09:44 2021 +0000 |
| 4 |
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Apr 30 17:10:33 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=316ec2ac |
| 7 |
|
| 8 |
app-arch/xar: remove libressl support |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.18, Repoman-3.0.2 |
| 11 |
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org> |
| 12 |
|
| 13 |
app-arch/xar/xar-1.8-r2.ebuild | 5 ++--- |
| 14 |
app-arch/xar/xar-1.8-r3.ebuild | 5 ++--- |
| 15 |
app-arch/xar/xar-1.8-r4.ebuild | 6 ++---- |
| 16 |
3 files changed, 6 insertions(+), 10 deletions(-) |
| 17 |
|
| 18 |
diff --git a/app-arch/xar/xar-1.8-r2.ebuild b/app-arch/xar/xar-1.8-r2.ebuild |
| 19 |
index 3f30d62f1a9..6fb089e9d2e 100644 |
| 20 |
--- a/app-arch/xar/xar-1.8-r2.ebuild |
| 21 |
+++ b/app-arch/xar/xar-1.8-r2.ebuild |
| 22 |
@@ -12,13 +12,12 @@ SRC_URI="https://opensource.apple.com/tarballs/xar/xar-${APPLE_PV}.tar.gz" |
| 23 |
LICENSE="BSD-2" |
| 24 |
SLOT="0" |
| 25 |
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" |
| 26 |
-IUSE="libressl kernel_Darwin" |
| 27 |
+IUSE="kernel_Darwin" |
| 28 |
|
| 29 |
RDEPEND=" |
| 30 |
!kernel_Darwin? ( |
| 31 |
!kernel_SunOS? ( virtual/acl ) |
| 32 |
- !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) |
| 33 |
- libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] ) |
| 34 |
+ dev-libs/openssl:0=[${MULTILIB_USEDEP}] |
| 35 |
) |
| 36 |
app-arch/bzip2[${MULTILIB_USEDEP}] |
| 37 |
sys-libs/zlib[${MULTILIB_USEDEP}] |
| 38 |
|
| 39 |
diff --git a/app-arch/xar/xar-1.8-r3.ebuild b/app-arch/xar/xar-1.8-r3.ebuild |
| 40 |
index d3b4fc4be1a..c7375f6ef61 100644 |
| 41 |
--- a/app-arch/xar/xar-1.8-r3.ebuild |
| 42 |
+++ b/app-arch/xar/xar-1.8-r3.ebuild |
| 43 |
@@ -12,13 +12,12 @@ SRC_URI="https://opensource.apple.com/tarballs/xar/xar-${APPLE_PV}.tar.gz" |
| 44 |
LICENSE="BSD-2" |
| 45 |
SLOT="0" |
| 46 |
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" |
| 47 |
-IUSE="libressl kernel_Darwin" |
| 48 |
+IUSE="kernel_Darwin" |
| 49 |
|
| 50 |
RDEPEND=" |
| 51 |
!kernel_Darwin? ( |
| 52 |
!kernel_SunOS? ( virtual/acl ) |
| 53 |
- !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) |
| 54 |
- libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] ) |
| 55 |
+ dev-libs/openssl:0=[${MULTILIB_USEDEP}] |
| 56 |
) |
| 57 |
app-arch/bzip2[${MULTILIB_USEDEP}] |
| 58 |
sys-libs/zlib[${MULTILIB_USEDEP}] |
| 59 |
|
| 60 |
diff --git a/app-arch/xar/xar-1.8-r4.ebuild b/app-arch/xar/xar-1.8-r4.ebuild |
| 61 |
index d73ec3eae70..bd2ed21471e 100644 |
| 62 |
--- a/app-arch/xar/xar-1.8-r4.ebuild |
| 63 |
+++ b/app-arch/xar/xar-1.8-r4.ebuild |
| 64 |
@@ -12,13 +12,11 @@ SRC_URI="https://opensource.apple.com/tarballs/xar/xar-${APPLE_PV}.tar.gz" |
| 65 |
LICENSE="BSD-2" |
| 66 |
SLOT="0" |
| 67 |
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" |
| 68 |
-IUSE="libressl" |
| 69 |
|
| 70 |
DEPEND=" |
| 71 |
elibc_musl? ( sys-libs/fts-standalone ) |
| 72 |
kernel_linux? ( virtual/acl ) |
| 73 |
- !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) |
| 74 |
- libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] ) |
| 75 |
+ dev-libs/openssl:0=[${MULTILIB_USEDEP}] |
| 76 |
app-arch/bzip2[${MULTILIB_USEDEP}] |
| 77 |
sys-libs/zlib[${MULTILIB_USEDEP}] |
| 78 |
dev-libs/libxml2[${MULTILIB_USEDEP}] |
| 79 |
@@ -54,7 +52,7 @@ src_prepare() { |
| 80 |
|
| 81 |
# drop Darwin specific reliance on CommonCrypto Framework, for it |
| 82 |
# depends on what version of Darwin we're on, and it is much simpler |
| 83 |
- # to just use open/libressl instead, which we maintain and control |
| 84 |
+ # to just use openessl instead, which we maintain and control |
| 85 |
cd "${S}" || die |
| 86 |
sed -i -e 's/__APPLE__/__NO_APPLE__/' \ |
| 87 |
include/archive.h \ |
Archives