gentoo resync : 23.06.2018

4 files changed, 22 insertions, 36 deletions

diff --git a/xfce-base/xfce4-settings/Manifest b/xfce-base/xfce4-settings/Manifest
index cd00a1376aea..b79bb6aa7f5b 100644
--- a/xfce-base/xfce4-settings/Manifest
+++ b/xfce-base/xfce4-settings/Manifest
@@ -1,8 +1,7 @@
-AUX xfce4-settings-4.12.0-HDMI-power-cycling.patch 542 BLAKE2B e3c46cd52b11e5f5960fd1ed5234758348678c5de496f95532fead40b3e2c8faccab3aa6d10bd9b8b918a9ed5cfd8f06b891ce19c9a71680c2c9a45a3d7bcc87 SHA512 d38cf790a20e54899b31db28e7cf5e683196e91cc6f4c48732f526d2a44e9235a0ee4331a26fe01e088a2bbfbe61fefd4404e9e56794b0b1f9c41e2530bcc0be
-DIST xfce4-settings-4.12.0.tar.bz2 973324 BLAKE2B 2c6103ac0d43c89f523e530d2eccc0974b6a67a9206f300aba8630b6ea819ea16774141d92647e7b3682b437555a75a4c0a8e06e4abf593a302010342dfb3a10 SHA512 4a61c16f1f03de98c9968a00b50595e2934aaf28b80613c59403d33a293a7f8ef9ebb6fad98b0eeb97a6590b9100e91f73dd6363133d5d8bd06714f1126d8856
 DIST xfce4-settings-4.12.3.tar.bz2 1035504 BLAKE2B db045839ea075d08acbad2bb316a4b577df959312146f8487e667c1de3fe69d129e9c80a21b97834e7f86598d776d7aaf7104f7640429a45a6d02ca3ca6c8bc4 SHA512 46bde0de70d8ebcc869ea5ba4f3eb0f123fb2e6f16e8a837c301e445044d65d90843fe3c8274a53818099112e43ff6217dfffd32bc032560331f5ca5fc5ba3ad
-DIST xfce4-settings-4.13.2.tar.bz2 1043277 BLAKE2B acbb2b78ce7002afb1489491f0cd856b42ee7db6441a908e1244aa22a0bd497de4ba11bd31cff33d2c4a5f0a94bec6a63244c7c493d15deac7d8b5016ec8c0a1 SHA512 3564ee50914a6cb1955457c2b7bc5b515815142b04df418c70ed87692bc9aa87365af61682f07a5d979501df0fe32fe229f5be927fe0233855dfd9f454ff9643
-EBUILD xfce4-settings-4.12.0-r2.ebuild 1549 BLAKE2B dc28fbb30ef2a2d570f58e2da0c9455587134610a52e23d36fe1dd17cb55783576abd1e74affb7f4d667a0958db4023cfacd46897e6088b7fb8c053c212293e9 SHA512 cdefe4d13cf1257474f4e9a49c409d682e72ef14a256c445dc2bfb61aae526d8f7c8be6dab29d2eca2aee2685ea61d744ea8a6b8c94bb24bb8b1f5d646ac3aca
+DIST xfce4-settings-4.12.4.tar.bz2 1036773 BLAKE2B 512547a172081d75e7eeb97f499e77320a3df1090e80ef548dbbaf84d454b614ddb6a36bbfe4cd06d18b478ada7bd76f385dde374a93380f848ffcc232b133d3 SHA512 9b74daa3f98f15c8cb696dc79f9913fecb37f2ca44c2fd3f24865ae03e9a1db93cb5a8ddb27da3c4af7d7a9e9d718a22e46188ff515caf925a5cedfaab37b189
+DIST xfce4-settings-4.13.4.tar.bz2 1046733 BLAKE2B 8694a72e32568b963d4c754faf578ac3e651ce0be5a4b650a45393822fcb6102de4ea9ce0eb16c387605ddecd763057dcb622ef60ce546aeca2d42d3ea5561d0 SHA512 39e2adaa93e2d86ff51e47f194306e57d025c13b5c07ee76cad7f67994f26fe03677c5a3bac91d1db4a25201371f6d135f36eed110dc15a1fbb46228ee715893
 EBUILD xfce4-settings-4.12.3.ebuild 1527 BLAKE2B bb69fa67131a081117931aec36501ff7fc15fb82735f14acf281e58c4d396e67972442fa6f1734cf30c65a97db1ef43a0aab2f19fdec2a4a77d8e0b03a6ca340 SHA512 d0849b13ef3be178469e9fc505f16d156a4a01f6448b29810d9b3fec614d4710b788750de1105f0ea78a69f20274ff4dceda0c95451c516988a9709acea82b7b
