diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-05-12 16:42:50 +0300 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-05-12 16:42:50 +0300 |
commit | 752d6256e5204b958b0ef7905675a940b5e9172f (patch) | |
tree | 330d16e6362a49cbed8875a777fe641a43376cd3 /mail-client/mutt | |
parent | 0c100b7dd2b30e75b799d806df4ef899fd98e1ea (diff) |
gentoo resync : 12.05.2022
Diffstat (limited to 'mail-client/mutt')
-rw-r--r-- | mail-client/mutt/Manifest | 11 | ||||
-rw-r--r-- | mail-client/mutt/mutt-2.0.7.ebuild | 261 | ||||
-rw-r--r-- | mail-client/mutt/mutt-2.2.3.ebuild | 2 | ||||
-rw-r--r-- | mail-client/mutt/mutt-2.2.4.ebuild (renamed from mail-client/mutt/mutt-2.2.2.ebuild) | 2 |
4 files changed, 6 insertions, 270 deletions
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest index 34bd55e5a4d3..2e1827584a49 100644 --- a/mail-client/mutt/Manifest +++ b/mail-client/mutt/Manifest @@ -1,12 +1,9 @@ AUX Muttrc 667 BLAKE2B 49aaefba7ceeefde9d727ad88574fc599a48bcd334ac8e99d8d5e555f2317f4595c480f1903df4b82854bfd272b8aee86a02369769f38a3cadf35f6a6348bf14 SHA512 b64d6e857f0c7de2e2e5b23cecd869f8a9807aa827ad6221e3c5864b2a31fb0136aeaf09ffdb2549645507fe92f724774a80395b6ab2345068903f5ee1269f29 AUX Muttrc.mbox 486 BLAKE2B dd7f15b08f185800b2a7d26545e5a1b0f7b21f8f7cff2b4fce39fb58d8e336bec6fd500b88c0b14d026c9578d12cd1e4bca45c0d2f3d286d2c9d132b2b5e137e SHA512 aece9a734d292b6f638d2a0dd39f20d9894b4bb6e6888da606a49274faef9c1864e98eec907ffa7742af58d46456e46b8945d2d47c8b89fc95daa2a8833d3e90 -DIST mutt-2.0.7.tar.gz 5299366 BLAKE2B 587679d3580a55084312b4bd26083c85fb1b3d07b4a08ea5e2081f475d37a0e283ecfd647555519fc6deccb4bdfdd46234ede4669a9abc6fc2cde778f76bf656 SHA512 1eb689fb9e6aa3cf0bcd0b696c25477cd04b74d8ec93404df071de6dc051e46bbad88131cdf610eb01df4789984707f3791366ae2fda28de2d2739aeb9d34e30 -DIST mutt-2.2.2.tar.gz 5507066 BLAKE2B dd23e2e75b1656ac0351d10df266432820dd32acd44310e586f8c5deec187648e61c7b9e880bcbbaa09a9d6e8bd67b205f43284a729ae6ff95adb4e2bc15724a SHA512 da236c535a4dd18ed92f4b226a009711098c87cc28bbcf3abcd5f31f3ac074abe830f4f7c98cc8cda738a7a6d9421a088915094b33e53e32e9649ccccefe3481 DIST mutt-2.2.3.tar.gz 5509344 BLAKE2B 57d9d29d009e8dce6b27277aa4df371a4b03e783fb5482dc10db20ffa393db01b1aaeaee49bf8421b048e5bb07eeff31fcc1ef84db982b58c618d396ce11e56e SHA512 47656ee1b741d0d165fde4027fc7278910e39e9d5d0bfc5c52e7e767c3373bd3755833269d256364333fd4502c67490adcd5e4b33f1141f53ad575e9fb1a5131 -DIST mutt-gentoo-2.0.7-patches-r0.tar.xz 26416 BLAKE2B dd03fd2a29f4c2e8681c4413ca430b65beb2036b73fa95430f5f06e7c2948fb4e3256be89d922646731245672cb2900d6b7ce6bda16cb9306d5531064cfaf8a1 SHA512 cb72df8f6fa3436f134f66772f82ba95ebc92462cf145d21e01ad5b277f13294948c1d03c9c6671e58c655776a6112f2af065df79a56a135ab70c28b37e43334 -DIST mutt-gentoo-2.2.2-patches-r0.tar.xz 23160 BLAKE2B 2bc09d2aa67102b382c2466773868ba32f38827e44efc7ee2461fa592607a926547013f6c232ac2d6d0cd7dc07da386a0995c7819273b4c96c28a1a6140248a4 SHA512 3b45957d92a9d3f2c185965d226c137dcbb11eb58e497a4dc5ab49041eba79c7436b8239ceb625e32ef0453b7909d925a6238ec75dfa3f267eea46e86474758a +DIST mutt-2.2.4.tar.gz 5515825 BLAKE2B cae02e409d6d4d7c1e6544c1f9c5051b85d390258e6de0d98edcb9d3e519cecdfa1aa54d43cdae9d5ce8409d39752cac501e5433a21cc46bdf861a05f4059e37 SHA512 4a4b27069ab55ac557613659c210edc98016c8506e2281aa0cf1966fc18d04bb2e8d8f227c2a05b3e3657138c1ac9097f38e4693d49e42425b43ab63dd262b10 DIST mutt-gentoo-2.2.3-patches-r0.tar.xz 23168 BLAKE2B be7fad2f06b913439df4fb7a223e7305b66195153329956f4be9fdd524ac0de6121ccf9a6dc506b0b68e12759667173379c4e0ff1645c1b9948aaed1f7601033 SHA512 22edcc53a42133093eb163e4cfba2e865aec31ef87c74e35aaad10d9a4543f9d2cf477ac263da11e247eba300eb72a42870a59a8a3a90341691bdb0ee6d44d5f -EBUILD mutt-2.0.7.ebuild 7867 BLAKE2B 90a99efa6b98975bfb2b82407f51ba8187a780e780139f580d90ba8294e4defafaadb7c0b326eef89b9b3ce7e26c8c738a5b90dbcf2ac5a8b3736c8f938342c7 SHA512 48c0ed350e53959f5137ce975535bdf131801578b2c269253b470affce3f6adf2ebce823f708d05ae969055532ce06402d6f55fc2ca2e5cc8069fb5df3d100ee -EBUILD mutt-2.2.2.ebuild 8134 BLAKE2B caa8c3bb9bcacfbb6f5513a13e1a1e3a68f46bae24fb78c4300f3e4accdb90f30996987a89ac23a8019100e35ce7494a211a42fb86d4af41ba8c66059fde0cc3 SHA512 95553591ae1328ab50987ee4c7bf8ee5788a19763c6c9a1f7d3a5cca267d82831faa329b3a14a4b893bea5e3232f70fa925a2a0ed088304b41660be730da2e5c -EBUILD mutt-2.2.3.ebuild 8134 BLAKE2B caa8c3bb9bcacfbb6f5513a13e1a1e3a68f46bae24fb78c4300f3e4accdb90f30996987a89ac23a8019100e35ce7494a211a42fb86d4af41ba8c66059fde0cc3 SHA512 95553591ae1328ab50987ee4c7bf8ee5788a19763c6c9a1f7d3a5cca267d82831faa329b3a14a4b893bea5e3232f70fa925a2a0ed088304b41660be730da2e5c +DIST mutt-gentoo-2.2.4-patches-r0.tar.xz 23164 BLAKE2B 0645fa2d0a931fd9127de47ae5916fecf09cacbacdc8c6b5f3cea6e6df1c36ec33450c00f9f5261f8adf7dd2fce7e6842b0dd8f3f3ac73b5a0aaa64e774460ff SHA512 f64f8129b9cf9ab9c63bb3789090ba9a821af0411f9b4f858a4a1a95d52ec282581d4f3dd221fc83d715369e35b6a5c4e244f4ec2e5edda4d4ea432f4722f69b +EBUILD mutt-2.2.3.ebuild 8135 BLAKE2B 68fb82b9521a1526cbf80a35ef9523f457034ca655f28a724f763eae507b13316ff0a65df38e00cd9cb21f319d354190690f6831197f3a76e642cff6b1b6b53f SHA512 ba86d3bf6f40b0c5c3aa31d96ebccdef53a31f687880ed1a279b76bc51a15a08aec6e622a4cc678d966c9e49c4638961eb3d2025437cf008cd792f8bc7fb6c20 +EBUILD mutt-2.2.4.ebuild 8141 BLAKE2B a61865e9fcfc9ca8f997c9875fa97681b15f58abc64e4578c76a77d9299b99aece6d1ca6fea6731ee7785e5f508df8a671d479d1e09552d52c9d130ed5932312 SHA512 e22c5c4053ac0d0c612a5d8329a629f11075a358f4a7160ae40f8972e92c6bd568a3e7d9bfc8101ece97d185f1490d674aa44f1a139481682ca904a2d698a721 MISC metadata.xml 1413 BLAKE2B b48f350744607d739c38cc54e42abce66e485f1f65fafaa5f4a668f07da70fff0f917f1d67cab621c9e267052fdb958476292fe5222738e7bca59502f560078c SHA512 c9b4c3a9ac62c04be1ef8dc894754334f35fb79d6365360212805e9f9f2c2dca18e1d03c76bb887e81b4fbb2199fdf8fe4341ebc2059f5961184562ee549df65 diff --git a/mail-client/mutt/mutt-2.0.7.ebuild b/mail-client/mutt/mutt-2.0.7.ebuild deleted file mode 100644 index 0c29057fb2b1..000000000000 --- a/mail-client/mutt/mutt-2.0.7.ebuild +++ /dev/null @@ -1,261 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit flag-o-matic autotools - -PATCHREV="r0" -PATCHSET="gentoo-${PVR}/${PATCHREV}" - -DESCRIPTION="A small but very powerful text-based mail client" -HOMEPAGE="http://www.mutt.org/" -MUTT_G_PATCHES="mutt-gentoo-${PV}-patches-${PATCHREV}.tar.xz" -SRC_URI="ftp://ftp.mutt.org/pub/mutt/${P}.tar.gz - https://bitbucket.org/${PN}/${PN}/downloads/${P}.tar.gz - https://dev.gentoo.org/~grobian/distfiles/${MUTT_G_PATCHES}" -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" -# hcache: allow multiple, bug #607360 -REQUIRED_USE=" - hcache? ( || ( berkdb gdbm lmdb qdbm tokyocabinet ) ) - imap? ( ssl ) - pop? ( ssl ) - smime-classic? ( ssl !gnutls ) - smtp? ( ssl sasl ) - sasl? ( || ( imap pop smtp ) ) - kerberos? ( || ( imap pop smtp ) ) - autocrypt? ( gpgme )" -SLOT="0" -LICENSE="GPL-2" -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" -# yes, we overdepend on the backend impls here, hopefully one day we can -# have REQUIRED_USE do what it is made for again. bug #607360 -CDEPEND=" - app-misc/mime-types - virtual/libiconv - - berkdb? ( >=sys-libs/db-4:= ) - gdbm? ( sys-libs/gdbm ) - lmdb? ( dev-db/lmdb:= ) - qdbm? ( dev-db/qdbm ) - tokyocabinet? ( dev-db/tokyocabinet ) - - ssl? ( - gnutls? ( >=net-libs/gnutls-1.0.17:= ) - !gnutls? ( >=dev-libs/openssl-0.9.6:0= ) - ) - - nls? ( virtual/libintl ) - sasl? ( >=dev-libs/cyrus-sasl-2 ) - kerberos? ( virtual/krb5 ) - idn? ( net-dns/libidn2 ) - gpgme? ( >=app-crypt/gpgme-0.9.0:= ) - autocrypt? ( >=dev-db/sqlite-3 ) - slang? ( sys-libs/slang ) - !slang? ( >=sys-libs/ncurses-5.2:0= ) -" -DEPEND="${CDEPEND} - net-mail/mailbase - doc? ( - dev-libs/libxml2 - dev-libs/libxslt - app-text/docbook-xsl-stylesheets - || ( www-client/lynx www-client/w3m www-client/elinks ) - )" -RDEPEND="${CDEPEND} - selinux? ( sec-policy/selinux-mutt ) - smime-classic? ( >=dev-libs/openssl-0.9.6:0 ) - pgp-classic? ( app-crypt/gnupg ) -" - -src_prepare() { - local PATCHDIR="${WORKDIR}"/mutt-gentoo-${PV}-patches-${PATCHREV} - - if use !vanilla ; then - # apply patches - # http://hg.code.sf.net/p/gentoomuttpatches/code/file/mutt-1.10 - local patches=( - patches-mutt - bugs-gentoo - features-common - features-extra - gentoo - ) - local patchset p - for patchset in "${patches[@]}" ; do - [[ -d "${PATCHDIR}/${patchset}" ]] || continue - einfo "Patches for ${PATCHSET} patchset ${patchset}" - for p in "${PATCHDIR}/${patchset}"/*.patch ; do - eapply "${p}" || die - done - done - # add some explanation as to why not to go upstream - sed -i \ - -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\\' \ - main.c || die "Failed to add bug instructions" - fi - - local upatches= - # allow user patches - eapply_user && upatches=" with user patches" - - # patch version string for bug reports - local patchset= - use vanilla || patchset=", ${PATCHSET}" - sed -i -e 's|"Mutt %s (%s)"|"Mutt %s (%s'"${patchset}${upatches}"')"|' \ - muttlib.c || die "failed patching in Gentoo version" - - # many patches touch the buildsystem, we always need this - AT_M4DIR="m4" eautoreconf - - # the configure script contains some "cleverness" whether or not to setgid - # the dotlock program, resulting in bugs like #278332 - sed -i -e 's/@DOTLOCK_GROUP@//' Makefile.in || die "sed failed" -} - -src_configure() { - local myconf=( - # signing and encryption - $(use_enable autocrypt) $(use_with autocrypt sqlite3) - $(use_enable pgp-classic pgp) - $(use_enable smime-classic smime) - $(use_enable gpgme) - - # features - $(use_enable debug) - $(use_enable doc) - $(use_enable nls) - - # protocols - $(use_enable imap) - $(use_enable pop) - $(use_enable smtp) - - $(use ssl && use gnutls && echo --with-gnutls --without-ssl) - $(use ssl && use !gnutls && echo --without-gnutls --with-ssl ) - $(use !ssl && echo --without-gnutls --without-ssl) - - $(use_with sasl) - $(use_with idn idn2) --without-idn # avoid automagic libidn dep - $(use_with kerberos gss) - "$(use slang && echo --with-slang="${EPREFIX}"/usr || echo a=b)" - "$(use_with !slang curses "${EPREFIX}"/usr)" - - "--enable-compressed" - "--enable-external-dotlock" - "--enable-iconv" - "--enable-nfs-fix" - "--enable-sidebar" - "--sysconfdir=${EPREFIX}/etc/${PN}" - "--with-docdir=${EPREFIX}/usr/share/doc/${PN}-${PVR}" - "--without-bundled-regex" # use the implementation from libc - "--with-exec-shell=${EPREFIX}/bin/sh" - ) - - if [[ ${CHOST} == *-solaris2.* && ${CHOST#*-solaris2.} -le 10 ]] ; then - # arrows in index view do not show when using wchar_t - # or misalign due to wrong computations - myconf+=( "--without-wc-funcs" ) - fi - - # note: REQUIRED_USE should have selected only one of these, but for - # bug #607360 we're forced to allow multiple. For that reason, this - # list is ordered to preference, and only the first is taken. - local hcaches=( - "lmdb" - "qdbm" - "tokyocabinet" - "gdbm" - "berkdb:bdb" - ) - local ucache hcache lcache - for hcache in "${hcaches[@]}" ; do - if use ${hcache%%:*} ; then - ucache=${hcache} - break - fi - done - if [[ -n ${ucache} ]] ; then - myconf+=( "--enable-hcache" ) - else - myconf+=( "--disable-hcache" ) - fi - for hcache in "${hcaches[@]}" ; do - [[ ${hcache} == ${ucache} ]] \ - && myconf+=( "--with-${hcache#*:}" ) \ - || myconf+=( "--without-${hcache#*:}" ) - done - - if use mbox; then - myconf+=( "--with-mailpath=${EPREFIX}/var/spool/mail" ) - else - myconf+=( "--with-homespool=Maildir" ) - fi - - econf "${myconf[@]}" -} - -src_install() { - emake DESTDIR="${D}" install - insinto /etc/${PN} - if use mbox; then - newins "${FILESDIR}"/Muttrc.mbox Muttrc - else - doins "${FILESDIR}"/Muttrc - fi - - # include attachment settings, it's mandatory and shouldn't harm - # when not being referenced (index_format using %X) - { - echo - echo "# mandatory attachments settings, not setting these is a BUG!" - echo "# see https://marc.info/?l=mutt-dev&m=158347284923517&w=2" - grep '^attachments' "${ED}"/etc/${PN}/Muttrc.dist - } >> "${ED}"/etc/${PN}/Muttrc - - # add setting to actually enable gpgme usage - if use gpgme || use autocrypt ; then - { - echo - echo "# this setting enables the gpgme backend (via USE=gpgme)" - # https is broken due to a certificate mismatch :( - echo "# see http://www.mutt.org/doc/manual/#crypt-use-gpgme" - echo "set crypt_use_gpgme = yes" - } >> "${ED}"/etc/${PN}/Muttrc - fi - - # similar for autocrypt - if use autocrypt ; then - { - echo - echo "# enables autocrypt (via USE=autocrypt)" - echo "# see http://www.mutt.org/doc/manual/#autocryptdoc" - echo "set autocrypt = yes" - } >> "${ED}"/etc/${PN}/Muttrc - fi - - # A newer file is provided by app-misc/mime-types. So we link it. - rm "${ED}"/etc/${PN}/mime.types - dosym ../mime.types /etc/${PN}/mime.types - - # nuke manpages that should be provided by an MTA, bug #177605 - rm "${ED}"/usr/share/man/man5/{mbox,mmdf}.5 \ - || ewarn "failed to remove files, please file a bug" - - if use !prefix ; then - fowners root:mail /usr/bin/mutt_dotlock - fperms g+s /usr/bin/mutt_dotlock - fi - - dodoc COPYRIGHT ChangeLog NEWS OPS* PATCHES README* TODO VERSION -} - -pkg_postinst() { - if [[ -z ${REPLACING_VERSIONS} ]] ; then - echo - elog "If you are new to mutt you may want to take a look at" - elog "the Gentoo QuickStart Guide to Mutt E-Mail:" - elog " https://wiki.gentoo.org/wiki/Mutt" - echo - fi -} diff --git a/mail-client/mutt/mutt-2.2.3.ebuild b/mail-client/mutt/mutt-2.2.3.ebuild index 9217536891d9..49f24a28652d 100644 --- a/mail-client/mutt/mutt-2.2.3.ebuild +++ b/mail-client/mutt/mutt-2.2.3.ebuild @@ -28,7 +28,7 @@ REQUIRED_USE=" autocrypt? ( gpgme )" SLOT="0" LICENSE="GPL-2" -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" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" # yes, we overdepend on the backend impls here, hopefully one day we can # have REQUIRED_USE do what it is made for again. bug #607360 CDEPEND=" diff --git a/mail-client/mutt/mutt-2.2.2.ebuild b/mail-client/mutt/mutt-2.2.4.ebuild index 9217536891d9..5746fe1ea28f 100644 --- a/mail-client/mutt/mutt-2.2.2.ebuild +++ b/mail-client/mutt/mutt-2.2.4.ebuild @@ -28,7 +28,7 @@ REQUIRED_USE=" autocrypt? ( gpgme )" SLOT="0" LICENSE="GPL-2" -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" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" # yes, we overdepend on the backend impls here, hopefully one day we can # have REQUIRED_USE do what it is made for again. bug #607360 CDEPEND=" |