From 38423c67c8a23f6a1bc42038193182e2da3116eb Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 25 Apr 2020 11:37:10 +0100 Subject: gentoo resync : 25.04.2020 --- dev-libs/folks/Manifest | 9 +-- .../folks/files/0.12.1-conditional-tests.patch | 40 ---------- .../folks/files/0.12.1-meson-0.53-compat.patch | 47 ----------- .../folks/files/0.12.1-meson-0.53-compat2.patch | 31 -------- dev-libs/folks/files/0.12.1-no-tracker-tests.patch | 26 ------- dev-libs/folks/folks-0.12.1-r1.ebuild | 89 --------------------- dev-libs/folks/folks-0.12.1.ebuild | 90 ---------------------- dev-libs/folks/folks-0.13.1.ebuild | 2 +- 8 files changed, 2 insertions(+), 332 deletions(-) delete mode 100644 dev-libs/folks/files/0.12.1-conditional-tests.patch delete mode 100644 dev-libs/folks/files/0.12.1-meson-0.53-compat.patch delete mode 100644 dev-libs/folks/files/0.12.1-meson-0.53-compat2.patch delete mode 100644 dev-libs/folks/files/0.12.1-no-tracker-tests.patch delete mode 100644 dev-libs/folks/folks-0.12.1-r1.ebuild delete mode 100644 dev-libs/folks/folks-0.12.1.ebuild (limited to 'dev-libs/folks') diff --git a/dev-libs/folks/Manifest b/dev-libs/folks/Manifest index e31eb77bf4d0..ac7d6f1e6f78 100644 --- a/dev-libs/folks/Manifest +++ b/dev-libs/folks/Manifest @@ -1,11 +1,4 @@ -AUX 0.12.1-conditional-tests.patch 1342 BLAKE2B 6e6724ecd63771c3ff417d82cced0230d4e7ab4efeae57af193b4b6310bdaf6239a8341067619c96495a2a81c2868f563d1b0961aa7850b7500f9956043260cf SHA512 6098ea44375d56c3e178e9f3c0cf563ecef5aec5bf2a8e6ec5f0da067b9174b2a0d3cb1f99fac2985976324bca1859429d64545790807f948a5b0b6f8bf071c5 -AUX 0.12.1-meson-0.53-compat.patch 1381 BLAKE2B f1fc6a54113dcac1f3a76970d1b3a2558fa48971e5f7e2ef8723f91aaf423fa383aefb04a833cc507057982e8305475068b58dbcdf1c1ec0711c520ede591bff SHA512 da08c17dc2ada2ef48970f30859f42b7117e765294349137651ccf46006ddd465b89dbacbfd41c6fefb4135f691d37146708250f060e9d4089d4f20c6cbb42fb -AUX 0.12.1-meson-0.53-compat2.patch 763 BLAKE2B 280b3b9801de593136006c1129a68b05db3e8e551d4286c081906a7c254c1dbebf0afb7a35a4839792b19bdaa620a5b77904e4193bcfeff54edffc821270f21c SHA512 33fd46de823df0f0ad27402b0f69c72f41da6c6f9ecd382dc84454ac413781e884dc349c72c5ee5db0a3b24d4828a70a2af5e0f2574f80f6718a679eccc789b7 -AUX 0.12.1-no-tracker-tests.patch 633 BLAKE2B 80f324c784248d5a25ddf70f82ec57c7ff4699f83805df96700f4013795afccd3dd098b4fae86c60381f31b6196d4beebbbd5f196663bda1796ffbf556e4b8d9 SHA512 3e37b6c6abc17aa0ae95f0d33042dc454328cfdc0ef4ebe035f7eacee65bad69db01fa6bc6493026d2a8ccd7ab030d1736cea2247b246f7296eefb1740a838df AUX 0.13.1-meson-0.53-compat.patch 908 BLAKE2B 2fb471f9f500623565491df116099198be990c4ccf9bc308a2fd0fc2676b81c9f1ae5aa9a6168703066a35a0c3d87d480610d81333da97c1363d87265ccbf998 SHA512 2e4ee26a529d2a854027abb9d0a1414d1059f55fb0ac9ed5edde36049819bcc77f1e971b9b8a98e56db6ab18e6704591f9ea906ecd12f9bbff17816d40f3bc5d -DIST folks-0.12.1.tar.xz 522688 BLAKE2B 584957b628e286b850ee45c3f79d942ae602124e0130eeddc8806ae6fc12accd26c140df5caa0a1a68c84bff707df785d863d2f69ee9a0b6b450b8159c21fb39 SHA512 f60e993508137b33602ccc814bde45ad780d61afb0566f8175fd01b3dcaa5f5771e11d98156c4ecfd85f920a7adc140a5b2582eaaa97568b8fb3b3761668decb DIST folks-0.13.1.tar.xz 515584 BLAKE2B fe4e368e60dd41a72f449f130993eb7b8792b2a38218ff7117a8e5ec192d53d2b8f5ab09a2318267cf2fd7a717048b8715289b2f411c59846c6c98235ec32149 SHA512 b134172077bed1655cd7f24b1402ed347d405b22114c33d6638040a5e475632ea33cde898a08fc143eaefc7057d4b6dccceac7e797e1976fdf88c58764818afe -EBUILD folks-0.12.1-r1.ebuild 2685 BLAKE2B e022c4fc18fed55dac5983f784644e7fca72b519daca47e6cc77a806a003d57a3bb97b4b105864b4c93a7e60e9cdd9ebb41bef6a244d259f34d7117a4e784f5c SHA512 9fda39a47b741832b7155cd36c1d972d3692f18c9962b22d525551907755ed857f1af4ac76881adfc64a9b7508ba27f719619541ad22d476f9170927cf876e09 -EBUILD folks-0.12.1.ebuild 2461 BLAKE2B 07bf3f5c2228b82778628918c91539b891bb33c165f98c3661a5e68bf689536fe0e6de17ac4a80bb731e138d184d6044c926c9be406cb12700f07e8afd4eed25 SHA512 fbb30f024370c686a821811b5a63bfa7d0086da1ae6744cf1ff079a40e96bdcf557856b277395594f526c062755e5b8fb042a6e7afb2c204ceabf69dc735949f -EBUILD folks-0.13.1.ebuild 2129 BLAKE2B abed9d09fb8f3029592349bbf1fd346cb4f709656c9f655a57ec2d7c3d50d0ada6bac6ce71cd6a21713dc4ad3ee90419754a79efa150886a539a6ac1226000d4 SHA512 6748ca3829f184bf98a64a8998d6016103881cb346188eba0719cc401396c16b40b6a45cdd86c55a555a9b0955e3ee3fbd7405424d75bac847dfffb57f78fa1c +EBUILD folks-0.13.1.ebuild 2127 BLAKE2B fbd9a7223cb54a3b7131dd65644d4b3232ff6f5746c0dcb9cab470e82180844b45b0b3a8c34f5949863dd7e728b2a1a3f8a75ba23e9f1c66fe480beb900bafd5 SHA512 78ec67564db62ff9c97326a0cb971b7240eb3bc9e1c28e07b10d60acb5a030a595abd093fef877fd68915a780b5a6f4ec9fe45c25eca793122e95f72cdc06ca9 MISC metadata.xml 477 BLAKE2B 59650bcd983e214f924509b128b6bfd45cd015bd3f98417716d366f9a05d932b0feacff410381db14afa18da12fcfaf09c0da2fb2f122e110a6a0858c6f2bd6d SHA512 eb009ee1180b529978596f9a838454f9226906ebd7f0218e29545326222cf04b08efad06e88bd6ab66fc7486022e4f27bb234f4709ac499f1b7df77276709423 diff --git a/dev-libs/folks/files/0.12.1-conditional-tests.patch b/dev-libs/folks/files/0.12.1-conditional-tests.patch deleted file mode 100644 index cde0847fe146..000000000000 --- a/dev-libs/folks/files/0.12.1-conditional-tests.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 93c03b9582eb1eac21f084decf86ca5f1340dc53 Mon Sep 17 00:00:00 2001 -From: Mart Raudsepp -Date: Sat, 7 Sep 2019 22:16:43 +0300 -Subject: [PATCH] meson: Allow disabling build of tests - ---- - meson.build | 4 +++- - meson_options.txt | 1 + - 2 files changed, 4 insertions(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 91800654..37e6b5c2 100644 ---- a/meson.build -+++ b/meson.build -@@ -219,7 +219,9 @@ subdir('tools') - subdir('po') - - # Tests --subdir('tests') -+if get_option('test') -+ subdir('tests') -+endif - - if docs_enabled - subdir('docs') -diff --git a/meson_options.txt b/meson_options.txt -index 042a72e8..b4552d49 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -9,6 +9,7 @@ option('zeitgeist', type: 'boolean', value: false, description: 'build Zeitgeist - option('import_tool', type: 'boolean', value: true, description: 'Enable building the meta-contact import tool') - option('inspect_tool', type: 'boolean', value: true, description: 'Enable building the data inspection tool') - # Test options -+option('test', type: 'boolean', value: true, description: 'Build test 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/files/0.12.1-meson-0.53-compat.patch b/dev-libs/folks/files/0.12.1-meson-0.53-compat.patch deleted file mode 100644 index 56f9543ba40a..000000000000 --- a/dev-libs/folks/files/0.12.1-meson-0.53-compat.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 1853567d79024c6ce960d9dc187cff8aaf9a37ce Mon Sep 17 00:00:00 2001 -From: Niels De Graef -Date: Mon, 3 Feb 2020 08:57:52 +0100 -Subject: [PATCH] meson: Use python.dependency() correctly - -From https://github.com/mesonbuild/meson/issues/6470: - -> So, to further clarify, passing an argument to -> py_installation.dependency() should be an error, since this method -> will only ever return a python dependency (for embedding python -> itself, etc.) and not dbusmock or anything else. - -Fixxes https://gitlab.gnome.org/GNOME/folks/issues/119 ---- - meson.build | 9 ++++++--- - 1 file changed, 6 insertions(+), 3 deletions(-) - -diff --git a/meson.build b/meson.build -index d5115e28..f3644457 100644 ---- a/meson.build -+++ b/meson.build -@@ -1,7 +1,7 @@ - project('folks', [ 'vala', 'c' ], - version: '0.13.2', - license: 'LGPL2.1+', -- meson_version: '>= 0.49', -+ meson_version: '>= 0.51', - ) - - gnome = import('gnome') -@@ -132,8 +132,11 @@ 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') -- python_dbusmock = py_installation.dependency('dbusmock') -+ py_installation = pymod.find_installation('python3', -+ modules: [ -+ 'dbusmock', -+ ], -+ ) - endif - - if import_tool_enabled --- -2.20.1 - diff --git a/dev-libs/folks/files/0.12.1-meson-0.53-compat2.patch b/dev-libs/folks/files/0.12.1-meson-0.53-compat2.patch deleted file mode 100644 index 40c3ca601f05..000000000000 --- a/dev-libs/folks/files/0.12.1-meson-0.53-compat2.patch +++ /dev/null @@ -1,31 +0,0 @@ -From f8a59fb6bf12be06595c94d0b00afed4e1d2f1ee Mon Sep 17 00:00:00 2001 -From: Mart Raudsepp -Date: Sun, 23 Feb 2020 19:28:51 +0200 -Subject: [PATCH] meson: Conditionalize dbusmock check to tests being built - ---- - meson.build | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/meson.build b/meson.build -index 74320634..64f28d2b 100644 ---- a/meson.build -+++ b/meson.build -@@ -131,12 +131,14 @@ endif - if bluez_backend_enabled - libebook_dep = dependency('libebook-1.2', version: '>=' + min_eds_version) - # Needed for the BlueZ tests -+ if get_option('test') - pymod = import('python') - py_installation = pymod.find_installation('python3', - modules: [ - 'dbusmock', - ], - ) -+ endif - endif - - if import_tool_enabled --- -2.20.1 - diff --git a/dev-libs/folks/files/0.12.1-no-tracker-tests.patch b/dev-libs/folks/files/0.12.1-no-tracker-tests.patch deleted file mode 100644 index 3dbfadf7452e..000000000000 --- a/dev-libs/folks/files/0.12.1-no-tracker-tests.patch +++ /dev/null @@ -1,26 +0,0 @@ -From b2b0832cf69560bdf0692d275d49d4ed6e293426 Mon Sep 17 00:00:00 2001 -From: Mart Raudsepp -Date: Sat, 7 Sep 2019 22:26:38 +0300 -Subject: [PATCH] tests: disable failing tracker tests - -All tracker tests fail for me, so disable them for now to at least -continue testing the rest. ---- - tests/meson.build | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/tests/meson.build b/tests/meson.build -index 6a7fa29c..2079051b 100644 ---- a/tests/meson.build -+++ b/tests/meson.build -@@ -43,7 +43,3 @@ endif - if eds_backend_enabled - subdir('eds') - endif -- --if tracker_backend_enabled -- subdir('tracker') --endif --- -2.20.1 - diff --git a/dev-libs/folks/folks-0.12.1-r1.ebuild b/dev-libs/folks/folks-0.12.1-r1.ebuild deleted file mode 100644 index 3ac62a655ba7..000000000000 --- a/dev-libs/folks/folks-0.12.1-r1.ebuild +++ /dev/null @@ -1,89 +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.44" # tests-utils fails to build with newer with v0.12.1 - -inherit gnome.org gnome2-utils meson 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/dbus-glib - >=dev-libs/libgee-0.10:0.8[introspection] - >=dev-libs/gobject-introspection-1.54:= - telepathy? ( >=net-libs/telepathy-glib-0.19.9 ) - tracker? ( app-misc/tracker:0/2.0 ) - eds? ( >=gnome-extra/evolution-data-server-3.13.90:= -