gentoo resync : 29.10.2017

4 files changed, 66 insertions, 2 deletions

diff --git a/gnome-base/dconf/Manifest b/gnome-base/dconf/Manifest
index 55e419ed1e99..0855305cce1c 100644
--- a/gnome-base/dconf/Manifest
+++ b/gnome-base/dconf/Manifest
@@ -1,5 +1,7 @@
 DIST dconf-0.26.0.tar.xz 219688 SHA256 8683292eb31a3fae31e561f0a4220d8569b0f6d882e9958b68373f9043d658c9 SHA512 ea225397a486815c90a113c064d943f113490dfc754e4acba049b033115aa3a6a3849a5cdc133663de09811cde41c963041bc244cfd9ed32d65399889e415d1e WHIRLPOOL 5e4e24aa6083ad5a7a50041772bb7d466eb9cee93725311516fd6070a1b31b8db137772a3c55fa7cfca1675f72f9ab35b70d6aec1b67666eeedfbdfdebd9ac7a
+DIST dconf-0.26.1.tar.xz 218516 SHA256 d583b1f7fc93b879e2956acc6a26ea05a445a0002158aeef80c8e378e1414535 SHA512 4d2b4afce189e448e3bd4e9c2f9d3d5eec6c694748aec87a9a8de047296c858772a5234dbcace8e84d99c5378d2d1ba35cafb5e5ea7efca25c10a53a55b8b6da WHIRLPOOL a790df3c838e0d7e78b4bed6e547f8627348897c9d50c2990208afcc91855b8181b19cd318f48de6ed739bb367f04b84e7f5563fe9f6f2a91a7ed9cfe8db0e59
 EBUILD dconf-0.26.0-r1.ebuild 1508 SHA256 4e362bd74cc385686cb28503842c685a96f63ce7b032e6a14edeea253a7a2da8 SHA512 82a0b2d643087641ddb751cbf9b9b0deb3e5ab6dd9b1034a35b268d8e91c5a2fe238c5081e939adf3eb3460490c637e2d33b5344d4a87b9fc7c4edf9619e07cd WHIRLPOOL 3661241aa1f3cdccf068fe7058927bcf627a5ec4702cadc6cdfe3cf6f6732b2a82228eb1202913435e5bebe95e23730196a7a10a871e21062f80ebcde09214d3
+EBUILD dconf-0.26.1.ebuild 1517 SHA256 f0d2110511be5db01015ea7f9e52dd3a30028961b86aedff9ecec790bc0cf301 SHA512 8b58df3de54ba484990dcac1731bab50c78bfafd36376787f682b1d864027bd7ad7c379238bf8483b7e95a623d485ca0324f5d0807e284502f72cd7f16c8518c WHIRLPOOL 1ec79ad5e99b85b9062ac91751cc51cbea980d971b217513d94445aceb33a8c1be12ab8ccefdf0db495613361d7e9f083384a1e68246b605203e3ba66cf1ee04
 MISC ChangeLog 6133 SHA256 b73af8e368c7ff9192a0bf52dc25462f48a0e2a862b90fc26e49ed3bfc13b0dd SHA512 7e0a06e7dfbe41e2ffb68bc792ca51a7fb22072ce52e625983d3218e722831562b2659a2e9a3959ddb6222f0faefcf3fb8247b53797709c1d9ec46e5397b2e1d WHIRLPOOL 9580a6fb22ae78664a72318c31f0545f0f71f1cea4cc7c657518f87467e9a24ac4a4a10de24b654c715573f27de4ee2fe8b7d455eb354240daa80ed3742d3bb5
 MISC ChangeLog-2015 11251 SHA256 0a8b1d5eff74d4de2074effd7da83b8f2598b4b2fbab1a38e8748823aa8e0bc5 SHA512 620ee7574dc51594470debdc82f398eb358a65ef4a6d2addc929c999ca4a5147b6f05def2046315e2e766db0958f6caa1a78565bdb7e621526355b5bba49d810 WHIRLPOOL d09acd3e5b71ffbe8e930a6241637896e34f3dcd20ad7bceb9e80e931fbea672b72412911dc0b5c043536ee169e5a66d1daadb0d7a537fd8f12f0f35a0c20a42
 MISC metadata.xml 249 SHA256 4505b0bfeadff287958620b7dc7b7209699065a8f17139a237a5dd409a726a97 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 WHIRLPOOL 333a938ee1d2124595596c572697bf5ebad523a92ba12005cfb12e6bb6270881a94a911f0cc9c1cf2bb571559e8271e07dfd307dabe50058236dbe7103562b92
