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
