gentoo resync : 28.12.2017

3 files changed, 2 insertions, 66 deletions

diff --git a/gnome-base/dconf/Manifest b/gnome-base/dconf/Manifest
index acaf6bef88a6..0a2b39e220e9 100644
--- a/gnome-base/dconf/Manifest
+++ b/gnome-base/dconf/Manifest
@@ -1,5 +1,3 @@
-DIST dconf-0.26.0.tar.xz 219688 BLAKE2B 23c15c895082efe2f8bf158cc45f425062dbe639dc46ef0d8c7fe1a31860e0f74c9c59bbbc3427111e44bcf396eceec6661e00f6a9344a8e58bd707832b4ae2a SHA512 ea225397a486815c90a113c064d943f113490dfc754e4acba049b033115aa3a6a3849a5cdc133663de09811cde41c963041bc244cfd9ed32d65399889e415d1e
 DIST dconf-0.26.1.tar.xz 218516 BLAKE2B ddb23a1f6519b5460903b1a91ba48242f144a768f7ec5b9e82953589474df998061a4fbfb3605027cb51db44f7e49f88c774a735600de2bedaf8889b58e050bc SHA512 4d2b4afce189e448e3bd4e9c2f9d3d5eec6c694748aec87a9a8de047296c858772a5234dbcace8e84d99c5378d2d1ba35cafb5e5ea7efca25c10a53a55b8b6da
-EBUILD dconf-0.26.0-r1.ebuild 1508 BLAKE2B c652bacef17837e5d4816e1dcc877eb1a928ef636a2746bd4962cca45211267b323794bb8851679eb3c1fe3f72051a1912b1c5a5617c8e270810431bfc1a3543 SHA512 82a0b2d643087641ddb751cbf9b9b0deb3e5ab6dd9b1034a35b268d8e91c5a2fe238c5081e939adf3eb3460490c637e2d33b5344d4a87b9fc7c4edf9619e07cd
-EBUILD dconf-0.26.1.ebuild 1509 BLAKE2B b4d50e7b46ed68e082498ee4c0d373556a98f8517fc35725f13473e7d7605fbe82e2631dc8abb3cf3cabe6b5895878424b0369b9e22d96051212f53e2fbc1eb2 SHA512 8161f774baf935cf3a09cfa772baf24c46a445b05a4e9e92dd12c7406acdaaf63c35537090f18bc2e6e92113e885ac41446e1b660dd731718bcb4f59c8b91fe6
+EBUILD dconf-0.26.1.ebuild 1508 BLAKE2B c652bacef17837e5d4816e1dcc877eb1a928ef636a2746bd4962cca45211267b323794bb8851679eb3c1fe3f72051a1912b1c5a5617c8e270810431bfc1a3543 SHA512 82a0b2d643087641ddb751cbf9b9b0deb3e5ab6dd9b1034a35b268d8e91c5a2fe238c5081e939adf3eb3460490c637e2d33b5344d4a87b9fc7c4edf9619e07cd
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/dconf/dconf-0.26.0-r1.ebuild b/gnome-base/dconf/dconf-0.26.0-r1.ebuild
deleted file mode 100644
index 1187976d9e36..000000000000
--- a/gnome-base/dconf/dconf-0.26.0-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# 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/dconf/dconf-0.26.1.ebuild b/gnome-base/dconf/dconf-0.26.1.ebuild
index 8755e6efce70..1187976d9e36 100644
--- a/gnome-base/dconf/dconf-0.26.1.ebuild
+++ b/gnome-base/dconf/dconf-0.26.1.ebuild
@@ -9,7 +9,7 @@ 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"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~arm-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="