| 1 |
commit: bc1da911fe2d0180be333cf083790605b5788b0c |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Mar 28 10:02:46 2022 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Mar 28 10:02:46 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc1da911 |
| 7 |
|
| 8 |
mail-client/mutt-2.2.2: version bump |
| 9 |
|
| 10 |
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> |
| 11 |
|
| 12 |
mail-client/mutt/Manifest | 6 +- |
| 13 |
mail-client/mutt/mutt-2.1.5.ebuild | 261 --------------------- |
| 14 |
.../mutt/{mutt-2.1.4.ebuild => mutt-2.2.2.ebuild} | 19 +- |
| 15 |
3 files changed, 15 insertions(+), 271 deletions(-) |
| 16 |
|
| 17 |
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest |
| 18 |
index d9552f325e8c..715b4bedd19f 100644 |
| 19 |
--- a/mail-client/mutt/Manifest |
| 20 |
+++ b/mail-client/mutt/Manifest |
| 21 |
@@ -1,8 +1,6 @@ |
| 22 |
DIST mutt-2.0.7.tar.gz 5299366 BLAKE2B 587679d3580a55084312b4bd26083c85fb1b3d07b4a08ea5e2081f475d37a0e283ecfd647555519fc6deccb4bdfdd46234ede4669a9abc6fc2cde778f76bf656 SHA512 1eb689fb9e6aa3cf0bcd0b696c25477cd04b74d8ec93404df071de6dc051e46bbad88131cdf610eb01df4789984707f3791366ae2fda28de2d2739aeb9d34e30 |
| 23 |
-DIST mutt-2.1.4.tar.gz 5407563 BLAKE2B 3ae0cdfb59afdfa8ba930fb11a4acb195783be7b47cd100ecb11a99e448ff72ae0fd96503fcfec15d55f041e32010e1596f654b75482ca4741c07cd0f883dd57 SHA512 621240fdecb65ed2d63d6a4cbe134c4ec40486cb4aa3a02649ff822a87c01732e513f403380dc9c7d3840220dde55a6fb13bb9c05b511b9b33965f599ffb2798 |
| 24 |
-DIST mutt-2.1.5.tar.gz 5414049 BLAKE2B 00be360c51f03d80ac1a83554ee92873804ddeb0f3ac34cd1da1e98286384937de3182959457560d9c506f9c813f3a1f679ab8507bef7c323f993d0ad4596b81 SHA512 8daf534ef6b8f97bdbbc1bccb64dad51de6fe0fbdb41d3d5cbe418fe234000dc09ea2b790d2529c205f16b89c6963b6de98eaa2fdc6e3f5b55a3cb5f7962e0d5 |
| 25 |
DIST mutt-2.2.1.tar.gz 5503979 BLAKE2B 304dee7e24dcff896e1a12b0eb0f6bb4ccd58067249fd5090f53d0e55dd401f16b037e7519b07e465ccba6c177113ab1f00e1e3983d0f3345be392bccbe2f43b SHA512 2dd29a095698b7bb98dd5631a507ac1eb655d5db22d0e2506dea5d91663483aefb722e99ba8ad53f4e776189163d5339bba03ec41182c13aa9d665ba321f0941 |
| 26 |
+DIST mutt-2.2.2.tar.gz 5507066 BLAKE2B dd23e2e75b1656ac0351d10df266432820dd32acd44310e586f8c5deec187648e61c7b9e880bcbbaa09a9d6e8bd67b205f43284a729ae6ff95adb4e2bc15724a SHA512 da236c535a4dd18ed92f4b226a009711098c87cc28bbcf3abcd5f31f3ac074abe830f4f7c98cc8cda738a7a6d9421a088915094b33e53e32e9649ccccefe3481 |
| 27 |
DIST mutt-gentoo-2.0.7-patches-r0.tar.xz 26416 BLAKE2B dd03fd2a29f4c2e8681c4413ca430b65beb2036b73fa95430f5f06e7c2948fb4e3256be89d922646731245672cb2900d6b7ce6bda16cb9306d5531064cfaf8a1 SHA512 cb72df8f6fa3436f134f66772f82ba95ebc92462cf145d21e01ad5b277f13294948c1d03c9c6671e58c655776a6112f2af065df79a56a135ab70c28b37e43334 |
| 28 |
-DIST mutt-gentoo-2.1.4-patches-r0.tar.xz 25840 BLAKE2B 9507c2fdc0297965cca11ea7ae2317daaf5ac24cba8f4477da562c2a1c6ccf50242137efbabd8037c9442a34652df318ea58eb126e14bfbd04d21384d72df248 SHA512 51b9d670321a868fbee33cc36921a8e2ba5fb428e741d1dbf8e6f52123bce44dfcd001897277f660f4ebdc1c51af968757bca6de5b2fb12818a9f5f964a5aecb |
| 29 |
-DIST mutt-gentoo-2.1.5-patches-r0.tar.xz 25832 BLAKE2B 38aaeed745fe2162e6578bb56e897e462f5ea39d5b0497d2f94759945f7f8c1a2db1c92578ccf677daad025868b6bb3565f691f382e7876eea6f6cc041ea79ac SHA512 732e66fc8118b972d878c6d42e95d5cfdb72374f21119033d74d1122dc77e24977408f828a1d5f29f5524027599558892d257fb3830ddf4f094a8102b0ac6c84 |
| 30 |
DIST mutt-gentoo-2.2.1-patches-r0.tar.xz 23164 BLAKE2B 755a5904fd68a577c96d78a311b5cd0713df4fa884c18c14ca4c88c48b56997a6372af32391201843e7aa8a7cb9cd7002105f217f42c9dec46073e2fe3ccf1bc SHA512 5d022aa2a2ee83f394c52957ad958ba8739fa9395d8ea7c96c1f1138b9df4413ff9e3209e36741666549232e5595cae77bf04ce180e34fac34594a2886084e6d |
| 31 |
+DIST mutt-gentoo-2.2.2-patches-r0.tar.xz 23160 BLAKE2B 2bc09d2aa67102b382c2466773868ba32f38827e44efc7ee2461fa592607a926547013f6c232ac2d6d0cd7dc07da386a0995c7819273b4c96c28a1a6140248a4 SHA512 3b45957d92a9d3f2c185965d226c137dcbb11eb58e497a4dc5ab49041eba79c7436b8239ceb625e32ef0453b7909d925a6238ec75dfa3f267eea46e86474758a |
| 32 |
|
| 33 |
diff --git a/mail-client/mutt/mutt-2.1.5.ebuild b/mail-client/mutt/mutt-2.1.5.ebuild |
| 34 |
deleted file mode 100644 |
| 35 |
index 28cffe8c94b4..000000000000 |
| 36 |
--- a/mail-client/mutt/mutt-2.1.5.ebuild |
| 37 |
+++ /dev/null |
| 38 |
@@ -1,261 +0,0 @@ |
| 39 |
-# Copyright 1999-2021 Gentoo Authors |
| 40 |
-# Distributed under the terms of the GNU General Public License v2 |
| 41 |
- |
| 42 |
-EAPI="7" |
| 43 |
- |
| 44 |
-inherit flag-o-matic autotools |
| 45 |
- |
| 46 |
-PATCHREV="r0" |
| 47 |
-PATCHSET="gentoo-${PVR}/${PATCHREV}" |
| 48 |
- |
| 49 |
-DESCRIPTION="A small but very powerful text-based mail client" |
| 50 |
-HOMEPAGE="http://www.mutt.org/" |
| 51 |
-MUTT_G_PATCHES="mutt-gentoo-${PV}-patches-${PATCHREV}.tar.xz" |
| 52 |
-SRC_URI="ftp://ftp.mutt.org/pub/mutt/${P}.tar.gz |
| 53 |
- https://bitbucket.org/${PN}/${PN}/downloads/${P}.tar.gz |
| 54 |
- https://dev.gentoo.org/~grobian/distfiles/${MUTT_G_PATCHES}" |
| 55 |
-IUSE="autocrypt berkdb debug doc gdbm gnutls gpgme +hcache idn +imap kerberos +lmdb mbox nls pgp-classic pop qdbm +sasl selinux slang smime-classic +smtp +ssl tokyocabinet vanilla prefix" |
| 56 |
-# hcache: allow multiple, bug #607360 |
| 57 |
-REQUIRED_USE=" |
| 58 |
- hcache? ( || ( berkdb gdbm lmdb qdbm tokyocabinet ) ) |
| 59 |
- imap? ( ssl ) |
| 60 |
- pop? ( ssl ) |
| 61 |
- smime-classic? ( ssl !gnutls ) |
| 62 |
- smtp? ( ssl sasl ) |
| 63 |
- sasl? ( || ( imap pop smtp ) ) |
| 64 |
- kerberos? ( || ( imap pop smtp ) ) |
| 65 |
- autocrypt? ( gpgme )" |
| 66 |
-SLOT="0" |
| 67 |
-LICENSE="GPL-2" |
| 68 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
| 69 |
-# yes, we overdepend on the backend impls here, hopefully one day we can |
| 70 |
-# have REQUIRED_USE do what it is made for again. bug #607360 |
| 71 |
-CDEPEND=" |
| 72 |
- app-misc/mime-types |
| 73 |
- virtual/libiconv |
| 74 |
- |
| 75 |
- berkdb? ( >=sys-libs/db-4:= ) |
| 76 |
- gdbm? ( sys-libs/gdbm ) |
| 77 |
- lmdb? ( dev-db/lmdb:= ) |
| 78 |
- qdbm? ( dev-db/qdbm ) |
| 79 |
- tokyocabinet? ( dev-db/tokyocabinet ) |
| 80 |
- |
| 81 |
- ssl? ( |
| 82 |
- gnutls? ( >=net-libs/gnutls-1.0.17:= ) |
| 83 |
- !gnutls? ( >=dev-libs/openssl-0.9.6:0= ) |
| 84 |
- ) |
| 85 |
- |
| 86 |
- nls? ( virtual/libintl ) |
| 87 |
- sasl? ( >=dev-libs/cyrus-sasl-2 ) |
| 88 |
- kerberos? ( virtual/krb5 ) |
| 89 |
- idn? ( net-dns/libidn2 ) |
| 90 |
- gpgme? ( >=app-crypt/gpgme-0.9.0:= ) |
| 91 |
- autocrypt? ( >=dev-db/sqlite-3 ) |
| 92 |
- slang? ( sys-libs/slang ) |
| 93 |
- !slang? ( >=sys-libs/ncurses-5.2:0= ) |
| 94 |
-" |
| 95 |
-DEPEND="${CDEPEND} |
| 96 |
- net-mail/mailbase |
| 97 |
- doc? ( |
| 98 |
- dev-libs/libxml2 |
| 99 |
- dev-libs/libxslt |
| 100 |
- app-text/docbook-xsl-stylesheets |
| 101 |
- || ( www-client/lynx www-client/w3m www-client/elinks ) |
| 102 |
- )" |
| 103 |
-RDEPEND="${CDEPEND} |
| 104 |
- selinux? ( sec-policy/selinux-mutt ) |
| 105 |
- smime-classic? ( >=dev-libs/openssl-0.9.6:0 ) |
| 106 |
- pgp-classic? ( app-crypt/gnupg ) |
| 107 |
-" |
| 108 |
- |
| 109 |
-src_prepare() { |
| 110 |
- local PATCHDIR="${WORKDIR}"/mutt-gentoo-${PV}-patches-${PATCHREV} |
| 111 |
- |
| 112 |
- if use !vanilla ; then |
| 113 |
- # apply patches |
| 114 |
- # http://hg.code.sf.net/p/gentoomuttpatches/code/file/mutt-1.10 |
| 115 |
- local patches=( |
| 116 |
- patches-mutt |
| 117 |
- bugs-gentoo |
| 118 |
- features-common |
| 119 |
- features-extra |
| 120 |
- gentoo |
| 121 |
- ) |
| 122 |
- local patchset p |
| 123 |
- for patchset in "${patches[@]}" ; do |
| 124 |
- [[ -d "${PATCHDIR}/${patchset}" ]] || continue |
| 125 |
- einfo "Patches for ${PATCHSET} patchset ${patchset}" |
| 126 |
- for p in "${PATCHDIR}/${patchset}"/*.patch ; do |
| 127 |
- eapply "${p}" || die |
| 128 |
- done |
| 129 |
- done |
| 130 |
- # add some explanation as to why not to go upstream |
| 131 |
- sed -i \ |
| 132 |
- -e '/ReachingUs = N_(/aThis release of Mutt is heavily enriched with patches.\\nFor this reason, any bugs are better reported at https://bugs.gentoo.org/\\nor re-emerge with USE=vanilla and try to reproduce your problem.\\n\\' \ |
| 133 |
- main.c || die "Failed to add bug instructions" |
| 134 |
- fi |
| 135 |
- |
| 136 |
- local upatches= |
| 137 |
- # allow user patches |
| 138 |
- eapply_user && upatches=" with user patches" |
| 139 |
- |
| 140 |
- # patch version string for bug reports |
| 141 |
- local patchset= |
| 142 |
- use vanilla || patchset=", ${PATCHSET}" |
| 143 |
- sed -i -e 's|"Mutt %s (%s)"|"Mutt %s (%s'"${patchset}${upatches}"')"|' \ |
| 144 |
- muttlib.c || die "failed patching in Gentoo version" |
| 145 |
- |
| 146 |
- # many patches touch the buildsystem, we always need this |
| 147 |
- AT_M4DIR="m4" eautoreconf |
| 148 |
- |
| 149 |
- # the configure script contains some "cleverness" whether or not to setgid |
| 150 |
- # the dotlock program, resulting in bugs like #278332 |
| 151 |
- sed -i -e 's/@DOTLOCK_GROUP@//' Makefile.in || die "sed failed" |
| 152 |
-} |
| 153 |
- |
| 154 |
-src_configure() { |
| 155 |
- local myconf=( |
| 156 |
- # signing and encryption |
| 157 |
- $(use_enable autocrypt) $(use_with autocrypt sqlite3) |
| 158 |
- $(use_enable pgp-classic pgp) |
| 159 |
- $(use_enable smime-classic smime) |
| 160 |
- $(use_enable gpgme) |
| 161 |
- |
| 162 |
- # features |
| 163 |
- $(use_enable debug) |
| 164 |
- $(use_enable doc) |
| 165 |
- $(use_enable nls) |
| 166 |
- |
| 167 |
- # protocols |
| 168 |
- $(use_enable imap) |
| 169 |
- $(use_enable pop) |
| 170 |
- $(use_enable smtp) |
| 171 |
- |
| 172 |
- $(use ssl && use gnutls && echo --with-gnutls --without-ssl) |
| 173 |
- $(use ssl && use !gnutls && echo --without-gnutls --with-ssl ) |
| 174 |
- $(use !ssl && echo --without-gnutls --without-ssl) |
| 175 |
- |
| 176 |
- $(use_with sasl) |
| 177 |
- $(use_with idn idn2) --without-idn # avoid automagic libidn dep |
| 178 |
- $(use_with kerberos gss) |
| 179 |
- "$(use slang && echo --with-slang="${EPREFIX}"/usr || echo a=b)" |
| 180 |
- "$(use_with !slang curses "${EPREFIX}"/usr)" |
| 181 |
- |
| 182 |
- "--enable-compressed" |
| 183 |
- "--enable-external-dotlock" |
| 184 |
- "--enable-iconv" |
| 185 |
- "--enable-nfs-fix" |
| 186 |
- "--enable-sidebar" |
| 187 |
- "--sysconfdir=${EPREFIX}/etc/${PN}" |
| 188 |
- "--with-docdir=${EPREFIX}/usr/share/doc/${PN}-${PVR}" |
| 189 |
- "--without-bundled-regex" # use the implementation from libc |
| 190 |
- "--with-exec-shell=${EPREFIX}/bin/sh" |
| 191 |
- ) |
| 192 |
- |
| 193 |
- if [[ ${CHOST} == *-solaris2.* && ${CHOST#*-solaris2.} -le 10 ]] ; then |
| 194 |
- # arrows in index view do not show when using wchar_t |
| 195 |
- # or misalign due to wrong computations |
| 196 |
- myconf+=( "--without-wc-funcs" ) |
| 197 |
- fi |
| 198 |
- |
| 199 |
- # note: REQUIRED_USE should have selected only one of these, but for |
| 200 |
- # bug #607360 we're forced to allow multiple. For that reason, this |
| 201 |
- # list is ordered to preference, and only the first is taken. |
| 202 |
- local hcaches=( |
| 203 |
- "lmdb" |
| 204 |
- "qdbm" |
| 205 |
- "tokyocabinet" |
| 206 |
- "gdbm" |
| 207 |
- "berkdb:bdb" |
| 208 |
- ) |
| 209 |
- local ucache hcache lcache |
| 210 |
- for hcache in "${hcaches[@]}" ; do |
| 211 |
- if use ${hcache%%:*} ; then |
| 212 |
- ucache=${hcache} |
| 213 |
- break |
| 214 |
- fi |
| 215 |
- done |
| 216 |
- if [[ -n ${ucache} ]] ; then |
| 217 |
- myconf+=( "--enable-hcache" ) |
| 218 |
- else |
| 219 |
- myconf+=( "--disable-hcache" ) |
| 220 |
- fi |
| 221 |
- for hcache in "${hcaches[@]}" ; do |
| 222 |
- [[ ${hcache} == ${ucache} ]] \ |
| 223 |
- && myconf+=( "--with-${hcache#*:}" ) \ |
| 224 |
- || myconf+=( "--without-${hcache#*:}" ) |
| 225 |
- done |
| 226 |
- |
| 227 |
- if use mbox; then |
| 228 |
- myconf+=( "--with-mailpath=${EPREFIX}/var/spool/mail" ) |
| 229 |
- else |
| 230 |
- myconf+=( "--with-homespool=Maildir" ) |
| 231 |
- fi |
| 232 |
- |
| 233 |
- econf "${myconf[@]}" |
| 234 |
-} |
| 235 |
- |
| 236 |
-src_install() { |
| 237 |
- emake DESTDIR="${D}" install |
| 238 |
- insinto /etc/${PN} |
| 239 |
- if use mbox; then |
| 240 |
- newins "${FILESDIR}"/Muttrc.mbox Muttrc |
| 241 |
- else |
| 242 |
- doins "${FILESDIR}"/Muttrc |
| 243 |
- fi |
| 244 |
- |
| 245 |
- # include attachment settings, it's mandatory and shouldn't harm |
| 246 |
- # when not being referenced (index_format using %X) |
| 247 |
- { |
| 248 |
- echo |
| 249 |
- echo "# mandatory attachments settings, not setting these is a BUG!" |
| 250 |
- echo "# see https://marc.info/?l=mutt-dev&m=158347284923517&w=2" |
| 251 |
- grep '^attachments' "${ED}"/etc/${PN}/Muttrc.dist |
| 252 |
- } >> "${ED}"/etc/${PN}/Muttrc |
| 253 |
- |
| 254 |
- # add setting to actually enable gpgme usage |
| 255 |
- if use gpgme || use autocrypt ; then |
| 256 |
- { |
| 257 |
- echo |
| 258 |
- echo "# this setting enables the gpgme backend (via USE=gpgme)" |
| 259 |
- # https is broken due to a certificate mismatch :( |
| 260 |
- echo "# see http://www.mutt.org/doc/manual/#crypt-use-gpgme" |
| 261 |
- echo "set crypt_use_gpgme = yes" |
| 262 |
- } >> "${ED}"/etc/${PN}/Muttrc |
| 263 |
- fi |
| 264 |
- |
| 265 |
- # similar for autocrypt |
| 266 |
- if use autocrypt ; then |
| 267 |
- { |
| 268 |
- echo |
| 269 |
- echo "# enables autocrypt (via USE=autocrypt)" |
| 270 |
- echo "# see http://www.mutt.org/doc/manual/#autocryptdoc" |
| 271 |
- echo "set autocrypt = yes" |
| 272 |
- } >> "${ED}"/etc/${PN}/Muttrc |
| 273 |
- fi |
| 274 |
- |
| 275 |
- # A newer file is provided by app-misc/mime-types. So we link it. |
| 276 |
- rm "${ED}"/etc/${PN}/mime.types |
| 277 |
- dosym ../mime.types /etc/${PN}/mime.types |
| 278 |
- |
| 279 |
- # nuke manpages that should be provided by an MTA, bug #177605 |
| 280 |
- rm "${ED}"/usr/share/man/man5/{mbox,mmdf}.5 \ |
| 281 |
- || ewarn "failed to remove files, please file a bug" |
| 282 |
- |
| 283 |
- if use !prefix ; then |
| 284 |
- fowners root:mail /usr/bin/mutt_dotlock |
| 285 |
- fperms g+s /usr/bin/mutt_dotlock |
| 286 |
- fi |
| 287 |
- |
| 288 |
- dodoc COPYRIGHT ChangeLog NEWS OPS* PATCHES README* TODO VERSION |
| 289 |
-} |
| 290 |
- |
| 291 |
-pkg_postinst() { |
| 292 |
- if [[ -z ${REPLACING_VERSIONS} ]] ; then |
| 293 |
- echo |
| 294 |
- elog "If you are new to mutt you may want to take a look at" |
| 295 |
- elog "the Gentoo QuickStart Guide to Mutt E-Mail:" |
| 296 |
- elog " https://wiki.gentoo.org/wiki/Mutt" |
| 297 |
- echo |
| 298 |
- fi |
| 299 |
-} |
| 300 |
|
| 301 |
diff --git a/mail-client/mutt/mutt-2.1.4.ebuild b/mail-client/mutt/mutt-2.2.2.ebuild |
| 302 |
similarity index 92% |
| 303 |
rename from mail-client/mutt/mutt-2.1.4.ebuild |
| 304 |
rename to mail-client/mutt/mutt-2.2.2.ebuild |
| 305 |
index 28cffe8c94b4..9217536891d9 100644 |
| 306 |
--- a/mail-client/mutt/mutt-2.1.4.ebuild |
| 307 |
+++ b/mail-client/mutt/mutt-2.2.2.ebuild |
| 308 |
@@ -1,4 +1,4 @@ |
| 309 |
-# Copyright 1999-2021 Gentoo Authors |
| 310 |
+# Copyright 1999-2022 Gentoo Authors |
| 311 |
# Distributed under the terms of the GNU General Public License v2 |
| 312 |
|
| 313 |
EAPI="7" |
| 314 |
@@ -14,9 +14,10 @@ MUTT_G_PATCHES="mutt-gentoo-${PV}-patches-${PATCHREV}.tar.xz" |
| 315 |
SRC_URI="ftp://ftp.mutt.org/pub/mutt/${P}.tar.gz |
| 316 |
https://bitbucket.org/${PN}/${PN}/downloads/${P}.tar.gz |
| 317 |
https://dev.gentoo.org/~grobian/distfiles/${MUTT_G_PATCHES}" |
| 318 |
-IUSE="autocrypt berkdb debug doc gdbm gnutls gpgme +hcache idn +imap kerberos +lmdb mbox nls pgp-classic pop qdbm +sasl selinux slang smime-classic +smtp +ssl tokyocabinet vanilla prefix" |
| 319 |
+IUSE="autocrypt berkdb debug doc gdbm gnutls gpgme gsasl +hcache idn +imap kerberos +lmdb mbox nls pgp-classic pop qdbm +sasl selinux slang smime-classic +smtp +ssl tokyocabinet vanilla prefix" |
| 320 |
# hcache: allow multiple, bug #607360 |
| 321 |
REQUIRED_USE=" |
| 322 |
+ gsasl? ( sasl ) |
| 323 |
hcache? ( || ( berkdb gdbm lmdb qdbm tokyocabinet ) ) |
| 324 |
imap? ( ssl ) |
| 325 |
pop? ( ssl ) |
| 326 |
@@ -42,11 +43,14 @@ CDEPEND=" |
| 327 |
|
| 328 |
ssl? ( |
| 329 |
gnutls? ( >=net-libs/gnutls-1.0.17:= ) |
| 330 |
- !gnutls? ( >=dev-libs/openssl-0.9.6:0= ) |
| 331 |
- ) |
| 332 |
+ !gnutls? ( >=dev-libs/openssl-0.9.6:0= ) |
| 333 |
+ ) |
| 334 |
|
| 335 |
nls? ( virtual/libintl ) |
| 336 |
- sasl? ( >=dev-libs/cyrus-sasl-2 ) |
| 337 |
+ sasl? ( |
| 338 |
+ gsasl? ( virtual/gsasl ) |
| 339 |
+ !gsasl? ( >=dev-libs/cyrus-sasl-2 ) |
| 340 |
+ ) |
| 341 |
kerberos? ( virtual/krb5 ) |
| 342 |
idn? ( net-dns/libidn2 ) |
| 343 |
gpgme? ( >=app-crypt/gpgme-0.9.0:= ) |
| 344 |
@@ -135,7 +139,10 @@ src_configure() { |
| 345 |
$(use ssl && use !gnutls && echo --without-gnutls --with-ssl ) |
| 346 |
$(use !ssl && echo --without-gnutls --without-ssl) |
| 347 |
|
| 348 |
- $(use_with sasl) |
| 349 |
+ $(use sasl && use gsasl && echo --with-gsasl --without-sasl) |
| 350 |
+ $(use sasl && use !gsasl && echo --without-gsasl --with-sasl ) |
| 351 |
+ $(use !sasl && echo --without-gsasl --without-sasl) |
| 352 |
+ |
| 353 |
$(use_with idn idn2) --without-idn # avoid automagic libidn dep |
| 354 |
$(use_with kerberos gss) |
| 355 |
"$(use slang && echo --with-slang="${EPREFIX}"/usr || echo a=b)" |
Archives