1 |
commit: d96c852e80383965be441a23185bcfcf3e12e7ce |
2 |
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Apr 30 17:17:21 2021 +0000 |
4 |
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Apr 30 17:32:24 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d96c852e |
7 |
|
8 |
app-backup/bacula: 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-backup/bacula/bacula-9.6.5.ebuild | 16 +++------------- |
14 |
app-backup/bacula/bacula-9.6.6.ebuild | 17 +++-------------- |
15 |
app-backup/bacula/bacula-9.6.7.ebuild | 17 +++-------------- |
16 |
3 files changed, 9 insertions(+), 41 deletions(-) |
17 |
|
18 |
diff --git a/app-backup/bacula/bacula-9.6.5.ebuild b/app-backup/bacula/bacula-9.6.5.ebuild |
19 |
index 13290a4abf9..46893c1da0e 100644 |
20 |
--- a/app-backup/bacula/bacula-9.6.5.ebuild |
21 |
+++ b/app-backup/bacula/bacula-9.6.5.ebuild |
22 |
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz" |
23 |
LICENSE="AGPL-3" |
24 |
SLOT="0" |
25 |
KEYWORDS="amd64 ppc ~sparc x86" |
26 |
-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" |
27 |
+IUSE="acl bacula-clientonly bacula-nodir bacula-nosd +batch-insert examples ipv6 logwatch mysql postgres qt5 readline +sqlite ssl static tcpd vim-syntax X" |
28 |
|
29 |
DEPEND=" |
30 |
!bacula-clientonly? ( |
31 |
@@ -40,8 +40,7 @@ DEPEND=" |
32 |
sys-libs/zlib[static-libs] |
33 |
acl? ( virtual/acl[static-libs(+)] ) |
34 |
ssl? ( |
35 |
- !libressl? ( dev-libs/openssl:0=[static-libs] ) |
36 |
- libressl? ( dev-libs/libressl:0=[static-libs] ) |
37 |
+ dev-libs/openssl:0=[static-libs] |
38 |
) |
39 |
) |
40 |
!static? ( |
41 |
@@ -50,8 +49,7 @@ DEPEND=" |
42 |
sys-libs/zlib |
43 |
acl? ( virtual/acl ) |
44 |
ssl? ( |
45 |
- !libressl? ( dev-libs/openssl:0= ) |
46 |
- libressl? ( dev-libs/libressl:0= ) |
47 |
+ dev-libs/openssl:0= |
48 |
) |
49 |
) |
50 |
tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) |
51 |
@@ -156,14 +154,6 @@ src_prepare() { |
52 |
touch src/qt-console/.libs/bat || die |
53 |
chmod 755 src/qt-console/.libs/bat || die |
54 |
|
55 |
- # fix handling of libressl version |
56 |
- # needs separate handling for <libressl-2.7 and >=libressl2.7 |
57 |
- # (see bug #655520) |
58 |
- if has_version "<dev-libs/libressl-2.7"; then |
59 |
- eapply -p0 "${FILESDIR}"/9.4.0/${PN}-9.4.0-libressl26.patch |
60 |
- else |
61 |
- eapply -p0 "${FILESDIR}"/9.4.0/${PN}-9.4.0-libressl27.patch |
62 |
- fi |
63 |
|
64 |
# Don't let program install man pages directly |
65 |
sed -i -e 's/ manpages//' Makefile.in || die |
66 |
|
67 |
diff --git a/app-backup/bacula/bacula-9.6.6.ebuild b/app-backup/bacula/bacula-9.6.6.ebuild |
68 |
index aaffa58674b..d527ca5224e 100644 |
69 |
--- a/app-backup/bacula/bacula-9.6.6.ebuild |
70 |
+++ b/app-backup/bacula/bacula-9.6.6.ebuild |
71 |
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz" |
72 |
LICENSE="AGPL-3" |
73 |
SLOT="0" |
74 |
KEYWORDS="~amd64 ~ppc ~sparc ~x86" |
75 |
-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" |
76 |
+IUSE="acl bacula-clientonly bacula-nodir bacula-nosd +batch-insert examples ipv6 logwatch mysql postgres qt5 readline +sqlite ssl static tcpd vim-syntax X" |
77 |
|
78 |
DEPEND=" |
79 |
!bacula-clientonly? ( |
80 |
@@ -40,8 +40,7 @@ DEPEND=" |
81 |
sys-libs/zlib[static-libs] |
82 |
acl? ( virtual/acl[static-libs(+)] ) |
83 |
ssl? ( |
84 |
- !libressl? ( dev-libs/openssl:0=[static-libs] ) |
85 |
- libressl? ( dev-libs/libressl:0=[static-libs] ) |
86 |
+ dev-libs/openssl:0=[static-libs] |
87 |
) |
88 |
) |
89 |
!static? ( |
90 |
@@ -50,8 +49,7 @@ DEPEND=" |
91 |
sys-libs/zlib |
92 |
acl? ( virtual/acl ) |
93 |
ssl? ( |
94 |
- !libressl? ( dev-libs/openssl:0= ) |
95 |
- libressl? ( dev-libs/libressl:0= ) |
96 |
+ dev-libs/openssl:0= |
97 |
) |
98 |
) |
99 |
tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) |
100 |
@@ -156,15 +154,6 @@ src_prepare() { |
101 |
touch src/qt-console/.libs/bat || die |
102 |
chmod 755 src/qt-console/.libs/bat || die |
103 |
|
104 |
- # fix handling of libressl version |
105 |
- # needs separate handling for <libressl-2.7 and >=libressl2.7 |
106 |
- # (see bug #655520) |
107 |
- if has_version "<dev-libs/libressl-2.7"; then |
108 |
- eapply -p0 "${FILESDIR}"/9.4.0/${PN}-9.4.0-libressl26.patch |
109 |
- else |
110 |
- eapply -p0 "${FILESDIR}"/9.4.0/${PN}-9.4.0-libressl27.patch |
111 |
- fi |
112 |
- |
113 |
# Don't let program install man pages directly |
114 |
sed -i -e 's/ manpages//' Makefile.in || die |
115 |
|
116 |
|
117 |
diff --git a/app-backup/bacula/bacula-9.6.7.ebuild b/app-backup/bacula/bacula-9.6.7.ebuild |
118 |
index aaffa58674b..d527ca5224e 100644 |
119 |
--- a/app-backup/bacula/bacula-9.6.7.ebuild |
120 |
+++ b/app-backup/bacula/bacula-9.6.7.ebuild |
121 |
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz" |
122 |
LICENSE="AGPL-3" |
123 |
SLOT="0" |
124 |
KEYWORDS="~amd64 ~ppc ~sparc ~x86" |
125 |
-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" |
126 |
+IUSE="acl bacula-clientonly bacula-nodir bacula-nosd +batch-insert examples ipv6 logwatch mysql postgres qt5 readline +sqlite ssl static tcpd vim-syntax X" |
127 |
|
128 |
DEPEND=" |
129 |
!bacula-clientonly? ( |
130 |
@@ -40,8 +40,7 @@ DEPEND=" |
131 |
sys-libs/zlib[static-libs] |
132 |
acl? ( virtual/acl[static-libs(+)] ) |
133 |
ssl? ( |
134 |
- !libressl? ( dev-libs/openssl:0=[static-libs] ) |
135 |
- libressl? ( dev-libs/libressl:0=[static-libs] ) |
136 |
+ dev-libs/openssl:0=[static-libs] |
137 |
) |
138 |
) |
139 |
!static? ( |
140 |
@@ -50,8 +49,7 @@ DEPEND=" |
141 |
sys-libs/zlib |
142 |
acl? ( virtual/acl ) |
143 |
ssl? ( |
144 |
- !libressl? ( dev-libs/openssl:0= ) |
145 |
- libressl? ( dev-libs/libressl:0= ) |
146 |
+ dev-libs/openssl:0= |
147 |
) |
148 |
) |
149 |
tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) |
150 |
@@ -156,15 +154,6 @@ src_prepare() { |
151 |
touch src/qt-console/.libs/bat || die |
152 |
chmod 755 src/qt-console/.libs/bat || die |
153 |
|
154 |
- # fix handling of libressl version |
155 |
- # needs separate handling for <libressl-2.7 and >=libressl2.7 |
156 |
- # (see bug #655520) |
157 |
- if has_version "<dev-libs/libressl-2.7"; then |
158 |
- eapply -p0 "${FILESDIR}"/9.4.0/${PN}-9.4.0-libressl26.patch |
159 |
- else |
160 |
- eapply -p0 "${FILESDIR}"/9.4.0/${PN}-9.4.0-libressl27.patch |
161 |
- fi |
162 |
- |
163 |
# Don't let program install man pages directly |
164 |
sed -i -e 's/ manpages//' Makefile.in || die |