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-data-server/Manifest | 7 +- .../evolution-data-server-3.38.4.ebuild | 153 --------------------- .../evolution-data-server-3.40.0.ebuild | 153 --------------------- .../evolution-data-server-3.40.1.ebuild | 2 +- ...tions.cmake-Correct-variable-name-compari.patch | 75 ---------- 5 files changed, 2 insertions(+), 388 deletions(-) delete mode 100644 gnome-extra/evolution-data-server/evolution-data-server-3.38.4.ebuild delete mode 100644 gnome-extra/evolution-data-server/evolution-data-server-3.40.0.ebuild delete mode 100644 gnome-extra/evolution-data-server/files/3.38-PrintableOptions.cmake-Correct-variable-name-compari.patch (limited to 'gnome-extra/evolution-data-server') diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest index 445759d5f931..396096ac2578 100644 --- a/gnome-extra/evolution-data-server/Manifest +++ b/gnome-extra/evolution-data-server/Manifest @@ -1,10 +1,5 @@ AUX 3.36.5-gtk-doc-1.32-compat.patch 1016 BLAKE2B 6458aa6e2bb41ce07bf74910ef36aafab895dec6e85c4262c346bbe518165ca2ca7778e3d97182d4f6c619313ed016a186dc88fd349a9bd1770441afb09f6e01 SHA512 3a43ee8128896eccdc35e65155aba5d38a4311cd8d848f506cba3473248595ea078b748c639b9a5f11842272b5e212a01d714a3177e4cd1e95d15680081feaa5 -AUX 3.38-PrintableOptions.cmake-Correct-variable-name-compari.patch 2610 BLAKE2B d3c4f0e7fd9a2ba4882c01b673aab638ce7ef299708b23676bf40b0276329c478576ae4e818483ee158b5407b5b454fe81b83d6c0d04b0dccf9329fb564761b4 SHA512 33061b7bca017044bf7a795ebbe3231bb7db705d1b5c123dc44992b7bfee8d31ec7e3181b7cea85c029c84bed3fee4f475375dabc63541af50f205630a580a73 AUX calentry.schema 3661 BLAKE2B 0235e8d98d1367f209a31cc74da9563d53dfc12ca34e020f63a18fcb73c13345e58a9e4a9f5bb3e14a7774bdcd279118d84d971a4b164c8ce41cd26798efabdd SHA512 56606848319539b8c9af732a5d572db44e2d7da433b1689ef7f14a283880951e10d5fc39f27245a7ddc8f0cb2e7563a757060020c17e5411f875cae10b119834 -DIST evolution-data-server-3.38.4.tar.xz 4663372 BLAKE2B 1be9159e210b88577dd367a64967aca1facea1c2f4a1611bdf773f8d01c2f4bacfa0eaaca37a9f094570c7897fc4a7be89bd303ce0739bd7f2fc925ac148bd84 SHA512 0b70850519316dd361e6d04607f3f9e4afe1bd0869a34e8403f02cefa7cc5ee683645031e337b6dcba4d89461aa7954e8d36d9c5b1c5bf12fd53b5411b908c3f -DIST evolution-data-server-3.40.0.tar.xz 4623568 BLAKE2B 4c0b8de1eb9129e351f90477f06bcaa6b9f37b0d616df3dc2c53635e0f2ea3520546be7f88dd1ee68d32a37b385e68f5c48ca79d36c63a0f9d10261b557162c4 SHA512 d31ef0d270ef64909150c0e087835bb6308125155664eee3375be6a59c9c43cd251e9617adbf819846a7d9bb73309ec51699159ee06465266193ad5dea3c0a00 DIST evolution-data-server-3.40.1.tar.xz 4625316 BLAKE2B d795183d07bc7b58a00e3c6f60d3704cf7e0cc6237b079c49f2e21dd7c22098c2b7b3fd2ca50fd3d9268aff8e5eaeea2e0e6c65d09c8bd68b7364445eb926c7c SHA512 47964a0965d412c329743423483c6694d078835b375d457aabe7e45a2b1b3406e4e0d4c1b855460f3c9b327d4d9320e659b0e43243816ec1e9bc49d0fea90f7d -EBUILD evolution-data-server-3.38.4.ebuild 4316 BLAKE2B a60df67c9cba4bed928bddf01032f8ee669333fb3633f855912e1a03226b80808d46519e0c45aba4bc8bf417421ce803b899ba52d1a3abd8af990216f45f87f4 SHA512 4f821b8f78ae200a5f33e26323d0ec878356e3605ed151b63fe5dfad481e11cd56f25fc65aaca1f822e9d154c227ac7ac34b181d37f059fd5dc8842d5c4a6419 -EBUILD evolution-data-server-3.40.0.ebuild 4326 BLAKE2B 1711c611fc19269812011ed6d0a771ba03991ad9114081d971a40b8bb61f0cdf8e302c7e69ef9f5966fb7620fbc3a2017cddaf80cd8dde077ce041aab80c2344 SHA512 3eb72fd7633a1f2611ca72536ad0700e2ee6df037fddf1eef6f9cdc36ec28919335e3d91e9bf36a9bb9545628ccdb8291e7156a0de820070773dcb9c560313a8 -EBUILD evolution-data-server-3.40.1.ebuild 4240 BLAKE2B 174c00b54304e86aa8197988fe2f5352ac3f53513d6f3e8ae4d98777a812dee8fdaa6697f6b6506b2dbb8dba21583a840b1c4f9778e5fcc37d32a40a221f885b SHA512 9dafa06c7614caab9ca4b8ccd07d783c6d3a31294e6a5c38df0534883edf784b920a9bfdceb9a8c35f424694c44ac2cf41216e4bfa1bd833038ba0945ae2c96b +EBUILD evolution-data-server-3.40.1.ebuild 4237 BLAKE2B 7f3f06fc021957a494ea0667a42df74aa086a1ff6bbd80ca74e0e5b2dd0eb3082581c9a1af99436e4b42b89210ef1b673c4c0ccc243de89ca55b8f546ec11b5c SHA512 d26011bdd56fa5f51254313d820975aaf93c209bd158f3420e71c450f556da0706a0e999c80684ebaed8a32de9096329bd69938335288b43153fcbe535b7dcae MISC metadata.xml 849 BLAKE2B a02a770ca4498189e14588af9aa58d82a7e28fbbfd99d891dfaa7e4148c71a0d7c89ae33a6b41899a174fd6dfa8ba012a2c0a3e342b58c8d84369010859f4b8c SHA512 da5fba1f5313c6bb027d870279ead3f9cf6da27a3fed183dced79abaaf3de4bbbc49076a01968e3af5dbe004f1641c7f0773801a040ba824924955894bcbbb1a diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.38.4.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.38.4.ebuild deleted file mode 100644 index 1638eb60d284..000000000000 --- a/gnome-extra/evolution-data-server/evolution-data-server-3.38.4.ebuild +++ /dev/null @@ -1,153 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -VALA_USE_DEPEND="vapigen" - -inherit cmake db-use flag-o-matic gnome2 systemd vala virtualx - -DESCRIPTION="Evolution groupware backend" -HOMEPAGE="https://wiki.gnome.org/Apps/Evolution" - -# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+". -LICENSE="|| ( LGPL-2 LGPL-3 ) BSD Sleepycat" -SLOT="0/62-25-20" # subslot = libcamel-1.2/libedataserver-1.2/libebook-1.2.so soname version - -IUSE="berkdb +gnome-online-accounts +gtk gtk-doc +introspection ipv6 ldap kerberos oauth vala +weather" -REQUIRED_USE="vala? ( introspection )" - -KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris" - -# gdata-0.17.7 soft required for new gdata_feed_get_next_page_token API to handle more than 100 google tasks -# berkdb needed only for migrating old addressbook data from <3.13 versions, bug #519512 -gdata_depend=">=dev-libs/libgdata-0.17.7:=" -RDEPEND=" - >=app-crypt/gcr-3.4 - >=app-crypt/libsecret-0.5[crypt] - >=dev-db/sqlite-3.7.17:= - >=dev-libs/glib-2.46:2 - >=dev-libs/libical-3.0.8:=[glib,introspection?] - >=dev-libs/libxml2-2 - >=dev-libs/nspr-4.4:= - >=dev-libs/nss-3.9:= - >=net-libs/libsoup-2.58:2.4 - - dev-libs/icu:= - sys-libs/zlib:= - virtual/libiconv - - berkdb? ( >=sys-libs/db-4:= ) - gtk? ( - >=app-crypt/gcr-3.4[gtk] - >=x11-libs/gtk+-3.10:3 - >=media-libs/libcanberra-0.25[gtk3] - ) - oauth? ( - >=dev-libs/json-glib-1.0.4 - >=net-libs/webkit-gtk-2.28.0:4 - ${gdata_depend} - ) - gnome-online-accounts? ( - >=net-libs/gnome-online-accounts-3.8:= - ${gdata_depend} ) - introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) - kerberos? ( virtual/krb5:= ) - ldap? ( >=net-nds/openldap-2:= ) - weather? ( >=dev-libs/libgweather-3.10:2= ) -" -DEPEND="${RDEPEND} - vala? ( $(vala_depend) - net-libs/libsoup:2.4[vala] - dev-libs/libical[vala] - ) -" -BDEPEND=" - dev-util/gdbus-codegen - dev-util/glib-utils - dev-util/gperf - gtk-doc? ( >=dev-util/gtk-doc-1.14 - app-text/docbook-xml-dtd:4.1.2 ) - >=dev-util/intltool-0.35.5 - >=sys-devel/gettext-0.18.3 - virtual/pkgconfig -" - -# Some tests fail due to missing locales. -# Also, dbus tests are flaky, bugs #397975 #501834 -# It looks like a nightmare to disable those for now. -RESTRICT="test !test? ( test )" - -# global scope PATCHES or DOCS array mustn't be used due to double default_src_prepare call -src_prepare() { - use vala && vala_src_prepare - cmake_src_prepare - gnome2_src_prepare - - eapply "${FILESDIR}"/3.36.5-gtk-doc-1.32-compat.patch - eapply "${FILESDIR}"/3.38-PrintableOptions.cmake-Correct-variable-name-compari.patch - - # Make CMakeLists versioned vala enabled - sed -e "s;\(find_program(VALAC\) valac);\1 ${VALAC});" \ - -e "s;\(find_program(VAPIGEN\) vapigen);\1 ${VAPIGEN});" \ - -i "${S}"/CMakeLists.txt || die -} - -src_configure() { - # /usr/include/db.h is always db-1 on FreeBSD - # so include the right dir in CPPFLAGS - use berkdb && append-cppflags "-I$(db_includedir)" - - local google_enable - if use oauth || use gnome-online-accounts; then - google_enable="ON" - else - google_enable="OFF" - fi - - # phonenumber does not exist in tree - local mycmakeargs=( - -DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc - -DENABLE_GTK_DOC=$(usex gtk-doc) - -DWITH_PRIVATE_DOCS=$(usex gtk-doc) - -DENABLE_SCHEMAS_COMPILE=OFF - -DENABLE_INTROSPECTION=$(usex introspection) - -DWITH_KRB5=$(usex kerberos) - -DWITH_KRB5_INCLUDES=$(usex kerberos "${EPREFIX}"/usr "") - -DWITH_KRB5_LIBS=$(usex kerberos "${EPREFIX}"/usr/$(get_libdir) "") - -DWITH_OPENLDAP=$(usex ldap) - -DWITH_PHONENUMBER=OFF - -DENABLE_SMIME=ON - -DENABLE_GTK=$(usex gtk) - -DENABLE_CANBERRA=$(usex gtk) - -DENABLE_OAUTH2=$(usex oauth) - -DENABLE_EXAMPLES=OFF - -DENABLE_GOA=$(usex gnome-online-accounts) - -DWITH_LIBDB=$(usex berkdb "${EPREFIX}"/usr OFF) - # ENABLE_BACKTRACES requires libdwarf ? - -DENABLE_IPV6=$(usex ipv6) - -DENABLE_WEATHER=$(usex weather) - -DENABLE_GOOGLE=${google_enable} - -DENABLE_LARGEFILE=ON - -DENABLE_VALA_BINDINGS=$(usex vala) - ) - - cmake_src_configure -} - -src_compile() { - cmake_src_compile -} - -src_test() { - virtx cmake_src_test -} - -src_install() { - cmake_src_install - - if use ldap; then - insinto /etc/openldap/schema - doins "${FILESDIR}"/calentry.schema - dosym ../../../usr/share/${PN}/evolutionperson.schema /etc/openldap/schema/evolutionperson.schema - fi -} diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.40.0.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.40.0.ebuild deleted file mode 100644 index 339c57dfea0c..000000000000 --- a/gnome-extra/evolution-data-server/evolution-data-server-3.40.0.ebuild +++ /dev/null @@ -1,153 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -VALA_USE_DEPEND="vapigen" - -inherit cmake db-use flag-o-matic gnome2 systemd vala virtualx - -DESCRIPTION="Evolution groupware backend" -HOMEPAGE="https://wiki.gnome.org/Apps/Evolution" - -# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+". -LICENSE="|| ( LGPL-2 LGPL-3 ) BSD Sleepycat" -SLOT="0/62-26-20" # subslot = libcamel-1.2/libedataserver-1.2/libebook-1.2.so soname version - -IUSE="berkdb +gnome-online-accounts +gtk gtk-doc +introspection ipv6 ldap kerberos oauth vala +weather" -REQUIRED_USE="vala? ( introspection )" - -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris" - -# gdata-0.17.7 soft required for new gdata_feed_get_next_page_token API to handle more than 100 google tasks -# berkdb needed only for migrating old addressbook data from <3.13 versions, bug #519512 -gdata_depend=">=dev-libs/libgdata-0.17.7:=[vala?]" -RDEPEND=" - >=app-crypt/gcr-3.4 - >=app-crypt/libsecret-0.5[crypt] - >=dev-db/sqlite-3.7.17:= - >=dev-libs/glib-2.46:2 - >=dev-libs/libical-3.0.8:=[glib,introspection?] - >=dev-libs/libxml2-2 - >=dev-libs/nspr-4.4:= - >=dev-libs/nss-3.9:= - >=net-libs/libsoup-2.58:2.4 - - dev-libs/icu:= - sys-libs/zlib:= - virtual/libiconv - - berkdb? ( >=sys-libs/db-4:= ) - gtk? ( - >=app-crypt/gcr-3.4[gtk] - >=x11-libs/gtk+-3.16:3 - >=media-libs/libcanberra-0.25[gtk3] - ) - oauth? ( - >=dev-libs/json-glib-1.0.4 - >=net-libs/webkit-gtk-2.28.0:4 - ${gdata_depend} - ) - gnome-online-accounts? ( - >=net-libs/gnome-online-accounts-3.8:= - ${gdata_depend} ) - introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) - kerberos? ( virtual/krb5:= ) - ldap? ( >=net-nds/openldap-2:= ) - weather? ( >=dev-libs/libgweather-3.10:2= ) -" -DEPEND="${RDEPEND} - vala? ( $(vala_depend) - net-libs/libsoup:2.4[vala] - dev-libs/libical[vala] - ) -" -BDEPEND=" - dev-util/gdbus-codegen - dev-util/glib-utils - dev-util/gperf - gtk-doc? ( >=dev-util/gtk-doc-1.14 - app-text/docbook-xml-dtd:4.1.2 ) - >=dev-util/intltool-0.35.5 - >=sys-devel/gettext-0.18.3 - virtual/pkgconfig -" - -# Some tests fail due to missing locales. -# Also, dbus tests are flaky, bugs #397975 #501834 -# It looks like a nightmare to disable those for now. -RESTRICT="test !test? ( test )" - -# global scope PATCHES or DOCS array mustn't be used due to double default_src_prepare call -src_prepare() { - use vala && vala_src_prepare - cmake_src_prepare - gnome2_src_prepare - - eapply "${FILESDIR}"/3.36.5-gtk-doc-1.32-compat.patch - eapply "${FILESDIR}"/3.38-PrintableOptions.cmake-Correct-variable-name-compari.patch - - # Make CMakeLists versioned vala enabled - sed -e "s;\(find_program(VALAC\) valac);\1 ${VALAC});" \ - -e "s;\(find_program(VAPIGEN\) vapigen);\1 ${VAPIGEN});" \ - -i "${S}"/CMakeLists.txt || die -} - -src_configure() { - # /usr/include/db.h is always db-1 on FreeBSD - # so include the right dir in CPPFLAGS - use berkdb && append-cppflags "-I$(db_includedir)" - - local google_enable - if use oauth || use gnome-online-accounts; then - google_enable="ON" - else - google_enable="OFF" - fi - - # phonenumber does not exist in tree - local mycmakeargs=( - -DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc - -DENABLE_GTK_DOC=$(usex gtk-doc) - -DWITH_PRIVATE_DOCS=$(usex gtk-doc) - -DENABLE_SCHEMAS_COMPILE=OFF - -DENABLE_INTROSPECTION=$(usex introspection) - -DWITH_KRB5=$(usex kerberos) - -DWITH_KRB5_INCLUDES=$(usex kerberos "${EPREFIX}"/usr "") - -DWITH_KRB5_LIBS=$(usex kerberos "${EPREFIX}"/usr/$(get_libdir) "") - -DWITH_OPENLDAP=$(usex ldap) - -DWITH_PHONENUMBER=OFF - -DENABLE_SMIME=ON - -DENABLE_GTK=$(usex gtk) - -DENABLE_CANBERRA=$(usex gtk) - -DENABLE_OAUTH2=$(usex oauth) - -DENABLE_EXAMPLES=OFF - -DENABLE_GOA=$(usex gnome-online-accounts) - -DWITH_LIBDB=$(usex berkdb "${EPREFIX}"/usr OFF) - # ENABLE_BACKTRACES requires libdwarf ? - -DENABLE_IPV6=$(usex ipv6) - -DENABLE_WEATHER=$(usex weather) - -DENABLE_GOOGLE=${google_enable} - -DENABLE_LARGEFILE=ON - -DENABLE_VALA_BINDINGS=$(usex vala) - ) - - cmake_src_configure -} - -src_compile() { - cmake_src_compile -} - -src_test() { - virtx cmake_src_test -} - -src_install() { - cmake_src_install - - if use ldap; then - insinto /etc/openldap/schema - doins "${FILESDIR}"/calentry.schema - dosym ../../../usr/share/${PN}/evolutionperson.schema /etc/openldap/schema/evolutionperson.schema - fi -} diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.40.1.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.40.1.ebuild index 02f51c3698ce..5219b100f94f 100644 --- a/gnome-extra/evolution-data-server/evolution-data-server-3.40.1.ebuild +++ b/gnome-extra/evolution-data-server/evolution-data-server-3.40.1.ebuild @@ -16,7 +16,7 @@ SLOT="0/62-26-20" # subslot = libcamel-1.2/libedataserver-1.2/libebook-1.2.so so IUSE="berkdb +gnome-online-accounts +gtk gtk-doc +introspection ipv6 ldap kerberos oauth vala +weather" REQUIRED_USE="vala? ( introspection )" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris" # gdata-0.17.7 soft required for new gdata_feed_get_next_page_token API to handle more than 100 google tasks # berkdb needed only for migrating old addressbook data from <3.13 versions, bug #519512 diff --git a/gnome-extra/evolution-data-server/files/3.38-PrintableOptions.cmake-Correct-variable-name-compari.patch b/gnome-extra/evolution-data-server/files/3.38-PrintableOptions.cmake-Correct-variable-name-compari.patch deleted file mode 100644 index 95546b6daaa2..000000000000 --- a/gnome-extra/evolution-data-server/files/3.38-PrintableOptions.cmake-Correct-variable-name-compari.patch +++ /dev/null @@ -1,75 +0,0 @@ -From c95a70bfeae25ba11fbe50fe759a6cdb29388e44 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. ---- - 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 ba1c9d0b7..339f1da4b 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 - -- cgit v1.2.3