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 --- dev-libs/folks/Manifest | 7 +- .../folks/files/0.14.0-conditional-tests.patch | 72 --------------- dev-libs/folks/folks-0.14.0.ebuild | 100 --------------------- dev-libs/folks/folks-0.15.2.ebuild | 2 +- dev-libs/folks/metadata.xml | 1 - 5 files changed, 3 insertions(+), 179 deletions(-) delete mode 100644 dev-libs/folks/files/0.14.0-conditional-tests.patch delete mode 100644 dev-libs/folks/folks-0.14.0.ebuild (limited to 'dev-libs/folks') diff --git a/dev-libs/folks/Manifest b/dev-libs/folks/Manifest index 2e6a64dd94da..394cb34aee91 100644 --- a/dev-libs/folks/Manifest +++ b/dev-libs/folks/Manifest @@ -1,6 +1,3 @@ -AUX 0.14.0-conditional-tests.patch 2279 BLAKE2B 2b04f6cc1741de4d0efdaf2cef756c5879fe2d9ec988b8612658645c2fc46ce1bc5c96d3efb532e98c5e27a705d18d143e62e1a99a6505fa1f87162725f4ebe4 SHA512 b1742262a2b7fbc95b7417170640117578e77ad1498aff93ae6bd464952bd2d8ca773f3f0987378ccb743144a160c8bcac1a312eb796928f609745a567e98c6a -DIST folks-0.14.0.tar.xz 520924 BLAKE2B 3154e0a7e6fe8c60aa81f4772af2b9d09b88785187c87e93869f668af46549383866cfa2e50d3d29009d0acb77c26cd852c7c9a3c6188ff3e5ef53c06b11b781 SHA512 94dc025668ac34df203ea351430bf82dddb4e275d936e2b959a1b9a4cf0fff0218a4baa7d3a89c152a2cb21a94250d731c8e7470d50ac4b658fbe1448974a69e DIST folks-0.15.2.tar.xz 489236 BLAKE2B 63bcfedb88205b37c6e9595c3e0c34f7fc869045648e04042cce9300776e4b7d102f91312434545581882f0959502be7ba1bc2f77d50ec2af7f649444da9197d SHA512 c327e39b7cf32b72db3f84504f8ec2a4bc2d98693ca5ff21c3b544e37b58a1df9241dd1be541a39be83468b62dd0f5d7b5a3a0ca4bde5e94d1e075d77d3be505 -EBUILD folks-0.14.0.ebuild 2576 BLAKE2B 84fe21b7e0138b6d62a6666dcfa426ec85261008441ab2b7c3576e160615c57699ae4b6bcdeb6ceb0c9a00d183a0bc663b0e67c6bb2892bc8a7fafd13757a54f SHA512 c21b9a13e3e3b4fff805d9a713e85b4db03dcf151b55628b94652603586681fa020588bdcca234780ef6c95295113ce853899e1277daf72abafa4e80e3388a9a -EBUILD folks-0.15.2.ebuild 2210 BLAKE2B cb605b9befefb6c7375ede2a2dc0730d2d14bac8d5e18664cac68ea628eb5a57138e289709d99b6be99cfc654b00c9cd899337f4331525b4a32ad1af0787343d SHA512 fc066f9a57f573f942e6fc8f1afb3282b45e400ff0b3750a8f54cdb91932d4bb003d3bed78ec4debbe35a7186368345f4d29ed735c4425e65f620a3458a3c5c1 -MISC metadata.xml 477 BLAKE2B 59650bcd983e214f924509b128b6bfd45cd015bd3f98417716d366f9a05d932b0feacff410381db14afa18da12fcfaf09c0da2fb2f122e110a6a0858c6f2bd6d SHA512 eb009ee1180b529978596f9a838454f9226906ebd7f0218e29545326222cf04b08efad06e88bd6ab66fc7486022e4f27bb234f4709ac499f1b7df77276709423 +EBUILD folks-0.15.2.ebuild 2208 BLAKE2B 9bfcddb38405b7f34d2b9f6f032d44aeb1c8409b6fa34ec27dd95dc220bde2c3d8780f746b381c3321d588c6c3a8611f59165cfcc2a35a2ba57943d61983a803 SHA512 776f71fdeb56953d5160098482a649d08c1e15723d941263fd017bf1c46f807abcd3ce8d7e8b4651e646e1d919cdadb042b2888a1f904c3839492ddec8cbd1f5 +MISC metadata.xml 395 BLAKE2B 3d62bb67ea7cfa05371530d79d4953a1b8c33a1c17e6545dea2bc5736c5f751180f495d1966a403a77c84247a4b96a752d9505c6412138df382162520d235f2a SHA512 9097dde175eab9cc701a05ab5435ce6aedaeef984ec05392f60806ac12d16563f837b916cab1018a9440d427e17722381e27763060073d329704291910873cc1 diff --git a/dev-libs/folks/files/0.14.0-conditional-tests.patch b/dev-libs/folks/files/0.14.0-conditional-tests.patch deleted file mode 100644 index 2c64ecf6610f..000000000000 --- a/dev-libs/folks/files/0.14.0-conditional-tests.patch +++ /dev/null @@ -1,72 +0,0 @@ -From b9e27e284c481e876370e2eb73f95d0953fb9cda Mon Sep 17 00:00:00 2001 -From: Mart Raudsepp -Date: Sun, 23 Aug 2020 11:49:44 +0300 -Subject: [PATCH] meson: Allow disabling build of tests - -Fixes https://gitlab.gnome.org/GNOME/folks/-/issues/121 ---- - meson.build | 21 +++++++++++++-------- - meson_options.txt | 1 + - 2 files changed, 14 insertions(+), 8 deletions(-) - -diff --git a/meson.build b/meson.build -index 53d7dcc6..123edb5c 100644 ---- a/meson.build -+++ b/meson.build -@@ -54,6 +54,7 @@ folks_backend_dir = get_option('libdir') / 'folks' / '@0@'.format(folks_module_v - bluez_backend_enabled = get_option('bluez_backend') - docs_enabled = get_option('docs') - eds_backend_enabled = get_option('eds_backend') -+tests_enabled = get_option('tests') - installed_tests_enabled = get_option('installed_tests') - ofono_backend_enabled = get_option('ofono_backend') - telepathy_backend_enabled = get_option('telepathy_backend') -@@ -130,13 +131,15 @@ endif - - if bluez_backend_enabled - libebook_dep = dependency('libebook-1.2', version: '>=' + min_eds_version) -- # Needed for the BlueZ tests -- pymod = import('python') -- py_installation = pymod.find_installation('python3', -- modules: [ -- 'dbusmock', -- ], -- ) -+ if tests_enabled -+ # Needed for the BlueZ tests -+ pymod = import('python') -+ py_installation = pymod.find_installation('python3', -+ modules: [ -+ 'dbusmock', -+ ], -+ ) -+ endif - endif - - if import_tool_enabled -@@ -233,7 +236,9 @@ subdir('tools') - subdir('po') - - # Tests --subdir('tests') -+if tests_enabled -+ subdir('tests') -+endif - - if docs_enabled - subdir('docs') -diff --git a/meson_options.txt b/meson_options.txt -index 43cd586a..62a9603c 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -11,6 +11,7 @@ option('inspect_tool', type: 'boolean', value: true, description: 'Enable buildi - # Profiling - option('profiling', type: 'boolean', value: false, description: 'Enable profiling code') - # Test options -+option('tests', type: 'boolean', value: true, description: 'Build tests programs') - option('installed_tests', type: 'boolean', value: false, description: 'Install test programs') - # Docs - option('docs', type: 'boolean', value: false, description: 'Enable documentation generation') --- -2.20.1 - diff --git a/dev-libs/folks/folks-0.14.0.ebuild b/dev-libs/folks/folks-0.14.0.ebuild deleted file mode 100644 index 91619fbdf8c2..000000000000 --- a/dev-libs/folks/folks-0.14.0.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -VALA_USE_DEPEND="vapigen" -VALA_MAX_API_VERSION="0.48" -PYTHON_COMPAT=( python3_{7,8} ) - -inherit gnome.org gnome2-utils meson python-any-r1 vala xdg - -DESCRIPTION="Library for aggregating people from multiple sources" -HOMEPAGE="https://wiki.gnome.org/Projects/Folks" - -LICENSE="LGPL-2.1+" -SLOT="0/25" # subslot = libfolks soname version -KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-linux" - -IUSE="bluetooth eds +telepathy test tracker utils" -REQUIRED_USE="bluetooth? ( eds )" -RESTRICT="!test? ( test )" - -DEPEND=" - >=dev-libs/glib-2.44:2 - >=dev-libs/libgee-0.10:0.8[introspection] - >=dev-libs/gobject-introspection-1.54:= - telepathy? ( - >=net-libs/telepathy-glib-0.19.9 - dev-libs/dbus-glib - ) - tracker? ( app-misc/tracker:0/2.0 ) - eds? ( >=gnome-extra/evolution-data-server-3.33.2:= ) - dev-libs/libxml2:2 - utils? ( sys-libs/readline:0= ) -" -# telepathy-mission-control needed at runtime; it is used by the telepathy -# backend via telepathy-glib's AccountManager binding. -RDEPEND="${DEPEND} - bluetooth? ( >=net-wireless/bluez-5[obex] ) - telepathy? ( net-im/telepathy-mission-control ) -" -BDEPEND=" - >=dev-util/meson-0.49 - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig - $(vala_depend) - telepathy? ( net-libs/telepathy-glib[vala] ) - eds? ( gnome-extra/evolution-data-server[vala] ) - test? ( sys-apps/dbus - ${PYTHON_DEPS} - bluetooth? ( $(python_gen_any_dep 'dev-python/dbusmock[${PYTHON_USEDEP}]') ) - ) -" - -PATCHES=( - "${FILESDIR}"/${PV}-conditional-tests.patch -) - -python_check_deps() { - if use test && use bluetooth; then - has_version "dev-python/dbusmock[${PYTHON_USEDEP}]" - fi -} - -pkg_setup() { - use test && use bluetooth && python-any-r1_pkg_setup -} - -src_prepare() { - vala_src_prepare - xdg_src_prepare - # TODO: All tracker tests fail with SIGTRAP for some reason - investigate - sed -e '/subdir.*tracker/d' -i tests/meson.build || die -} - -src_configure() { - local emesonargs=( - $(meson_use bluetooth bluez_backend) - $(meson_use eds eds_backend) - $(meson_use eds ofono_backend) - $(meson_use telepathy telepathy_backend) - $(meson_use tracker tracker_backend) - -Dzeitgeist=false # last rited package - -Dimport_tool=true - $(meson_use utils inspect_tool) - $(meson_use test tests) - -Dinstalled_tests=false - -Ddocs=false # Needs find_program sedding to specific version; only dev docs, don't bother - ) - meson_src_configure -} - -pkg_postinst() { - xdg_pkg_postinst - gnome2_schemas_update -} - -pkg_postrm() { - xdg_pkg_postrm - gnome2_schemas_update -} diff --git a/dev-libs/folks/folks-0.15.2.ebuild b/dev-libs/folks/folks-0.15.2.ebuild index be6aff222324..f8cafe8b1d3d 100644 --- a/dev-libs/folks/folks-0.15.2.ebuild +++ b/dev-libs/folks/folks-0.15.2.ebuild @@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Folks" LICENSE="LGPL-2.1+" SLOT="0/26" # subslot = libfolks soname version -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-linux" IUSE="bluetooth eds +telepathy test utils" REQUIRED_USE="bluetooth? ( eds )" diff --git a/dev-libs/folks/metadata.xml b/dev-libs/folks/metadata.xml index a89e8dcef9f3..a71d137f8301 100644 --- a/dev-libs/folks/metadata.xml +++ b/dev-libs/folks/metadata.xml @@ -6,7 +6,6 @@ Gentoo GNOME Desktop - Load contacts from app-misc/tracker index Load contacts from the Telepathy framework Build the folks-inspect utility -- cgit v1.2.3