diff --git a/gnome-base/dconf/dconf-0.26.1.ebuild b/gnome-base/dconf/dconf-0.26.1.ebuild
new file mode 100644
index 000000000000..88dcc0547e96
--- /dev/null
+++ b/gnome-base/dconf/dconf-0.26.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2 bash-completion-r1 virtualx
+
+DESCRIPTION="Simple low-level configuration system"
+HOMEPAGE="https://wiki.gnome.org/action/show/Projects/dconf"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~arm-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/glib-2.44.0:2
+	sys-apps/dbus
+"
+DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	dev-util/gdbus-codegen
+	>=dev-util/gtk-doc-am-1.15
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-gcov \
+		--enable-man \
+		VALAC=$(type -P true)
+}
+
+src_test() {
+	virtx emake check
+}
+
+src_install() {
+	gnome2_src_install
+
+	# GSettings backend may be one of: memory, gconf, dconf
+	# Only dconf is really considered functional by upstream
+	# must have it enabled over gconf if both are installed
+	echo 'CONFIG_PROTECT_MASK="/etc/dconf"' >> 51dconf
+	echo 'GSETTINGS_BACKEND="dconf"' >> 51dconf
+	doenvd 51dconf
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	# Kill existing dconf-service processes as recommended by upstream due to
+	# possible changes in the dconf private dbus API.
+	# dconf-service will be dbus-activated on next use.
+	pids=$(pgrep -x dconf-service)
+	if [[ $? == 0 ]]; then
+		ebegin "Stopping dconf-service; it will automatically restart on demand"
+		kill ${pids}
+		eend $?
+	fi
+}
diff --git a/gnome-base/libgnome-keyring/Manifest b/gnome-base/libgnome-keyring/Manifest
index 3ab573db2c19..069f075e3351 100644
--- a/gnome-base/libgnome-keyring/Manifest
+++ b/gnome-base/libgnome-keyring/Manifest
@@ -1,5 +1,5 @@
 DIST libgnome-keyring-3.12.0.tar.xz 435092 SHA256 c4c178fbb05f72acc484d22ddb0568f7532c409b0a13e06513ff54b91e947783 SHA512 dd1777b6e0dd774feb86dbc72d9f2a85f2143e2772a09c438b84aec468ddc5e7ee5ebd534d24f079e5daf4757f2918d0621e26fb671fde0fcef9c74d30f8b9bd WHIRLPOOL 8494913559cf057a77457bdafdff90099075421e88fa247e0215bd0dbb3f79ef41552c5825cfb99857b4f1bf9bc9d677facca779f9d6ed0892eabe9291e0d9a5
-EBUILD libgnome-keyring-3.12.0-r1.ebuild 1735 SHA256 ed2c4c433d1a1b74844c18174ca29801c08786895cedbc42114c3298808b2c2f SHA512 cefa90b703ff4d9b673be7a2e472095ec68e0bc319239f5827d3cd80f34523b17d564ef1779d9e0b00d97c925a6d81a663d694373e6dffb14cd618170366d012 WHIRLPOOL f0a3199a5f825dd3ff3b87513522ce137f89dd893ed7cbffe51d5e382809a8b951cdcc7dacc0c107ecede6b47326193917b3e6a3c07c2ea75dcd2dd9ce053200
+EBUILD libgnome-keyring-3.12.0-r1.ebuild 1734 SHA256 d6b436780905691790bedf7a999a1bfb6ba833bd3ac7c42bdbf51f103b8ed371 SHA512 5ad4a75227990576871f963a12af6855b74aee134e422a65546e79e4fe2f49dc71ff41bc7ef9d2ea6a50a46f89cbc643e209b10d607f034e50d02e54bfddd85f WHIRLPOOL 6e55086f6aa64b9a65a995090a69d96cbb73fa742d6cf88fdeddd21b88bf76613ff61fe5f264699f9d9417d99ce7618f34f26497f6331964a9b22fbb7de7b32c
 EBUILD libgnome-keyring-3.12.0.ebuild 1414 SHA256 2624013e4981abf60cfbc5023aa114571358e14428bd17c26b3b975220134a97 SHA512 a8040b8b5358dbe9861c8c515ae0bedb4ba5b93a5d15a77526f988ab856c2548e409e0b8b8b3daf34444bea0dfc7f7ee1db5075a44d8da19a77f6882c915c412 WHIRLPOOL fb3741703225f2e946b633c948c4b002b03603f50bd65bddf4ea2d37f27c1117fe7b1d72e51fd7edfcc811f0669b829097a24fc5cdffd30dcc435540e580d0f7
 MISC ChangeLog 2921 SHA256 e6f16bdf5cfa7b3b1ed987f19a26945af47559977b417dfaa2462669bbfb6303 SHA512 c082b0af25702eabca23d551699a708f4ae8bf66b8e74e8a384ddb5461c2d50026233cfb6541518656cceca54272ef6006a3b2c23290c6e83a31159a9ee61bc4 WHIRLPOOL f76df2e9552c7759e5c2e6118f406e5e704c66f13e5d496e20224acab3511dfc9ab23edf9b044e56ff916ab25988853adbd7153f903f6919e2fbae03531964ed
 MISC ChangeLog-2015 10306 SHA256 ef98c776eb487f0fbcf93611ae9f4712b6314d4cd617bcc8edbec624f0615113 SHA512 6da704e6221847cdbd2649bad119df04b9023c6dfbc0898f4e510e1ae675dd3aa9ba880aa798ab055d5e0cf31c34e67261d36b27c060a95a313fb74f211444ad WHIRLPOOL 5c1d612955b859f592f06a3bfefc4997afee3c6a69d5950868a5a1a96fe1ba635140565e57262270899c3c29c7e13c1ab7fef6333c9658236c4f706164fd10ed
diff --git a/gnome-base/libgnome-keyring/libgnome-keyring-3.12.0-r1.ebuild b/gnome-base/libgnome-keyring/libgnome-keyring-3.12.0-r1.ebuild
index 29ae1c06bbd9..d1b62da34294 100644
--- a/gnome-base/libgnome-keyring/libgnome-keyring-3.12.0-r1.ebuild
+++ b/gnome-base/libgnome-keyring/libgnome-keyring-3.12.0-r1.ebuild
@@ -17,7 +17,7 @@ LICENSE="LGPL-2+ GPL-2+" # tests are GPL-2
 SLOT="0"
 IUSE="debug +introspection test vala"
 REQUIRED_USE="vala? ( introspection )"
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.16.0:2[${MULTILIB_USEDEP}]