From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1276680-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 9281F13835A
for <garchives@archives.gentoo.org>; Fri, 30 Apr 2021 17:32:33 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id B1DFEE0877;
Fri, 30 Apr 2021 17:32:32 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 8E287E0877
for <gentoo-commits@lists.gentoo.org>; Fri, 30 Apr 2021 17:32:32 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id D54CC335D06
for <gentoo-commits@lists.gentoo.org>; Fri, 30 Apr 2021 17:32:30 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 5E5F5736
for <gentoo-commits@lists.gentoo.org>; Fri, 30 Apr 2021 17:32:29 +0000 (UTC)
From: "Mikle Kolyada" <zlogene@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Mikle Kolyada" <zlogene@gentoo.org>
Message-ID: <1619803944.d96c852e80383965be441a23185bcfcf3e12e7ce.zlogene@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: app-backup/bacula/
X-VCS-Repository: repo/gentoo
X-VCS-Files: app-backup/bacula/bacula-9.6.5.ebuild app-backup/bacula/bacula-9.6.6.ebuild app-backup/bacula/bacula-9.6.7.ebuild
X-VCS-Directories: app-backup/bacula/
X-VCS-Committer: zlogene
X-VCS-Committer-Name: Mikle Kolyada
X-VCS-Revision: d96c852e80383965be441a23185bcfcf3e12e7ce
X-VCS-Branch: master
Date: Fri, 30 Apr 2021 17:32:29 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 74529463-4402-46cb-8491-df6492caa201
X-Archives-Hash: 9be4a009d42c4ca5d8820007befce3e7
commit: d96c852e80383965be441a23185bcfcf3e12e7ce
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 30 17:17:21 2021 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Fri Apr 30 17:32:24 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d96c852e
app-backup/bacula: remove libressl support
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
app-backup/bacula/bacula-9.6.5.ebuild | 16 +++-------------
app-backup/bacula/bacula-9.6.6.ebuild | 17 +++--------------
app-backup/bacula/bacula-9.6.7.ebuild | 17 +++--------------
3 files changed, 9 insertions(+), 41 deletions(-)
diff --git a/app-backup/bacula/bacula-9.6.5.ebuild b/app-backup/bacula/bacula-9.6.5.ebuild
index 13290a4abf9..46893c1da0e 100644
--- a/app-backup/bacula/bacula-9.6.5.ebuild
+++ b/app-backup/bacula/bacula-9.6.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz"
LICENSE="AGPL-3"
SLOT="0"
KEYWORDS="amd64 ppc ~sparc x86"
-IUSE="acl bacula-clientonly bacula-nodir bacula-nosd +batch-insert examples ipv6 libressl logwatch mysql postgres qt5 readline +sqlite ssl static tcpd vim-syntax X"
+IUSE="acl bacula-clientonly bacula-nodir bacula-nosd +batch-insert examples ipv6 logwatch mysql postgres qt5 readline +sqlite ssl static tcpd vim-syntax X"
DEPEND="
!bacula-clientonly? (
@@ -40,8 +40,7 @@ DEPEND="
sys-libs/zlib[static-libs]
acl? ( virtual/acl[static-libs(+)] )
ssl? (
- !libressl? ( dev-libs/openssl:0=[static-libs] )
- libressl? ( dev-libs/libressl:0=[static-libs] )
+ dev-libs/openssl:0=[static-libs]
)
)
!static? (
@@ -50,8 +49,7 @@ DEPEND="
sys-libs/zlib
acl? ( virtual/acl )
ssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
+ dev-libs/openssl:0=
)
)
tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
@@ -156,14 +154,6 @@ src_prepare() {
touch src/qt-console/.libs/bat || die
chmod 755 src/qt-console/.libs/bat || die
- # fix handling of libressl version
- # needs separate handling for <libressl-2.7 and >=libressl2.7
- # (see bug #655520)
- if has_version "<dev-libs/libressl-2.7"; then
- eapply -p0 "${FILESDIR}"/9.4.0/${PN}-9.4.0-libressl26.patch
- else
- eapply -p0 "${FILESDIR}"/9.4.0/${PN}-9.4.0-libressl27.patch
- fi
# Don't let program install man pages directly
sed -i -e 's/ manpages//' Makefile.in || die
diff --git a/app-backup/bacula/bacula-9.6.6.ebuild b/app-backup/bacula/bacula-9.6.6.ebuild
index aaffa58674b..d527ca5224e 100644
--- a/app-backup/bacula/bacula-9.6.6.ebuild
+++ b/app-backup/bacula/bacula-9.6.6.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz"
LICENSE="AGPL-3"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="acl bacula-clientonly bacula-nodir bacula-nosd +batch-insert examples ipv6 libressl logwatch mysql postgres qt5 readline +sqlite ssl static tcpd vim-syntax X"
+IUSE="acl bacula-clientonly bacula-nodir bacula-nosd +batch-insert examples ipv6 logwatch mysql postgres qt5 readline +sqlite ssl static tcpd vim-syntax X"
DEPEND="
!bacula-clientonly? (
@@ -40,8 +40,7 @@ DEPEND="
sys-libs/zlib[static-libs]
acl? ( virtual/acl[static-libs(+)] )
ssl? (
- !libressl? ( dev-libs/openssl:0=[static-libs] )
- libressl? ( dev-libs/libressl:0=[static-libs] )
+ dev-libs/openssl:0=[static-libs]
)
)
!static? (
@@ -50,8 +49,7 @@ DEPEND="
sys-libs/zlib
acl? ( virtual/acl )
ssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
+ dev-libs/openssl:0=
)
)
tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
@@ -156,15 +154,6 @@ src_prepare() {
touch src/qt-console/.libs/bat || die
chmod 755 src/qt-console/.libs/bat || die
- # fix handling of libressl version
- # needs separate handling for <libressl-2.7 and >=libressl2.7
- # (see bug #655520)
- if has_version "<dev-libs/libressl-2.7"; then
- eapply -p0 "${FILESDIR}"/9.4.0/${PN}-9.4.0-libressl26.patch
- else
- eapply -p0 "${FILESDIR}"/9.4.0/${PN}-9.4.0-libressl27.patch
- fi
-
# Don't let program install man pages directly
sed -i -e 's/ manpages//' Makefile.in || die
diff --git a/app-backup/bacula/bacula-9.6.7.ebuild b/app-backup/bacula/bacula-9.6.7.ebuild
index aaffa58674b..d527ca5224e 100644
--- a/app-backup/bacula/bacula-9.6.7.ebuild
+++ b/app-backup/bacula/bacula-9.6.7.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz"
LICENSE="AGPL-3"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="acl bacula-clientonly bacula-nodir bacula-nosd +batch-insert examples ipv6 libressl logwatch mysql postgres qt5 readline +sqlite ssl static tcpd vim-syntax X"
+IUSE="acl bacula-clientonly bacula-nodir bacula-nosd +batch-insert examples ipv6 logwatch mysql postgres qt5 readline +sqlite ssl static tcpd vim-syntax X"
DEPEND="
!bacula-clientonly? (
@@ -40,8 +40,7 @@ DEPEND="
sys-libs/zlib[static-libs]
acl? ( virtual/acl[static-libs(+)] )
ssl? (
- !libressl? ( dev-libs/openssl:0=[static-libs] )
- libressl? ( dev-libs/libressl:0=[static-libs] )
+ dev-libs/openssl:0=[static-libs]
)
)
!static? (
@@ -50,8 +49,7 @@ DEPEND="
sys-libs/zlib
acl? ( virtual/acl )
ssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
+ dev-libs/openssl:0=
)
)
tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
@@ -156,15 +154,6 @@ src_prepare() {
touch src/qt-console/.libs/bat || die
chmod 755 src/qt-console/.libs/bat || die
- # fix handling of libressl version
- # needs separate handling for <libressl-2.7 and >=libressl2.7
- # (see bug #655520)
- if has_version "<dev-libs/libressl-2.7"; then
- eapply -p0 "${FILESDIR}"/9.4.0/${PN}-9.4.0-libressl26.patch
- else
- eapply -p0 "${FILESDIR}"/9.4.0/${PN}-9.4.0-libressl27.patch
- fi
-
# Don't let program install man pages directly
sed -i -e 's/ manpages//' Makefile.in || die