-EBUILD xfce4-settings-4.13.2.ebuild 1528 BLAKE2B 220106031193b56f8704aaebb460c2f31752ffe00a87a1f13a97506fb24b268c7ece40d9713a8db764fba8815a6c0b0eb95b22cd9aabc329de9ee2a76d09883f SHA512 8b585a153ea4dc9f8f3a77ca15dc874aefc81cab4ed48dd664e2f5c0d678ab640844c1001423550c293c7c766dc3ce1f96fef940de59df0399076184fa99ff36
+EBUILD xfce4-settings-4.12.4.ebuild 1534 BLAKE2B b59609f030b4bbaee835e5256af079eaf127ec934c2d06a31c7a8a9f1d3e2882ae744635509194e9408960c8a5c7348b9843a8eb35f8ca588a3aaa647d21905b SHA512 c1cad13e57e3555df0f9aac83c003103c5a971553496e07f27f9b22d62c5e43af975acf9df3860eb018874b0a422ab23c88b4f3c87b02df1c5d2ac07480d6f30
+EBUILD xfce4-settings-4.13.4.ebuild 1526 BLAKE2B cbbc0aff77bd2988097901f46cd55905e5361e2fe1008fd1ff7d61678b2fdc50cc035dd4a87849a5bcdfea2ff01e9e2b24f1e30fa51a726772ac5ae28390cca3 SHA512 9b96f377cedfe112f55f22a8d45632e3f91eec08b8b2cca14e0d49fb60a83d109bd026056218b7191a291af3f75770671628841d1808f0ef206f030587d75e43
 MISC metadata.xml 479 BLAKE2B d15c203e15371edc17aabffe86e690c03c7e853e78c74e0de5753f977dbb9d080813706e3d3170dffb952591abc70f0aea6ac96ce9ca24ca7dbb627beeb8ea1f SHA512 56e89d92ba3fc3c53a86855721394993d8ac930549f19389728e0f8d60de6e92eb3475aeb0e09ca8f43412ba5e86c59482e7488dd5d0cd357968fabc6b3227b9
diff --git a/xfce-base/xfce4-settings/files/xfce4-settings-4.12.0-HDMI-power-cycling.patch b/xfce-base/xfce4-settings/files/xfce4-settings-4.12.0-HDMI-power-cycling.patch
deleted file mode 100644
index 895dd58e1b1d..000000000000
--- a/xfce-base/xfce4-settings/files/xfce4-settings-4.12.0-HDMI-power-cycling.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-From https://bugzilla.xfce.org/show_bug.cgi?id=11107#c3
-
-diff --git a/xfsettingsd/displays.c b/xfsettingsd/displays.c
-index 3497804..449500b 100644
---- a/xfsettingsd/displays.c
-+++ b/xfsettingsd/displays.c
-@@ -368,7 +368,7 @@ xfce_displays_helper_reload (XfceDisplaysHelper *helper)
-     xfsettings_dbg (XFSD_DEBUG_DISPLAYS, "Refreshing RandR cache.");
- 
-     /* Free the caches */
--    g_ptr_array_unref (helper->outputs);
-+    g_ptr_array_free (helper->outputs, TRUE);
-     g_ptr_array_unref (helper->crtcs);
- 
-     gdk_error_trap_push ();
diff --git a/xfce-base/xfce4-settings/xfce4-settings-4.12.0-r2.ebuild b/xfce-base/xfce4-settings/xfce4-settings-4.12.4.ebuild
index 4255798bb473..553d8cc61269 100644
--- a/xfce-base/xfce4-settings/xfce4-settings-4.12.0-r2.ebuild
+++ b/xfce-base/xfce4-settings/xfce4-settings-4.12.4.ebuild
@@ -1,9 +1,8 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
-inherit xfconf
+EAPI=6
+inherit gnome2-utils
 
 DESCRIPTION="Configuration system for the Xfce desktop environment"
 HOMEPAGE="https://www.xfce.org/projects/"
@@ -11,8 +10,8 @@ SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug input_devices_libinput libcanberra libnotify upower +xklavier"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="input_devices_libinput libcanberra libnotify upower +xklavier"
 
 RDEPEND=">=dev-libs/dbus-glib-0.100
 	>=dev-libs/glib-2.24
@@ -38,17 +37,19 @@ DEPEND="${RDEPEND}
 	sys-devel/gettext
 	x11-base/xorg-proto"
 
-pkg_setup() {
-	XFCONF=(
-		$(use_enable upower upower-glib)
-		$(use_enable input_devices_libinput xorg-libinput)
-		$(use_enable libnotify)
-		$(use_enable xklavier libxklavier)
+src_configure() {
+	econf \
+		$(use_enable upower upower-glib) \
+		$(use_enable input_devices_libinput xorg-libinput) \
+		$(use_enable libnotify) \
+		$(use_enable xklavier libxklavier) \
 		$(use_enable libcanberra sound-settings)
-		$(xfconf_use_debug)
-		)
+}
 
-	DOCS=( AUTHORS ChangeLog NEWS TODO )
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
 
-	PATCHES=( "${FILESDIR}/${P}-HDMI-power-cycling.patch" )
+pkg_postrm() {
+	gnome2_icon_cache_update
 }
diff --git a/xfce-base/xfce4-settings/xfce4-settings-4.13.2.ebuild b/xfce-base/xfce4-settings/xfce4-settings-4.13.4.ebuild
index 7164a73dcb59..0d6ecd2df123 100644
--- a/xfce-base/xfce4-settings/xfce4-settings-4.13.2.ebuild
+++ b/xfce-base/xfce4-settings/xfce4-settings-4.13.4.ebuild
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="input_devices_libinput libcanberra libnotify upower +xklavier"
 
-RDEPEND=">=dev-libs/dbus-glib-0.100
+RDEPEND="
 	>=dev-libs/glib-2.24
 	media-libs/fontconfig
 	x11-libs/gtk+:3
@@ -32,6 +32,7 @@ RDEPEND=">=dev-libs/dbus-glib-0.100
 	upower? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) )
 	xklavier? ( >=x11-libs/libxklavier-5 )"
 DEPEND="${RDEPEND}
+	dev-util/gdbus-codegen
 	dev-util/intltool
 	virtual/pkgconfig
 	sys-devel/gettext