gentoo resync : 20.03.2022

3 files changed, 3 insertions, 159 deletions

diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
index 934d9d353d57..50da2b6c96a9 100644
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -1,7 +1,5 @@
 AUX 3.36.5-gtk-doc-1.32-compat.patch 1016 BLAKE2B 6458aa6e2bb41ce07bf74910ef36aafab895dec6e85c4262c346bbe518165ca2ca7778e3d97182d4f6c619313ed016a186dc88fd349a9bd1770441afb09f6e01 SHA512 3a43ee8128896eccdc35e65155aba5d38a4311cd8d848f506cba3473248595ea078b748c639b9a5f11842272b5e212a01d714a3177e4cd1e95d15680081feaa5
 AUX calentry.schema 3661 BLAKE2B 0235e8d98d1367f209a31cc74da9563d53dfc12ca34e020f63a18fcb73c13345e58a9e4a9f5bb3e14a7774bdcd279118d84d971a4b164c8ce41cd26798efabdd SHA512 56606848319539b8c9af732a5d572db44e2d7da433b1689ef7f14a283880951e10d5fc39f27245a7ddc8f0cb2e7563a757060020c17e5411f875cae10b119834
-DIST evolution-data-server-3.40.4.tar.xz 4622640 BLAKE2B 93a4570da53fb34b496cd471e5daff07fa044ed5c230f7de85276ab9aacd0f2e6c6f749a0d63d076fc192e695f68a0c451a7a6573621ff5092cd5ea6a9302ee2 SHA512 664c2d41b6f212e6ddef554767ca651e4179ce861898cb11ed373f30473c2a1a3a47191ae504be7d38beb0e721782564b70f5f519a3184216a02be1bd89678b5
-DIST evolution-data-server-3.42.3.tar.xz 4622976 BLAKE2B 41dc75929f8e1067f93f2f05e9c9a036274625722266e023e79d8415d3b38c74c18fd47225b23dfe03ed6ec8a34234bbeca11a6f7224825abea3c030b683ea3e SHA512 2c50e1c381b70e478d8dd6d548a3ae0228cd60619a3c3d660d4a291d7b986b42c7d5b262d57f6fc4aacf0623c084edb59353f3f2d5ada9f39747a2a94627176b
-EBUILD evolution-data-server-3.40.4.ebuild 4327 BLAKE2B a48594fcfc6e193d5e31f3f46c2df1afdd2ab9126db45bc05b4f7143c7aeaff306513e18eace0886a00b675fcb8a47afbeeef477384d54223f112f6f51c52b95 SHA512 289672fb429342cc47d7bf61906658fad63a519d7e8c09433f39d558bc7318c2a5feb427504e5b86eb2c937962ce75e5ff5c06214635601706438c67b840a7f6
-EBUILD evolution-data-server-3.42.3.ebuild 4379 BLAKE2B cf31bde4a61e4345825de1bed73899147da670b57a070e495782aa9bace79fb3c1f9c5e201c7dd319190f37c45f8fd9469a37225a4107e6f607c562359e63f22 SHA512 aa2a410c5b66465744deac23b1c43e0933177b68cdebd0186e5f922d4361bb6da518b604810b2044c5f4630898a149ddec7a5a7f61bbb9343a19a248d804705d
+DIST evolution-data-server-3.42.4.tar.xz 4623968 BLAKE2B e2ae0b4dfc6f34fac384093dd52b88fadce70c646d70c7df1758a6d514bcec1f092e8f4d8f28d50651201b45791112f811b94c8083487ca072bd002f6a11b75a SHA512 e2eba6ffeac2924366169cdae4258c7fc7d1172c2aa3a0ced83bea60556627b39ee9ee6f45a64081de232e0c2e801e2cbb19b6fa4a8958ad0f868c87e0b20f4a
+EBUILD evolution-data-server-3.42.4.ebuild 4376 BLAKE2B 269803dedeea343d5b0993d8a4e700033c2769b7afeea2a32b908b56eeb3494be3a7f4fab31836a1cea2f08599519349ccc0c72257808daf5e98ddf5d272d43a SHA512 523d2bddfe075265398855568ad655fef74fed840ca49837a6551df66c35cae695172e39272861b5ef47d7bbd4ab746af96363a5129e26eecf29dfc082001397
 MISC metadata.xml 850 BLAKE2B f3e730c63794d5890e76c1f2c7e388b1d6320fc6ef64fa405365a27e7d3883fd09b9cfd875ef0d774bdd51eae5237fff0fd7bd1e6be81a2e0d9252e0b1263afe SHA512 8657f87116f9ad70c24711f270f7b71a57e48bb4f9a8780900f9f6d3da550d0f7b6ae2da453ff6bb76ffd948935f534fdb4b3545a46b0129fbae68a8d1fcecdb
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.40.4.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.40.4.ebuild
deleted file mode 100644
index 266c3291aa5a..000000000000
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.40.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
-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 ~riscv ~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.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]
-		oauth? ( dev-libs/libgdata[vala] )
-		gnome-online-accounts? ( dev-libs/libgdata[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
-
-	# 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.42.3.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.42.4.ebuild
index 116b3be98c0f..d840fb3a2838 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.42.3.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.42.4.ebuild
@@ -16,7 +16,7 @@ SLOT="0/63-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 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~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