From e748ba9741f6540f4675c23e3e37b73e822c13a4 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 31 May 2021 20:59:14 +0100 Subject: gentoo resync : 31.05.2021 --- gnome-extra/evolution-ews/Manifest | 7 +-- .../evolution-ews/evolution-ews-3.38.4.ebuild | 71 ---------------------- .../evolution-ews/evolution-ews-3.40.0.ebuild | 71 ---------------------- .../evolution-ews/evolution-ews-3.40.1.ebuild | 2 +- .../files/evolution-ews-3.38.4-cmake-3.20.1.patch | 71 ---------------------- 5 files changed, 2 insertions(+), 220 deletions(-) delete mode 100644 gnome-extra/evolution-ews/evolution-ews-3.38.4.ebuild delete mode 100644 gnome-extra/evolution-ews/evolution-ews-3.40.0.ebuild delete mode 100644 gnome-extra/evolution-ews/files/evolution-ews-3.38.4-cmake-3.20.1.patch (limited to 'gnome-extra/evolution-ews') diff --git a/gnome-extra/evolution-ews/Manifest b/gnome-extra/evolution-ews/Manifest index 9bc00a5d9254..a469e53eaa59 100644 --- a/gnome-extra/evolution-ews/Manifest +++ b/gnome-extra/evolution-ews/Manifest @@ -1,8 +1,3 @@ -AUX evolution-ews-3.38.4-cmake-3.20.1.patch 2499 BLAKE2B 169eff8e666f732cf0040df67b834c32c351a6b6cfa09ff200dd5bb5aad6fa0be59a02722747c708ce1d7d448303d617054d2ccb1685cf2ab5c7aca3a80f4c1b SHA512 b5013334535f2fcfbba3a03767d9a8207dd5d6c7390ebbf97317973c481b93819c117eb103698bc4aa980f8fa27cda04671eba1f25d8ce62dfb22c05225017a3 -DIST evolution-ews-3.38.4.tar.xz 651384 BLAKE2B e4f71d38ddef6347ba3c137bac2246a6f4ffb5990ac2b6d3be72549326ae579c0a0f2bf11d19ce578ea37b99d0f8613d8d6a7e2ac75b9381e3b8c96646e483fc SHA512 98c1fecfa45bb2fe8337a1da54f09ef620128e4bba28b008aab3117291f7df708e6676421f3b8514448d035f1288591e54642f1426830fca7ba0320e3f3a99fc -DIST evolution-ews-3.40.0.tar.xz 666148 BLAKE2B f8d7f6c917114e57bcc8ea93072f520069f7f183ce67ef5a5304c6721b3b9dae262ad5a2a8fc78b8ea75495f7f31f565b5db8e5bb02acaa5666ced15c0c3c5f2 SHA512 c5b0fdfbe455941444974738853a1c0346b77b96a483db8ff5b509a7c7dda90a0c1795749f3b17eeef4b3c2aceb06e51d2c5f9d784c0b6c17c78f8c37bc1c9af DIST evolution-ews-3.40.1.tar.xz 672448 BLAKE2B ac6548c2567dd1ca303def27a21974f93d44c1175e8474bebaa6576dc63f8624c32e9357186e2c1412ca2091412b17e0f244c60919652ede55fb77e1bb384b90 SHA512 8d0477b500ee1b0c6a9527f2d63fe0b4238862425a079729478a8df880f35e6a1166d2f8f77cafa73844351f0cffe171d857366c4527770d7436d8b4ace29b99 -EBUILD evolution-ews-3.38.4.ebuild 1462 BLAKE2B 8a7790c3a372f799b23060f14e13b0bb5bf8923f17cc7100c74af2fa48676dbc94bfb0fc46ea867e098beefce5ae46b06c93e52a15c935176a649d9e22404b4d SHA512 61760df6be1c7848a3ab1e5cf04b33f9d6f1ad393bad54b26138f9154861e4b09d45c44534c85db24cef85891a7e2a426b0264ecbc1871c27635a411f8910b46 -EBUILD evolution-ews-3.40.0.ebuild 1464 BLAKE2B aa9cf2a2aafed9c1900d7506e80b65dc55270618ee3978e8ccbeef37605617ec72f6c75c6ee304728a51ff8d659992c2af2859d0ecfa569c02d2a8149d1abfe4 SHA512 12890f61f4ce66e79156d6f507865b6aeebadd9fcc9df79b1d8ecbeae5cf84e212385dd77167ec825420ed94202d237dec888d112b801166f2c8ca96ca371bf2 -EBUILD evolution-ews-3.40.1.ebuild 1408 BLAKE2B 1d9a1cada17b2ccddf741b59f1b9171249f7ed899a469c2ab93c4d11c36c21ab9d30a73c811c64ac2432ef1083f7d57be78f6c4fd9b7ec7f9776781f157dcd6f SHA512 d89043f8af284e90ab7692eb25be59413af3f8c36534eddfbd81b021bb22439b8346a17213314c7b881fd33d795e752d29e3656a26dab064c1cd27a86dfd6b42 +EBUILD evolution-ews-3.40.1.ebuild 1406 BLAKE2B 3f9e641161aed979aeb855552dca3675183ca22390d3d1016e280416b227ba571b8af864ef02d5628f757ad33c6f523f50e269e6637958f36f7fe2375c777ffb SHA512 05b7067ab291bb6e126a2cdcaa28309ebc22669bd4a870762df1b292c0d0b34f0263f56fa652702606036c7816ea1ceb98d95d1bb9a41749259510244d594b2b MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 diff --git a/gnome-extra/evolution-ews/evolution-ews-3.38.4.ebuild b/gnome-extra/evolution-ews/evolution-ews-3.38.4.ebuild deleted file mode 100644 index adff76ede31a..000000000000 --- a/gnome-extra/evolution-ews/evolution-ews-3.38.4.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake gnome2 - -DESCRIPTION="Evolution module for connecting to Microsoft Exchange Web Services" -HOMEPAGE="https://wiki.gnome.org/Apps/Evolution" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="test" - -# libical-glib currently (2020-02-29) oddly behind USE=introspection -RDEPEND=" - dev-db/sqlite:3 - >=dev-libs/glib-2.46:2 - >=dev-libs/libical-3.0.5:0=[introspection(-)] - >=dev-libs/json-glib-1.0.4 - >=dev-libs/libmspack-0.4 - dev-libs/libxml2:2 - >=gnome-extra/evolution-data-server-${PV}:0= - >=mail-client/evolution-${PV}:2.0 - >=net-libs/libsoup-2.58:2.4 - >=x11-libs/gtk+-3.10:3 -" -DEPEND="${RDEPEND} - test? ( net-libs/uhttpmock ) -" -BDEPEND=" - dev-util/gdbus-codegen - dev-util/glib-utils - >=dev-util/intltool-0.35.5 - >=sys-devel/gettext-0.18.3 - virtual/pkgconfig -" - -# Unittests fail to find libevolution-ews.so -RESTRICT="test !test? ( test )" - -# 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 - - eapply "${FILESDIR}"/${PN}-3.38.4-cmake-3.20.1.patch - - gnome2_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DWITH_MSPACK=ON - -DENABLE_TESTS=$(usex test) - ) - cmake_src_configure -} - -src_compile() { - cmake_src_compile -} - -src_test() { - cmake_src_test -} - -src_install() { - cmake_src_install -} diff --git a/gnome-extra/evolution-ews/evolution-ews-3.40.0.ebuild b/gnome-extra/evolution-ews/evolution-ews-3.40.0.ebuild deleted file mode 100644 index 394ab53f0341..000000000000 --- a/gnome-extra/evolution-ews/evolution-ews-3.40.0.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake gnome2 - -DESCRIPTION="Evolution module for connecting to Microsoft Exchange Web Services" -HOMEPAGE="https://wiki.gnome.org/Apps/Evolution" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="test" - -# libical-glib currently (2020-02-29) oddly behind USE=introspection -RDEPEND=" - dev-db/sqlite:3 - >=dev-libs/glib-2.62:2 - >=dev-libs/libical-3.0.5:0=[introspection(-)] - >=dev-libs/json-glib-1.0.4 - >=dev-libs/libmspack-0.4 - dev-libs/libxml2:2 - >=gnome-extra/evolution-data-server-${PV}:0= - >=mail-client/evolution-${PV}:2.0 - >=net-libs/libsoup-2.58:2.4 - >=x11-libs/gtk+-3.10:3 -" -DEPEND="${RDEPEND} - test? ( net-libs/uhttpmock ) -" -BDEPEND=" - dev-util/gdbus-codegen - dev-util/glib-utils - >=dev-util/intltool-0.35.5 - >=sys-devel/gettext-0.18.3 - virtual/pkgconfig -" - -# Unittests fail to find libevolution-ews.so -RESTRICT="test !test? ( test )" - -# 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 - - eapply "${FILESDIR}"/${PN}-3.38.4-cmake-3.20.1.patch - - gnome2_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DWITH_MSPACK=ON - -DENABLE_TESTS=$(usex test) - ) - cmake_src_configure -} - -src_compile() { - cmake_src_compile -} - -src_test() { - cmake_src_test -} - -src_install() { - cmake_src_install -} diff --git a/gnome-extra/evolution-ews/evolution-ews-3.40.1.ebuild b/gnome-extra/evolution-ews/evolution-ews-3.40.1.ebuild index 2088827c2022..cf149d49e105 100644 --- a/gnome-extra/evolution-ews/evolution-ews-3.40.1.ebuild +++ b/gnome-extra/evolution-ews/evolution-ews-3.40.1.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Evolution" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="test" # libical-glib currently (2020-02-29) oddly behind USE=introspection diff --git a/gnome-extra/evolution-ews/files/evolution-ews-3.38.4-cmake-3.20.1.patch b/gnome-extra/evolution-ews/files/evolution-ews-3.38.4-cmake-3.20.1.patch deleted file mode 100644 index 050bacd7628c..000000000000 --- a/gnome-extra/evolution-ews/files/evolution-ews-3.38.4-cmake-3.20.1.patch +++ /dev/null @@ -1,71 +0,0 @@ -https://gitlab.gnome.org/GNOME/evolution-ews/-/commit/6d8f7d303ec319539add2f0ba5331c2dab9d23c7.patch -https://bugs.gentoo.org/783603 - -From 6d8f7d303ec319539add2f0ba5331c2dab9d23c7 Mon Sep 17 00:00:00 2001 -From: Milan Crha -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. ---- 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() --- -GitLab -- cgit v1.2.3