gentoo resync : 06.08.2019

3 files changed, 29 insertions, 42 deletions

diff --git a/dev-libs/libgdata/Manifest b/dev-libs/libgdata/Manifest
index 14287ffee533..ee920aae8ec5 100644
--- a/dev-libs/libgdata/Manifest
+++ b/dev-libs/libgdata/Manifest
@@ -1,9 +1,9 @@
 AUX libgdata-0.17.8-disable-demos.patch 1941 BLAKE2B e8c3b0b558d3c446f3e383268b75bc17a2149cefaa2fe1005ed695b1d0c4bd66cf4a89a4ea4e11e598d044b1b8bf469f3ddf96f3365a5542ae138d4262752d57 SHA512 4df919d8b09ef0b1af0b47c3262e08faa158b99e444a5d7d4d1b19a2987883fbb9e3f1a6dc2f858b8d343fbd5c2d266c3e02a47ad310aee92d1a5b14983d8f55
 AUX libgdata-0.17.9-ax2019-compat.patch 788 BLAKE2B f08605ae9ba096ed20b08c324727be214de5b1746280881f3017e066dfbda6eabd3a83908964c17e6932fafccf0021cc3eb775d2523c1f5bf828d97371527702 SHA512 35eacb0e1af5ae35e458a44563f830a4f19798bc3423e5bbe5fef9df048a20fabfead94a597343b7b342b510fc9e21cdf8bc2a69d7b930cbcb6ffc8ab7cbc66f
-DIST libgdata-0.17.10.tar.xz 836836 BLAKE2B a34f133289eb64ca24d96f38851ac07347e1b2a88860bf926072945d64d3064bbf5c4f674bfb262f27c290fa2b243d5f82805e09290194a9614dbf8dc0993e05 SHA512 01f8bb121c402fc0af8e9f12cafba326a87cef6756ced72652890c834fd4f497a060f6455ab66d4af92d9cd34b4d6fdf58033dca0f91bb806c80b60987955c22
+DIST libgdata-0.17.11.tar.xz 843948 BLAKE2B 8be79ea5840a585c5bdd5b51aa99401aedce0562ceaa98c7e323cdb2354384db635288d05c740993da49fa9c60c2cafab4e7c43ab82de4295afc0ca6b690d4dd SHA512 5abb00e6ebee1010fb6d9eab675e03d94883cac88e42b403a7d750bff73d65d0b35aae5c9e8f17a182819193b4a049ac7e9fc644ad9fa79872924ed5704c8982
 DIST libgdata-0.17.8.tar.xz 1464812 BLAKE2B 787b5d6e4a62e70f76ca4080fb5c3ff1e7d68745f388be646dd980ef8be18275997bca46a1f3639c9457c8310f9c3f4cd34892be88db284a9ee5e5f43e9723fa SHA512 dfc4c825a7053a6fd7659d04c7077bed8539b4cf3ef3da1d5ece4da3ce17941900e960a300a50b284010ed890dcab87e4c4726403f04481c672832fd34b975b0
 DIST libgdata-0.17.9.tar.xz 1434700 BLAKE2B e0b10bdd962aa5d294d75c15c3aa9187342cd85b9a28816fe5628864bc2236e10ee2765ed8123c8b90422f0394b342a2a144dc7ef844486193c8eec2a46cb17f SHA512 90289309cbdc4ec6932bf385ddbfcc75c0c2f8b9ca356329298aaa37f6c3db7a16de20e5c947c16c595e43e729a664e4d6d3e2c5a60bb1e463a13d1306f374ce
-EBUILD libgdata-0.17.10.ebuild 1823 BLAKE2B 70137f7e3c7561933db4f872f7eb7dc9b72f5b839826a7b11528204d9e34a7c1f72b9f0ce06b842bd2c22a84afe615ea8f6b559579d5852ff61fc6b19da1ec08 SHA512 9d45a14fd920a437c9b2a382dc4616fd3b5e8b8bfdba4b20a677f5fdd2324b243b839ef1789b770527b6ffc95724534b0bf71d1e056a8df0a6b716b3d7e3a8dc
+EBUILD libgdata-0.17.11.ebuild 1775 BLAKE2B 047b7f3547fcc2f530d7616804842893e0d8e5ec04de8cdc1113b930e53af2e78c6c9658954d638f9411dddc06423c3d36913d287af97d8d4cf0bd6b5ee2a6f6 SHA512 714ad2a22a09d99c09afefd6d9a2e5aa279678d624f7c9e7bcc7dbfadc29efc143d534cc9334aeec026bf0ff3c1b64c8877ff9463b3130b7022599803b0847e4
 EBUILD libgdata-0.17.8.ebuild 1641 BLAKE2B 8bab41b7e782b93b1c0be447f60aea096d9b18284c4e684034cf7475be39db2751f34c9c80791396c39a95ce3df16da72573bc979c18ee21793306a1f1c5cb6d SHA512 7bce4dfccc02a77a70f0d1ecd8e1c6d121016004138917fa5505aa2cdc33205e5665c367aee3b3b45ee7524ffe041c8f3a561e8c11e835d213fd01f2a2910b6e
 EBUILD libgdata-0.17.9-r1.ebuild 1755 BLAKE2B 1ad712e61fd4e87765588c399324cb6955bcbd46490f5d0e246d0001f44737729c8d2beb751131b7e504cb181420c1f3681a633ef2725c49ab0c4f9c03e6ba0d SHA512 5a12a0a05f2cd95f659cc301af235ab6a4bd8cd90a111de8c73dc9a98f3567abf604155100d31dbb77d30c384156b470749b6694f8e9f9b94171e43e28e671df
