From 345c02ca33341652116ddec6705530223af2de85 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 27 Aug 2024 12:00:02 +0100 Subject: gentoo auto-resync : 27:08:2024 - 12:00:02 --- net-mail/Manifest.gz | Bin 14059 -> 14061 bytes net-mail/mu/Manifest | 5 +- net-mail/mu/files/mu-1.12.4-timet.patch | 34 +++++++++++ net-mail/mu/mu-1.12.4-r1.ebuild | 100 ++++++++++++++++++++++++++++++++ net-mail/mu/mu-1.12.4.ebuild | 97 ------------------------------- net-mail/mu/mu-1.12.6-r1.ebuild | 100 ++++++++++++++++++++++++++++++++ net-mail/mu/mu-1.12.6.ebuild | 97 ------------------------------- 7 files changed, 237 insertions(+), 196 deletions(-) create mode 100644 net-mail/mu/files/mu-1.12.4-timet.patch create mode 100644 net-mail/mu/mu-1.12.4-r1.ebuild delete mode 100644 net-mail/mu/mu-1.12.4.ebuild create mode 100644 net-mail/mu/mu-1.12.6-r1.ebuild delete mode 100644 net-mail/mu/mu-1.12.6.ebuild (limited to 'net-mail') diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz index c75afeefb77f..69944700028a 100644 Binary files a/net-mail/Manifest.gz and b/net-mail/Manifest.gz differ diff --git a/net-mail/mu/Manifest b/net-mail/mu/Manifest index 279fe0349419..b6430595f519 100644 --- a/net-mail/mu/Manifest +++ b/net-mail/mu/Manifest @@ -1,9 +1,10 @@ AUX 70mu-gentoo-autoload.el 68 BLAKE2B 518f6544d9b36a845e58fca8c4c9dc02c6855f48576508d47718afb1b08b4f83ce87f257e68756690f4ac70ed9770b7064f2613dc3c4077bbcf9b826512644d0 SHA512 ae50746ba93e3ac81a11d3c8746b72182fcdadc3e29966d65233debd8e6b8aa56f76f5e6a70fc68f7761e4dd55045d2b32e3765cedcced4813de3682187beeea AUX mu-1.12.0-no-python.patch 1372 BLAKE2B 76a32d7a4a90139e3e3ebcc6fc83b1ddccd6ba4e58337949bff89ebd7ad01109c34cd1765ee22a1058e4e1f06ec5d5b5cea3c84091ede82bcea18212a42f83e3 SHA512 3a58fcf26ef8fc02f5515af7abc5a8d0093a5e05f079fa5eb4eab4e77e15599cea94a52fb5de9437b8d51d683229a5556bfca311526f1f546c4d434c6a35117d +AUX mu-1.12.4-timet.patch 1407 BLAKE2B 3447c4de7e4c0db5d5cb477164dd82b8089125a934aea7348ba01a88673254bd103aece17dfaf487348284759ecab1ff58653a978734850023a50e6ec80c3c9e SHA512 aa0b238d33fa26842c79199bb63a3790560c34ae7b0f2e5782faa6c9155735d401749b008df5e65d133a9efb0d3a16dbeb580904108962008c0ef42cd111765a DIST mu-1.10.8.tar.xz 570792 BLAKE2B 6e65e77544011d0f6b8fb1a5ac4dfe074fe6af3504e2ce2577185a280af43c8d40e7ec3ed6bde90c6b6c6b4cd678a6ae5bae9430f7c2a03451f3f08fffe1c963 SHA512 d77fe955c44c09272feb7cd903dfc6f2a3b5974b81fef82bdb553ed2079e68451bb1ed11ce338ee2dfe9be835f0d99cb4ce0c4b41f43ecfad76e978732243c71 DIST mu-1.12.4.tar.xz 715232 BLAKE2B 5886f07ad6fb12d8a538de80c4681cd2ba416da82839519a70676eabd2d2eef1fa1a53d004ab1524966682a4d6c2eef7e67cc4efc6f5e7c380e732b7614de854 SHA512 ddc0430fe41db3639433f60105a67bb184e611d8438a49e51fb9ea4b5b404c270bb78c9165cb3136a3b402a91a65735d917c0868ca4d134f13b4971b028da5b5 DIST mu-1.12.6.tar.xz 719392 BLAKE2B 75afdfa95f6711fb94e40757c23dd404e888610d36c7d6cbf29727770dbe8fcd1a207b7eae7e1cd06dcab2f088eb38cf7d045a59efbfa3e700d85a0e5f95164b SHA512 c3ba7b4c90d2749364f8c414d2eadcc4e6021237416d92cefd4542688b2fdafb1215a7b75b22fcafa68d349a22b69556d707e2c1e2752941e469a9231bb64ced EBUILD mu-1.10.8-r1.ebuild 2196 BLAKE2B 94f794bd3be0a72cb038225aa78644258a85558aba0db46d9f0b3604b34f20111dd3f76e87a2925d619068d48bf5e07c26861ea1674f23e74aeedeb89ef36248 SHA512 b6a997cf017581293c6b0a28f1b74938edff5f50571a49b56a00cd5877b0d738b6f3f12b185668640fa4862950ce42ff8994b54a607eb6f8ee2a3142d31fe686 -EBUILD mu-1.12.4.ebuild 2288 BLAKE2B 7bbfbc86424b22c6eba1c36e720f8f00dd8a50419d41fc291c91e0f1331666b0263700025123c9830402244e9f146e7a6df0035e4267eee48fd541eadaf971ae SHA512 88d603cbe7a152e43fd93a150d617816cb6be9c023be116a182fe9491d5e842dce3c7987953283767facc56cdcaf95d39f1b5462b9d2a55ca57ee3685dc64b25 -EBUILD mu-1.12.6.ebuild 2290 BLAKE2B 2bce26b9d77d67712ccc8025945cb0e9ef7edf2bcc3d0ede07f3753d1ce54b4ed742235cb6c700dbdf0caf9d66b74ec6df3819b8785b22efdd24d1286e3df3bc SHA512 f09876f6f835564789b1eec59a874ffb6bd6e4737589e0b3ea79384cac3b14db24ff457efcc18c5d782b45b58ed3e012d9d38d6f2f135abef9f2d6ff995f9e80 +EBUILD mu-1.12.4-r1.ebuild 2363 BLAKE2B a0309ca89430c5cbb30128abeeab4450708558aef5ddb97a2b2f2e5f9fb815c30b4663d4ff527abe3a49c65ca24fe2e10952e51245b2b47b60c49f7a54d2652d SHA512 1462eb58d24d8614baf66b7029166d3dea7136dcd80b38c40b08704255f7e0943731bd24e3b2747c2b425c2a1ed2461321da6421629f3c6a8758d091dfbab193 +EBUILD mu-1.12.6-r1.ebuild 2362 BLAKE2B a4cb73c78b8cd56f03f5b81b3895e4d6ecde48e92bb19623474c5282b8d3a3d79876c4233d04f6dd1abd1009ec97e84cb1117192c9ad6d42c7bd5d494fe85f46 SHA512 dd2fe7c7316de16ef4f9b8eabb70601ffc5052e9d59e30b8c5015935d2c711e1fd1fa355b677aa2a7c0cba4f622a1b0b617940f07ab1fc309b607377d255a128 MISC metadata.xml 893 BLAKE2B 4d21c0794fc184957939ebaab628b9a1abe0bbdb63915157e266ce0a773fe3acc52722d010d3b4e096f86257e945c0f9dd51cd0dbe54c37f717408ffe942bc06 SHA512 7f499e039820d12c9acd0affe2a402fc53ee6367684a3c2ba25669987f02b0fabb3db0de978e197876bd9e3af315734af398ba7c8305119c511d59c709b6e225 diff --git a/net-mail/mu/files/mu-1.12.4-timet.patch b/net-mail/mu/files/mu-1.12.4-timet.patch new file mode 100644 index 000000000000..90ee1b60ba15 --- /dev/null +++ b/net-mail/mu/files/mu-1.12.4-timet.patch @@ -0,0 +1,34 @@ +From 075394b35f33bcf684eb0b0023a8640a3ce9c8f5 Mon Sep 17 00:00:00 2001 +From: Matthew Smith +Date: Mon, 26 Aug 2024 14:46:54 +0000 +Subject: [PATCH] lib: use time_t_max for empty datetime + +In Mu::parse_date_time, when provided with an empty string, return +time_t_max instead of G_MAXINT64. For systems with a 64-bit time_t, there +is no difference. With a 32-bit time_t it caused a test to fail: + + not ok /utils/date-basic - ERROR:../mu-1.12.4/lib/utils/tests/test-utils.cc:92 + void test_date_basic(): assertion failed + (parse_date_time(std::get<0>(test), std::get<1>(test)).value_or(-1) + == std::get<2>(test)): (18446744073709551615 == 2147483647) + +This edge case probably only affected the test, as when other parts of +the application call parse_date_time (e.g. mu-server.cc and +mu-query-processor.cc), they check if the input string is empty first. + +Upstream: https://github.com/djcb/mu/pull/2749 +Bug: https://bugs.gentoo.org/933093 +--- a/lib/utils/mu-utils.cc ++++ b/lib/utils/mu-utils.cc +@@ -493,7 +493,7 @@ Mu::parse_date_time(const std::string& dstr, bool is_first, bool utc) + + /* one-sided dates */ + if (dstr.empty()) +- return is_first ? 0 : G_MAXINT64; ++ return is_first ? time_t_min : time_t_max; + else if (dstr == "today" || dstr == "now") + return special_date_time(dstr, is_first); + else if (dstr.find_first_of("ymdwhMs") != std::string::npos) +-- +2.46.0 + diff --git a/net-mail/mu/mu-1.12.4-r1.ebuild b/net-mail/mu/mu-1.12.4-r1.ebuild new file mode 100644 index 000000000000..7d7aa9f54a3f --- /dev/null +++ b/net-mail/mu/mu-1.12.4-r1.ebuild @@ -0,0 +1,100 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit elisp-common meson readme.gentoo-r1 + +DESCRIPTION="Set of tools to deal with Maildirs, in particular, searching and indexing" +HOMEPAGE="https://www.djcbsoftware.nl/code/mu/ https://github.com/djcb/mu" +SRC_URI="https://github.com/djcb/mu/releases/download/v${PV}/${P}.tar.xz" + +# mu: GPL-3+ +# + cli11: BSD +# + fmt: MIT +# + tl: CC0-1.0 +# + variant-lite: Boost-1.0 +LICENSE="BSD Boost-1.0 CC0-1.0 GPL-3+ MIT" +SLOT="0" +KEYWORDS="amd64 ~arm arm64 ~riscv ~x86 ~x64-macos" +IUSE="emacs readline" + +DEPEND=" + dev-libs/glib:2 + dev-libs/gmime:3.0 + >=dev-libs/xapian-1.4:= + emacs? ( >=app-editors/emacs-25.3:* ) + readline? ( sys-libs/readline:= )" +RDEPEND="${DEPEND}" +BDEPEND=" + sys-apps/texinfo + virtual/pkgconfig +" + +PATCHES=( + # https://bugs.gentoo.org/925503 + "${FILESDIR}"/${PN}-1.12.0-no-python.patch + + # https://bugs.gentoo.org/933093 + "${FILESDIR}"/${PN}-1.12.4-timet.patch +) + +DOC_CONTENTS=" + To use mu4e you need to configure it in your .emacs file. + See the manual for more information: + https://www.djcbsoftware.nl/code/mu/mu4e/ +" +SITEFILE="70mu-gentoo-autoload.el" + +src_prepare() { + default + + # Don't install NEWS.org into /usr/share/doc. + sed -i '/NEWS.org/,+1 d' meson.build || die + sed -i '/mu4e-about.org/d' mu4e/meson.build || die + + # Don't compress the info file. + sed -i '/gzip/d' build-aux/meson-install-info.sh || die + + # Instead, put it in /usr/share/doc/${PF}. + sed -i "/MU_DOC_DIR/s/mu/${PF}/" mu4e/meson.build || die +} + +src_configure() { + local emesonargs=( + $(meson_feature readline) + -Dcld2=disabled + -Demacs="$(usex emacs "${EMACS}" emacs-not-enabled)" + # TODO: revisit this, it's not actually deprecated, just been reworked + -Dguile=disabled + ) + meson_src_configure +} + +src_install() { + meson_src_install + + # Since meson no longer installs NEWS.org, install it with dodoc. + # Also, it must be uncompressed so that it can be viewed with + # mu4e-info. + docompress -x /usr/share/doc/${PF}/NEWS.org + dodoc NEWS.org + + if use emacs; then + # Same as above. + docompress -x /usr/share/doc/${PF}/mu4e-about.org + dodoc mu4e/mu4e-about.org + + elisp-site-file-install "${FILESDIR}"/${SITEFILE} + + readme.gentoo_create_doc + fi +} + +pkg_postinst() { + use emacs && readme.gentoo_create_doc +} + +pkg_postrm() { + use emacs && elisp-site-regen +} diff --git a/net-mail/mu/mu-1.12.4.ebuild b/net-mail/mu/mu-1.12.4.ebuild deleted file mode 100644 index 23e6d037c065..000000000000 --- a/net-mail/mu/mu-1.12.4.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit elisp-common meson readme.gentoo-r1 - -DESCRIPTION="Set of tools to deal with Maildirs, in particular, searching and indexing" -HOMEPAGE="https://www.djcbsoftware.nl/code/mu/ https://github.com/djcb/mu" -SRC_URI="https://github.com/djcb/mu/releases/download/v${PV}/${P}.tar.xz" - -# mu: GPL-3+ -# + cli11: BSD -# + fmt: MIT -# + tl: CC0-1.0 -# + variant-lite: Boost-1.0 -LICENSE="BSD Boost-1.0 CC0-1.0 GPL-3+ MIT" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~riscv ~x86 ~x64-macos" -IUSE="emacs readline" - -DEPEND=" - dev-libs/glib:2 - dev-libs/gmime:3.0 - >=dev-libs/xapian-1.4:= - emacs? ( >=app-editors/emacs-25.3:* ) - readline? ( sys-libs/readline:= )" -RDEPEND="${DEPEND}" -BDEPEND=" - sys-apps/texinfo - virtual/pkgconfig -" - -PATCHES=( - # https://bugs.gentoo.org/925503 - "${FILESDIR}"/${PN}-1.12.0-no-python.patch -) - -DOC_CONTENTS=" - To use mu4e you need to configure it in your .emacs file. - See the manual for more information: - https://www.djcbsoftware.nl/code/mu/mu4e/ -" -SITEFILE="70mu-gentoo-autoload.el" - -src_prepare() { - default - - # Don't install NEWS.org into /usr/share/doc. - sed -i '/NEWS.org/,+1 d' meson.build || die - sed -i '/mu4e-about.org/d' mu4e/meson.build || die - - # Don't compress the info file. - sed -i '/gzip/d' build-aux/meson-install-info.sh || die - - # Instead, put it in /usr/share/doc/${PF}. - sed -i "/MU_DOC_DIR/s/mu/${PF}/" mu4e/meson.build || die -} - -src_configure() { - local emesonargs=( - $(meson_feature readline) - -Dcld2=disabled - -Demacs="$(usex emacs "${EMACS}" emacs-not-enabled)" - # TODO: revisit this, it's not actually deprecated, just been reworked - -Dguile=disabled - ) - meson_src_configure -} - -src_install() { - meson_src_install - - # Since meson no longer installs NEWS.org, install it with dodoc. - # Also, it must be uncompressed so that it can be viewed with - # mu4e-info. - docompress -x /usr/share/doc/${PF}/NEWS.org - dodoc NEWS.org - - if use emacs; then - # Same as above. - docompress -x /usr/share/doc/${PF}/mu4e-about.org - dodoc mu4e/mu4e-about.org - - elisp-site-file-install "${FILESDIR}"/${SITEFILE} - - readme.gentoo_create_doc - fi -} - -pkg_postinst() { - use emacs && readme.gentoo_create_doc -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/net-mail/mu/mu-1.12.6-r1.ebuild b/net-mail/mu/mu-1.12.6-r1.ebuild new file mode 100644 index 000000000000..779fe8e7b523 --- /dev/null +++ b/net-mail/mu/mu-1.12.6-r1.ebuild @@ -0,0 +1,100 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit elisp-common meson readme.gentoo-r1 + +DESCRIPTION="Set of tools to deal with Maildirs, in particular, searching and indexing" +HOMEPAGE="https://www.djcbsoftware.nl/code/mu/ https://github.com/djcb/mu" +SRC_URI="https://github.com/djcb/mu/releases/download/v${PV}/${P}.tar.xz" + +# mu: GPL-3+ +# + cli11: BSD +# + fmt: MIT +# + tl: CC0-1.0 +# + variant-lite: Boost-1.0 +LICENSE="BSD Boost-1.0 CC0-1.0 GPL-3+ MIT" +SLOT="0" +KEYWORDS="amd64 arm ~arm64 ~riscv x86 ~x64-macos" +IUSE="emacs readline" + +DEPEND=" + dev-libs/glib:2 + dev-libs/gmime:3.0 + >=dev-libs/xapian-1.4:= + emacs? ( >=app-editors/emacs-25.3:* ) + readline? ( sys-libs/readline:= )" +RDEPEND="${DEPEND}" +BDEPEND=" + sys-apps/texinfo + virtual/pkgconfig +" + +PATCHES=( + # https://bugs.gentoo.org/925503 + "${FILESDIR}"/${PN}-1.12.0-no-python.patch + + # https://bugs.gentoo.org/933093 + "${FILESDIR}"/${PN}-1.12.4-timet.patch +) + +DOC_CONTENTS=" + To use mu4e you need to configure it in your .emacs file. + See the manual for more information: + https://www.djcbsoftware.nl/code/mu/mu4e/ +" +SITEFILE="70mu-gentoo-autoload.el" + +src_prepare() { + default + + # Don't install NEWS.org into /usr/share/doc. + sed -i '/NEWS.org/,+1 d' meson.build || die + sed -i '/mu4e-about.org/d' mu4e/meson.build || die + + # Don't compress the info file. + sed -i '/gzip/d' build-aux/meson-install-info.sh || die + + # Instead, put it in /usr/share/doc/${PF}. + sed -i "/MU_DOC_DIR/s/mu/${PF}/" mu4e/meson.build || die +} + +src_configure() { + local emesonargs=( + $(meson_feature readline) + -Dcld2=disabled + -Demacs="$(usex emacs "${EMACS}" emacs-not-enabled)" + # TODO: revisit this, it's not actually deprecated, just been reworked + -Dguile=disabled + ) + meson_src_configure +} + +src_install() { + meson_src_install + + # Since meson no longer installs NEWS.org, install it with dodoc. + # Also, it must be uncompressed so that it can be viewed with + # mu4e-info. + docompress -x /usr/share/doc/${PF}/NEWS.org + dodoc NEWS.org + + if use emacs; then + # Same as above. + docompress -x /usr/share/doc/${PF}/mu4e-about.org + dodoc mu4e/mu4e-about.org + + elisp-site-file-install "${FILESDIR}"/${SITEFILE} + + readme.gentoo_create_doc + fi +} + +pkg_postinst() { + use emacs && readme.gentoo_create_doc +} + +pkg_postrm() { + use emacs && elisp-site-regen +} diff --git a/net-mail/mu/mu-1.12.6.ebuild b/net-mail/mu/mu-1.12.6.ebuild deleted file mode 100644 index 974051ec7307..000000000000 --- a/net-mail/mu/mu-1.12.6.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit elisp-common meson readme.gentoo-r1 - -DESCRIPTION="Set of tools to deal with Maildirs, in particular, searching and indexing" -HOMEPAGE="https://www.djcbsoftware.nl/code/mu/ https://github.com/djcb/mu" -SRC_URI="https://github.com/djcb/mu/releases/download/v${PV}/${P}.tar.xz" - -# mu: GPL-3+ -# + cli11: BSD -# + fmt: MIT -# + tl: CC0-1.0 -# + variant-lite: Boost-1.0 -LICENSE="BSD Boost-1.0 CC0-1.0 GPL-3+ MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos" -IUSE="emacs readline" - -DEPEND=" - dev-libs/glib:2 - dev-libs/gmime:3.0 - >=dev-libs/xapian-1.4:= - emacs? ( >=app-editors/emacs-25.3:* ) - readline? ( sys-libs/readline:= )" -RDEPEND="${DEPEND}" -BDEPEND=" - sys-apps/texinfo - virtual/pkgconfig -" - -PATCHES=( - # https://bugs.gentoo.org/925503 - "${FILESDIR}"/${PN}-1.12.0-no-python.patch -) - -DOC_CONTENTS=" - To use mu4e you need to configure it in your .emacs file. - See the manual for more information: - https://www.djcbsoftware.nl/code/mu/mu4e/ -" -SITEFILE="70mu-gentoo-autoload.el" - -src_prepare() { - default - - # Don't install NEWS.org into /usr/share/doc. - sed -i '/NEWS.org/,+1 d' meson.build || die - sed -i '/mu4e-about.org/d' mu4e/meson.build || die - - # Don't compress the info file. - sed -i '/gzip/d' build-aux/meson-install-info.sh || die - - # Instead, put it in /usr/share/doc/${PF}. - sed -i "/MU_DOC_DIR/s/mu/${PF}/" mu4e/meson.build || die -} - -src_configure() { - local emesonargs=( - $(meson_feature readline) - -Dcld2=disabled - -Demacs="$(usex emacs "${EMACS}" emacs-not-enabled)" - # TODO: revisit this, it's not actually deprecated, just been reworked - -Dguile=disabled - ) - meson_src_configure -} - -src_install() { - meson_src_install - - # Since meson no longer installs NEWS.org, install it with dodoc. - # Also, it must be uncompressed so that it can be viewed with - # mu4e-info. - docompress -x /usr/share/doc/${PF}/NEWS.org - dodoc NEWS.org - - if use emacs; then - # Same as above. - docompress -x /usr/share/doc/${PF}/mu4e-about.org - dodoc mu4e/mu4e-about.org - - elisp-site-file-install "${FILESDIR}"/${SITEFILE} - - readme.gentoo_create_doc - fi -} - -pkg_postinst() { - use emacs && readme.gentoo_create_doc -} - -pkg_postrm() { - use emacs && elisp-site-regen -} -- cgit v1.2.3