diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-05-31 20:59:14 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-05-31 20:59:14 +0100 |
commit | e748ba9741f6540f4675c23e3e37b73e822c13a4 (patch) | |
tree | 23dece8beabb3a3d7c6c0273b0eb40b21c62a889 /mail-client/evolution | |
parent | 908778078736bd36f7a60a2d576d415cb8e000fa (diff) |
gentoo resync : 31.05.2021
Diffstat (limited to 'mail-client/evolution')
-rw-r--r-- | mail-client/evolution/Manifest | 7 | ||||
-rw-r--r-- | mail-client/evolution/evolution-3.38.4.ebuild | 154 | ||||
-rw-r--r-- | mail-client/evolution/evolution-3.40.0.ebuild | 154 | ||||
-rw-r--r-- | mail-client/evolution/evolution-3.40.1.ebuild | 2 | ||||
-rw-r--r-- | mail-client/evolution/files/3.38-PrintableOptions.cmake-Correct-variable-name-compari.patch | 75 |
5 files changed, 2 insertions, 390 deletions
diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest index 0f2e09d7dd7f..53ef2e8f5ee3 100644 --- a/mail-client/evolution/Manifest +++ b/mail-client/evolution/Manifest @@ -1,8 +1,3 @@ -AUX 3.38-PrintableOptions.cmake-Correct-variable-name-compari.patch 2612 BLAKE2B f13ce141ff1d8001419f1cecb0dbd67c9426415de604f2607a7626fdcc859bd94b5e87934356cec4c8e98a107b38050258e8d8c9a9de15a1128914b124660d26 SHA512 677cba47dbaffc7e4eccf915984d33ae8353d07da53e8b01ae6b5144d2bd7298f2f350221525f91b8233f25afda2c120dfbd6e7d785a2efbca031e21ee933f61 -DIST evolution-3.38.4.tar.xz 12165500 BLAKE2B 0f60774fab861bb5999a5cbafa04de96e02b01092f257f0bd31d13eafb31c89b17994d0d013ee80b40e7b1af37ad8966c4a93379d138488a63280ca24062edba SHA512 b27f5e495d039a0a274ec2e68654abec64ea9cf81fe9a46b3a460a49325b1dcbe86ab1a7bbd9912254406c8faddc115b7a59a736dec42e1ca641edcc340743a8 -DIST evolution-3.40.0.tar.xz 12215660 BLAKE2B fb60c2dd45cae22d8095cf0f7a0f4691816f3a5a3417b9bf3af2a6171f86d63b32bf8efd3a57fb665f22c6a07491d25fa685c60c198a1ddd50533b5ef18ae626 SHA512 9d672143213e5b37a15b8667b0c6cc6d6217cff981569fa937309839926607e3ef1f39743a5a1cf9ab2a181413fed85c4b36bb4dbf21dee492753d17d7f88548 DIST evolution-3.40.1.tar.xz 12223944 BLAKE2B 00e37d45c5139e77ab9461948185467c9d2fadd3b315bdc65b6a55fe78e605a1eb65479ced304fc0d5a2bd2acf813164fc567254ad8e692701823420195c810a SHA512 acebe937e7bce5e998b86ceb8e53b07ffc9f558543b72cc5d68a54ca2714684bdf3f22726f243754c6ecea7205ccb1b9411095e9c62ca7f9890d2edb0a0b0d00 -EBUILD evolution-3.38.4.ebuild 4261 BLAKE2B 4243992127d42fcfab3ee3ebb681c6d533524058c0df34193114d498dc9500e3a74794784a392f52fa17e666d947263ec565041f7c822271c5f0a3df4078279a SHA512 a519e6a61aa62ae684b98e8aa49da6addab5f546ddc196df657b8e4da5ee5b8b3010259bc33a8b1e3a75a5e1a79606064d3f499730f03f6233d13f6b35aa62cb -EBUILD evolution-3.40.0.ebuild 4263 BLAKE2B 4b2c9ea5f66a9be30a69df8064ec774dce2ae21905b950dc6880d494c5074b32eafe997b0ff082bfb123e8398dfcab470dee1b6931642023d9f5d32baac1f8e0 SHA512 54a237d3d15086617925b38ed7fddc1a72a38ae1b72cd62fe16f65ddefcabcbdf056bff68eeb57b5b126d79da33e7914e3ceab398b174ba2d8ab08abbed0e80f -EBUILD evolution-3.40.1.ebuild 4176 BLAKE2B 0ca9c2838cd05916d7d79f3b39c751298bd52803494ed195d6dcf5acce89b53504701f9b9e364787e722b51bee0740bcbd09c5f80586d0adb8ecc8f1bfb002d0 SHA512 38663f3563dcee27f007be6d67c22ad9f35f9acd96dfd86eca51329b16ba266a34b21a51689ad5f99c7c5da587e7961b0f4a225833aa72e7926c3c21baf0f2e5 +EBUILD evolution-3.40.1.ebuild 4174 BLAKE2B 934f54e05123d518ebc4d8b2df4e545da85a50d8d23d1e20b9d59f4489fc741a68e98fa79cf0abfb288038e0e8adfe4d26296279c59d90f4f585fad9da776821 SHA512 b0fbe1e12c1fbb7b047a81f3f99ef6e6fcc360e6f319f7d6e751f38e2134bce15d6d381964a5d30c541493a356a1ba4b119ace6c9f200bfdfccfea597657036c MISC metadata.xml 1077 BLAKE2B b13424249bbf1c221b3d0981de923917fe7fd873666626104f28a528bd44a40011202b397992a32ed62886c7b637160ae61d4a323d37248c222d3b179b2cccf1 SHA512 0308a366fd296da924b5ab466d90acb4bd18b868769d06726bd7de94d92d88ac70d97c1eb8ce99ad493d45c528d0fd6d222b2eb9880cdac48d05859d1ec7709c diff --git a/mail-client/evolution/evolution-3.38.4.ebuild b/mail-client/evolution/evolution-3.38.4.ebuild deleted file mode 100644 index 3dbfedc6526c..000000000000 --- a/mail-client/evolution/evolution-3.38.4.ebuild +++ /dev/null @@ -1,154 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake gnome2 flag-o-matic readme.gentoo-r1 - -DESCRIPTION="Integrated mail, addressbook and calendaring functionality" -HOMEPAGE="https://wiki.gnome.org/Apps/Evolution" - -# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+". -LICENSE="|| ( LGPL-2 LGPL-3 ) CC-BY-SA-3.0 FDL-1.3+ OPENLDAP" -SLOT="2.0" - -IUSE="archive +bogofilter geolocation gtk-doc highlight ldap spamassassin spell ssl +weather ytnef" - -KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86" - -# glade-3 support is for maintainers only per configure.ac -# pst is not mature enough and changes API/ABI frequently -# dconf explicitely needed for backup plugin -# gnome-desktop support is optional with --enable-gnome-desktop -# automagic libunity dep -# >=gspell-1.8 to ensure it uses enchant:2 like webkit-gtk -DEPEND=" - >=app-crypt/gcr-3.4:=[gtk] - >=app-text/enchant-2.2.0:2 - >=dev-libs/glib-2.46:2[dbus] - >=dev-libs/libxml2-2.7.3:2 - >=gnome-base/gnome-desktop-2.91.3:3= - >=gnome-base/gsettings-desktop-schemas-2.91.92 - >=gnome-extra/evolution-data-server-${PV}:=[gtk,weather?] - >=media-libs/libcanberra-0.25[gtk3] - >=net-libs/libsoup-2.42:2.4 - >=net-libs/webkit-gtk-2.28.0:4[spell?] - >=x11-libs/cairo-1.9.15:=[glib] - >=x11-libs/gdk-pixbuf-2.24:2 - >=x11-libs/gtk+-3.22:3 - >=x11-libs/libnotify-0.7:= - >=x11-misc/shared-mime-info-0.22 - - >=app-text/iso-codes-0.49 - dev-libs/atk - gnome-base/dconf - x11-libs/libSM - x11-libs/libICE - - archive? ( >=app-arch/gnome-autoar-0.1.1[gtk] ) - bogofilter? ( mail-filter/bogofilter ) - geolocation? ( - >=media-libs/libchamplain-0.12:0.12[gtk] - >=media-libs/clutter-1.0.0:1.0 - >=media-libs/clutter-gtk-0.90:1.0 - >=sci-geosciences/geocode-glib-3.10.0 - x11-libs/mx:1.0 ) - ldap? ( >=net-nds/openldap-2:= ) - spamassassin? ( mail-filter/spamassassin ) - spell? ( >=app-text/gspell-1.8:= ) - ssl? ( - >=dev-libs/nspr-4.6.1:= - >=dev-libs/nss-3.11:= ) - weather? ( >=dev-libs/libgweather-3.10:2= ) - ytnef? ( net-mail/ytnef ) -" -RDEPEND="${DEPEND} - highlight? ( app-text/highlight ) -" -BDEPEND=" - app-text/docbook-xml-dtd:4.1.2 - dev-util/gdbus-codegen - dev-util/glib-utils - dev-util/itstool - gtk-doc? ( dev-util/gtk-doc - app-text/docbook-xml-dtd:4.3 ) - >=dev-util/intltool-0.40.0 - >=sys-devel/gettext-0.18.3 - virtual/pkgconfig -" - -DISABLE_AUTOFORMATTING="yes" -DOC_CONTENTS="To change the default browser if you are not using GNOME, edit -~/.local/share/applications/mimeapps.list so it includes the -following content: - -[Default Applications] -x-scheme-handler/http=firefox.desktop -x-scheme-handler/https=firefox.desktop - -(replace firefox.desktop with the name of the appropriate .desktop -file from /usr/share/applications if you use a different browser)." - -# global scope PATCHES or DOCS array mustn't be used due to double default_src_prepare -# call; if needed, set them after cmake_src_prepare call, if that works - -src_prepare() { - cmake_src_prepare - gnome2_src_prepare - - eapply "${FILESDIR}"/3.38-PrintableOptions.cmake-Correct-variable-name-compari.patch -} - -src_configure() { - # Use NSS/NSPR only if 'ssl' is enabled. - local mycmakeargs=( - -DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc - -DENABLE_SCHEMAS_COMPILE=OFF - -DENABLE_GTK_DOC=$(usex gtk-doc) - -DWITH_OPENLDAP=$(usex ldap) - -DENABLE_SMIME=$(usex ssl) - -DENABLE_GNOME_DESKTOP=ON - -DWITH_ENCHANT_VERSION=2 - -DENABLE_CANBERRA=ON - -DENABLE_AUTOAR=$(usex archive) - -DWITH_HELP=ON - -DENABLE_YTNEF=OFF - -DWITH_BOGOFILTER=$(usex bogofilter) - -DWITH_SPAMASSASSIN=$(usex spamassassin) - -DENABLE_GSPELL=$(usex spell) - -DENABLE_TEXT_HIGHLIGHT=$(usex highlight) - -DENABLE_WEATHER=$(usex weather) - -DENABLE_CONTACT_MAPS=$(usex geolocation) - -DENABLE_YTNEF=$(usex ytnef) - -DENABLE_PST_IMPORT=OFF - -DWITH_GLADE_CATALOG=OFF - ) - - cmake_src_configure -} - -src_compile() { - cmake_src_compile -} - -src_test() { - cmake_src_test -} - -src_install() { - cmake_src_install - - # Problems with prelink: - # https://bugzilla.gnome.org/show_bug.cgi?id=731680 - # https://bugzilla.gnome.org/show_bug.cgi?id=732148 - # https://bugzilla.redhat.com/show_bug.cgi?id=1114538 - echo PRELINK_PATH_MASK=/usr/bin/evolution > ${T}/99${PN} - doenvd "${T}"/99${PN} - - readme.gentoo_create_doc -} - -pkg_postinst() { - gnome2_pkg_postinst - readme.gentoo_print_elog -} diff --git a/mail-client/evolution/evolution-3.40.0.ebuild b/mail-client/evolution/evolution-3.40.0.ebuild deleted file mode 100644 index 481df3906619..000000000000 --- a/mail-client/evolution/evolution-3.40.0.ebuild +++ /dev/null @@ -1,154 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake gnome2 flag-o-matic readme.gentoo-r1 - -DESCRIPTION="Integrated mail, addressbook and calendaring functionality" -HOMEPAGE="https://wiki.gnome.org/Apps/Evolution" - -# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+". -LICENSE="|| ( LGPL-2 LGPL-3 ) CC-BY-SA-3.0 FDL-1.3+ OPENLDAP" -SLOT="2.0" - -IUSE="archive +bogofilter geolocation gtk-doc highlight ldap spamassassin spell ssl +weather ytnef" - -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" - -# glade-3 support is for maintainers only per configure.ac -# pst is not mature enough and changes API/ABI frequently -# dconf explicitely needed for backup plugin -# gnome-desktop support is optional with --enable-gnome-desktop -# automagic libunity dep -# >=gspell-1.8 to ensure it uses enchant:2 like webkit-gtk -DEPEND=" - >=app-crypt/gcr-3.4:=[gtk] - >=app-text/enchant-2.2.0:2 - >=dev-libs/glib-2.56:2[dbus] - >=dev-libs/libxml2-2.7.3:2 - >=gnome-base/gnome-desktop-2.91.3:3= - >=gnome-base/gsettings-desktop-schemas-2.91.92 - >=gnome-extra/evolution-data-server-${PV}:=[gtk,weather?] - >=media-libs/libcanberra-0.25[gtk3] - >=net-libs/libsoup-2.42:2.4 - >=net-libs/webkit-gtk-2.28.0:4[spell?] - >=x11-libs/cairo-1.9.15:=[glib] - >=x11-libs/gdk-pixbuf-2.24:2 - >=x11-libs/gtk+-3.22:3 - >=x11-libs/libnotify-0.7:= - >=x11-misc/shared-mime-info-0.22 - - >=app-text/iso-codes-0.49 - dev-libs/atk - gnome-base/dconf - x11-libs/libSM - x11-libs/libICE - - archive? ( >=app-arch/gnome-autoar-0.1.1[gtk] ) - bogofilter? ( mail-filter/bogofilter ) - geolocation? ( - >=media-libs/libchamplain-0.12:0.12[gtk] - >=media-libs/clutter-1.0.0:1.0 - >=media-libs/clutter-gtk-0.90:1.0 - >=sci-geosciences/geocode-glib-3.10.0 - x11-libs/mx:1.0 ) - ldap? ( >=net-nds/openldap-2:= ) - spamassassin? ( mail-filter/spamassassin ) - spell? ( >=app-text/gspell-1.8:= ) - ssl? ( - >=dev-libs/nspr-4.6.1:= - >=dev-libs/nss-3.11:= ) - weather? ( >=dev-libs/libgweather-3.10:2= ) - ytnef? ( net-mail/ytnef ) -" -RDEPEND="${DEPEND} - highlight? ( app-text/highlight ) -" -BDEPEND=" - app-text/docbook-xml-dtd:4.1.2 - dev-util/gdbus-codegen - dev-util/glib-utils - dev-util/itstool - gtk-doc? ( dev-util/gtk-doc - app-text/docbook-xml-dtd:4.3 ) - >=dev-util/intltool-0.40.0 - >=sys-devel/gettext-0.18.3 - virtual/pkgconfig -" - -DISABLE_AUTOFORMATTING="yes" -DOC_CONTENTS="To change the default browser if you are not using GNOME, edit -~/.local/share/applications/mimeapps.list so it includes the -following content: - -[Default Applications] -x-scheme-handler/http=firefox.desktop -x-scheme-handler/https=firefox.desktop - -(replace firefox.desktop with the name of the appropriate .desktop -file from /usr/share/applications if you use a different browser)." - -# global scope PATCHES or DOCS array mustn't be used due to double default_src_prepare -# call; if needed, set them after cmake_src_prepare call, if that works - -src_prepare() { - cmake_src_prepare - gnome2_src_prepare - - eapply "${FILESDIR}"/3.38-PrintableOptions.cmake-Correct-variable-name-compari.patch -} - -src_configure() { - # Use NSS/NSPR only if 'ssl' is enabled. - local mycmakeargs=( - -DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc - -DENABLE_SCHEMAS_COMPILE=OFF - -DENABLE_GTK_DOC=$(usex gtk-doc) - -DWITH_OPENLDAP=$(usex ldap) - -DENABLE_SMIME=$(usex ssl) - -DENABLE_GNOME_DESKTOP=ON - -DWITH_ENCHANT_VERSION=2 - -DENABLE_CANBERRA=ON - -DENABLE_AUTOAR=$(usex archive) - -DWITH_HELP=ON - -DENABLE_YTNEF=OFF - -DWITH_BOGOFILTER=$(usex bogofilter) - -DWITH_SPAMASSASSIN=$(usex spamassassin) - -DENABLE_GSPELL=$(usex spell) - -DENABLE_TEXT_HIGHLIGHT=$(usex highlight) - -DENABLE_WEATHER=$(usex weather) - -DENABLE_CONTACT_MAPS=$(usex geolocation) - -DENABLE_YTNEF=$(usex ytnef) - -DENABLE_PST_IMPORT=OFF - -DWITH_GLADE_CATALOG=OFF - ) - - cmake_src_configure -} - -src_compile() { - cmake_src_compile -} - -src_test() { - cmake_src_test -} - -src_install() { - cmake_src_install - - # Problems with prelink: - # https://bugzilla.gnome.org/show_bug.cgi?id=731680 - # https://bugzilla.gnome.org/show_bug.cgi?id=732148 - # https://bugzilla.redhat.com/show_bug.cgi?id=1114538 - echo PRELINK_PATH_MASK=/usr/bin/evolution > ${T}/99${PN} - doenvd "${T}"/99${PN} - - readme.gentoo_create_doc -} - -pkg_postinst() { - gnome2_pkg_postinst - readme.gentoo_print_elog -} diff --git a/mail-client/evolution/evolution-3.40.1.ebuild b/mail-client/evolution/evolution-3.40.1.ebuild index 9e0a1d3f5578..a37eb5ddf470 100644 --- a/mail-client/evolution/evolution-3.40.1.ebuild +++ b/mail-client/evolution/evolution-3.40.1.ebuild @@ -14,7 +14,7 @@ SLOT="2.0" IUSE="archive +bogofilter geolocation gtk-doc highlight ldap spamassassin spell ssl +weather ytnef" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86" # glade-3 support is for maintainers only per configure.ac # pst is not mature enough and changes API/ABI frequently diff --git a/mail-client/evolution/files/3.38-PrintableOptions.cmake-Correct-variable-name-compari.patch b/mail-client/evolution/files/3.38-PrintableOptions.cmake-Correct-variable-name-compari.patch deleted file mode 100644 index f7e8855bbe08..000000000000 --- a/mail-client/evolution/files/3.38-PrintableOptions.cmake-Correct-variable-name-compari.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 7cfe4190e3e72b40472d57871459f1b136393003 Mon Sep 17 00:00:00 2001 -From: Milan Crha <mcrha@redhat.com> -Date: Wed, 14 Apr 2021 16:58:08 +0200 -Subject: [PATCH] PrintableOptions.cmake: Correct variable name comparison - -CMake 3.20.1 errors out with: - -CMake Error at cmake/modules/PrintableOptions.cmake:38 (message): - variable name cannot be empty - Call Stack (most recent call first): - CMakeLists.txt:152 (add_printable_variable) - -Change how the parameter value is compared, to fix it. ---- - cmake/modules/PrintableOptions.cmake | 20 ++++++++++---------- - 1 file changed, 10 insertions(+), 10 deletions(-) - -diff --git a/cmake/modules/PrintableOptions.cmake b/cmake/modules/PrintableOptions.cmake -index ba1c9d0b7f..339f1da4b4 100644 ---- a/cmake/modules/PrintableOptions.cmake -+++ b/cmake/modules/PrintableOptions.cmake -@@ -19,40 +19,40 @@ - # prints all the build options previously added with the above functions - - macro(add_printable_variable_bare _name) -- if(_name STREQUAL "") -+ if("${_name}" STREQUAL "") - message(FATAL_ERROR "variable name cannot be empty") -- endif(_name STREQUAL "") -+ endif("${_name}" STREQUAL "") - list(APPEND _printable_options ${_name}) - endmacro() - - macro(add_printable_option _name _description _default_value) -- if(_name STREQUAL "") -+ if("${_name}" STREQUAL "") - message(FATAL_ERROR "option name cannot be empty") -- endif(_name STREQUAL "") -+ endif("${_name}" STREQUAL "") - option(${_name} ${_description} ${_default_value}) - add_printable_variable_bare(${_name}) - endmacro() - - macro(add_printable_variable _name _description _default_value) -- if(_name STREQUAL "") -+ if("${_name}" STREQUAL "") - message(FATAL_ERROR "variable name cannot be empty") -- endif(_name STREQUAL "") -+ endif("${_name}" STREQUAL "") - set(${_name} ${_default_value} CACHE STRING ${_description}) - add_printable_variable_bare(${_name}) - endmacro() - - macro(add_printable_variable_path _name _description _default_value) -- if(_name STREQUAL "") -+ if("${_name}" STREQUAL "") - message(FATAL_ERROR "path variable name cannot be empty") -- endif(_name STREQUAL "") -+ endif("${_name}" STREQUAL "") - set(${_name} ${_default_value} CACHE PATH ${_description}) - add_printable_variable_bare(${_name}) - endmacro() - - macro(add_printable_variable_filepath _name _description _default_value) -- if(_name STREQUAL "") -+ if("${_name}" STREQUAL "") - message(FATAL_ERROR "filepath variable name cannot be empty") -- endif(_name STREQUAL "") -+ endif("${_name}" STREQUAL "") - set(${_name} ${_default_value} CACHE FILEPATH ${_description}) - add_printable_variable_bare(${_name}) - endmacro() --- -2.26.3 - |