-MISC metadata.xml 362 BLAKE2B f10a4dba3d98334e8c3092595559b1a0e9036388c3d9b72a53fd1dda5935721198ef7c751efd2179701c4805b6116b3f61965fb5037fe63ef9bccfcb8b37bdfb SHA512 00513b8910b0cf0f0c42b1723c8e22a93c95a702ba3ba9f139ba8e2a25a6c408f1e8f97302ee300189ea534717b1f7d21a909cab0ebf6ba8d6cd19d38df2f30d
+MISC metadata.xml 496 BLAKE2B c1ea319b0bfe89f579895ad4422216a26b3b8709d75bf9680278c22e3fa4e3e771f4573b89eb3db2704a33196149883f0c7028b7e39cdde833df510e350f560b SHA512 e12832d53a97dcaba6d2f669ece3ff9dbd504951a7539f00cce52e88e28d4c28034b203b9f1def27c812f39e5ad21532789b62cd0ab2814facf90b7b789e82dd
diff --git a/dev-libs/libgdata/libgdata-0.17.10.ebuild b/dev-libs/libgdata/libgdata-0.17.11.ebuild
index 112574624d47..72311b208ec4 100644
--- a/dev-libs/libgdata/libgdata-0.17.10.ebuild
+++ b/dev-libs/libgdata/libgdata-0.17.11.ebuild
@@ -1,9 +1,8 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 VALA_USE_DEPEND="vapigen"
-GNOME2_EAUTORECONF="yes"
 
 inherit gnome.org meson vala xdg
 
@@ -13,67 +12,54 @@ HOMEPAGE="https://wiki.gnome.org/Projects/libgdata"
 LICENSE="LGPL-2.1+"
 SLOT="0/22" # subslot = libgdata soname version
 
-IUSE="+crypt gnome-online-accounts gtk gtk-doc +introspection test vala"
-# needs dconf
-RESTRICT="test"
-
-REQUIRED_USE="
-	gnome-online-accounts? ( crypt )
-	vala? ( introspection )
-"
+IUSE="+crypt gnome-online-accounts gtk-doc +introspection test vala"
+REQUIRED_USE="vala? ( introspection )"
+RESTRICT="!test? ( test )"
 
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.44.0:2
-	>=dev-libs/json-glib-1[introspection?]
+	>=dev-libs/json-glib-0.15[introspection?]
 	>=dev-libs/libxml2-2:2
 	>=net-libs/liboauth-0.9.4
-	>=net-libs/libsoup-2.55.90:2.4[introspection?]
-	gtk? ( x11-libs/gtk+:3 )
+	>=net-libs/libsoup-2.55.90:2.4[introspection?,vala?]
 	crypt? ( app-crypt/gcr:= )
 	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8:=[introspection?,vala?] )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.7:= )
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
 "
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=dev-util/meson-0.50.0
 	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.25
-	sys-devel/gettext
+	gtk-doc? ( >=dev-util/gtk-doc-1.25
+		app-text/docbook-xml-dtd:4.3 )
+	>=sys-devel/gettext-0.19.8
 	virtual/pkgconfig
-	gtk-doc? ( dev-util/gtk-doc )
-	test? ( >=net-libs/uhttpmock-0.5
-		>=x11-libs/gdk-pixbuf-2.14:2 )
+	test? ( >=net-libs/uhttpmock-0.5.0
+		>=x11-libs/gdk-pixbuf-2.14:2
+	)
 	vala? ( $(vala_depend) )
 "
 
 src_prepare() {
 	use vala && vala_src_prepare
-	eapply_user
+	xdg_src_prepare
+	# Don't waste time building a couple small demos that aren't installed
+	sed -i -e '/subdir.*demos/d' meson.build || die
 }
 
 src_configure() {
 	local emesonargs=(
-		"-Dinstalled_tests=false"
-		-Dgnome=$(usex crypt enabled disabled)
-		-Dgoa=$(usex gnome-online-accounts enabled disabled)
-		-Dgtk=$(usex gtk enabled disabled)
+		-Dgtk=disabled # only for demos
+		$(meson_feature crypt gnome)
+		$(meson_feature gnome-online-accounts goa)
+		$(meson_use test always_build_tests)
+		-Dinstalled_tests=false
+		-Dman=true
 		$(meson_use gtk-doc gtk_doc)
-		$(meson_use gtk-doc man)
 		$(meson_use introspection)
 		$(meson_use vala vapi)
-		$(meson_use test always-build-tests)
 	)
 	meson_src_configure
 }
-
-src_test() {
-	meson_src_test
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-}
diff --git a/dev-libs/libgdata/metadata.xml b/dev-libs/libgdata/metadata.xml
index 4b8d03fba618..05e33e366225 100644
--- a/dev-libs/libgdata/metadata.xml
+++ b/dev-libs/libgdata/metadata.xml
@@ -6,6 +6,7 @@
 	<name>Gentoo GNOME Desktop</name>
 </maintainer>
 <use>
+	<flag name="crypt">Use <pkg>app-crypt/gcr</pkg> for keeping tokens and passwords in non-pageable memory for improved security</flag>
 	<flag name="gnome-online-accounts">Enable <pkg>net-libs/gnome-online-accounts</pkg> support</flag>
 </use>
 </pkgmetadata>