diff options
Diffstat (limited to 'net-mail/mu')
| -rw-r--r-- | net-mail/mu/Manifest | 7 | ||||
| -rw-r--r-- | net-mail/mu/files/mu-1.12.0-cld2-opt.patch | 36 | ||||
| -rw-r--r-- | net-mail/mu/mu-1.10.6.ebuild | 88 | ||||
| -rw-r--r-- | net-mail/mu/mu-1.12.0.ebuild (renamed from net-mail/mu/mu-1.10.7-r1.ebuild) | 7 |
4 files changed, 45 insertions, 93 deletions
diff --git a/net-mail/mu/Manifest b/net-mail/mu/Manifest index 344c9a739c7a..c602923be9cc 100644 --- a/net-mail/mu/Manifest +++ b/net-mail/mu/Manifest @@ -1,8 +1,7 @@ AUX 70mu-gentoo-autoload.el 68 BLAKE2B 518f6544d9b36a845e58fca8c4c9dc02c6855f48576508d47718afb1b08b4f83ce87f257e68756690f4ac70ed9770b7064f2613dc3c4077bbcf9b826512644d0 SHA512 ae50746ba93e3ac81a11d3c8746b72182fcdadc3e29966d65233debd8e6b8aa56f76f5e6a70fc68f7761e4dd55045d2b32e3765cedcced4813de3682187beeea -DIST mu-1.10.6.tar.xz 570660 BLAKE2B 96816753a3b38392e7e943d8b72fd98b44d201c022b6018eb692cf594bd9f7285a84d00da53ab85a671d5375b7eafb9eb5a0e1fff51ad5a9b2d035fa1c0f8d23 SHA512 78eb5e21ac2dc2a6665a257593781c3b9a390644f78945ce9eef18acab6ca750b16773de2665a1ced9b2f9434b4a2879d07bc586b3abdb82ccc0cd3b59ab51e5 -DIST mu-1.10.7.tar.xz 570740 BLAKE2B fcc1d3f6f293e2161e5bcef85eb085a3af95ff8d410e074f6a015f68e914592da171c357c795dad9d48ac8438e46f261b4f1be54d8f2e8075f93d72bd5a9a483 SHA512 0b588bb54ac79d23920150dbee7f7f7ca606d0fc8e169b2ca64a7cf0d062bb5c399c522d68f9bf6c3624addb8d9342efe0f45309d422eac3e3f8948acfebd904 +AUX mu-1.12.0-cld2-opt.patch 1097 BLAKE2B 886209d6fba2d2ea619811e6bea7eafb15f48e2d485b07d37ced1b6c75efdca01e3efbcd85897af276bb496bb3105ef6fccd8fce3fcde11fd385b0f5553e0957 SHA512 995b7fb3079984922f39b5d84dda46a6a880561bea22ed7608ee773c126fa7f87428a2a722ecb45648d23cc7d658e1374c56ddb252f21503c2ba84f69be66712 DIST mu-1.10.8.tar.xz 570792 BLAKE2B 6e65e77544011d0f6b8fb1a5ac4dfe074fe6af3504e2ce2577185a280af43c8d40e7ec3ed6bde90c6b6c6b4cd678a6ae5bae9430f7c2a03451f3f08fffe1c963 SHA512 d77fe955c44c09272feb7cd903dfc6f2a3b5974b81fef82bdb553ed2079e68451bb1ed11ce338ee2dfe9be835f0d99cb4ce0c4b41f43ecfad76e978732243c71 -EBUILD mu-1.10.6.ebuild 2116 BLAKE2B 4661e7d9a2bd195ef2dae29b60b3e7c21ec36fb9bf2f87c78048e7087905bd4264fc94153b5f727e3c05f912b4b1295983c4ae1dbe945be91a62060ee5056f69 SHA512 6c575416d7f4c3df3b7c077a90bbe81a41adb40448a82c3af2ceb7ae19d5e83c9d0535b0b39b43ffa04a5651c0a7950c4b59a903ece8a2e657e18c444a6705ef -EBUILD mu-1.10.7-r1.ebuild 2200 BLAKE2B 8bea3794f28a03c41e64751cf15a267f458148a2366ca2eb43d603e29a03109c3c2c9f58b5d46af53dea6611f45948e1a93519e37b32de0c8e617b72d82982a2 SHA512 38144f5879b86c2e6f5552c16a71f250d3e625855b873608d1b4254730a21b6fa4881b74f3dcc5fc0a8386d68558a200e5bd2b4a4fda7d4a1287762af50a732a +DIST mu-1.12.0.tar.xz 707400 BLAKE2B 05db6162b0662fb1fdf796d534abbfee8cd3f6359a9f74af10127d932c94e74abe736ef23c1535fc88faae0f23989548908c64b8165af2005b57f2f86bd2cde6 SHA512 349785803e72bc07f361412e282a42baf11c5f4b94a05ef0a13cec9311ac62cafaca10ffaa149574e2f1adb83fecfafb586554d1c2711dc16b53e67c03a01f6f EBUILD mu-1.10.8-r1.ebuild 2196 BLAKE2B 94f794bd3be0a72cb038225aa78644258a85558aba0db46d9f0b3604b34f20111dd3f76e87a2925d619068d48bf5e07c26861ea1674f23e74aeedeb89ef36248 SHA512 b6a997cf017581293c6b0a28f1b74938edff5f50571a49b56a00cd5877b0d738b6f3f12b185668640fa4862950ce42ff8994b54a607eb6f8ee2a3142d31fe686 +EBUILD mu-1.12.0.ebuild 2274 BLAKE2B bc9afca53cc5758a99321e3a3a47de83787ec8d09c6ee132cfafc64a5588eb2928b39775a7029edb2cc757822cd83fc037e6323159a314e49cf7bd1f4d8ada2c SHA512 a13d764e06f5348b13091a1573e66545b6403ebe22f42524b26ceda7c0e286613bb40204c2b31fdb39a2ac3cc97b1a385975c41d90f97580a3dd0177bd216e5a MISC metadata.xml 893 BLAKE2B 4d21c0794fc184957939ebaab628b9a1abe0bbdb63915157e266ce0a773fe3acc52722d010d3b4e096f86257e945c0f9dd51cd0dbe54c37f717408ffe942bc06 SHA512 7f499e039820d12c9acd0affe2a402fc53ee6367684a3c2ba25669987f02b0fabb3db0de978e197876bd9e3af315734af398ba7c8305119c511d59c709b6e225 diff --git a/net-mail/mu/files/mu-1.12.0-cld2-opt.patch b/net-mail/mu/files/mu-1.12.0-cld2-opt.patch new file mode 100644 index 000000000000..124675868670 --- /dev/null +++ b/net-mail/mu/files/mu-1.12.0-cld2-opt.patch @@ -0,0 +1,36 @@ +https://github.com/djcb/mu/pull/2632 + +--- a/meson.build ++++ b/meson.build +@@ -189,11 +189,11 @@ else + endif + + # optionally, use Compact Language Detector2 if we can find it. +-cld2_dep = meson.get_compiler('cpp').find_library('cld2', required: false) +-if cld2_dep.found() ++cld2_dep = meson.get_compiler('cpp').find_library('cld2', required: get_option('cld2')) ++if not get_option('cld2').disabled() and cld2_dep.found() + config_h_data.set('HAVE_CLD2', 1) + else +- message('CLD2 not found; no support for language detection') ++ message('CLD2 not found or disabled; no support for language detection') + endif + + # note: these are for the unit-tests +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -24,6 +24,11 @@ option('guile', + value: 'auto', + description: 'build the guile scripting support (requires guile-3.x)') + ++option('cld2', ++ type : 'feature', ++ value: 'auto', ++ description: 'Compact Language Detector2') ++ + # by default, this uses guile_dep.get_variable(pkgconfig: 'extensiondir') + option('guile-extension-dir', + type: 'string', +-- +2.44.0 + diff --git a/net-mail/mu/mu-1.10.6.ebuild b/net-mail/mu/mu-1.10.6.ebuild deleted file mode 100644 index 6db9039141c9..000000000000 --- a/net-mail/mu/mu-1.10.6.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit elisp-common meson - -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" - -LICENSE="GPL-3+" -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 -" - -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) - -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 - - # Same as above. - docompress -x /usr/share/doc/${PF}/mu4e-about.org - dodoc mu4e/mu4e-about.org -} - -pkg_preinst() { - if [[ -n ${REPLACING_VERSIONS} ]]; then - elog "After upgrading from an old major version, you should" - elog "rebuild your mail index." - fi -} - -pkg_postinst() { - if use emacs; then - einfo "To use mu4e you need to configure it in your .emacs file" - einfo "See the manual for more information:" - einfo "https://www.djcbsoftware.nl/code/mu/mu4e/" - - elisp-site-regen - fi -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/net-mail/mu/mu-1.10.7-r1.ebuild b/net-mail/mu/mu-1.12.0.ebuild index f637744311ea..4df4e56cb6e2 100644 --- a/net-mail/mu/mu-1.10.7-r1.ebuild +++ b/net-mail/mu/mu-1.12.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -26,6 +26,10 @@ BDEPEND=" virtual/pkgconfig " +PATCHES=( + "${FILESDIR}"/${PN}-1.12.0-cld2-opt.patch +) + SITEFILE="70mu-gentoo-autoload.el" src_prepare() { @@ -45,6 +49,7 @@ src_prepare() { 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 |