gentoo resync : 23.03.2018

4 files changed, 62 insertions, 14 deletions

diff --git a/xfce-base/Manifest.gz b/xfce-base/Manifest.gz
index 6a201d7a12b2..eca6ed0740ac 100644
--- a/xfce-base/Manifest.gz
+++ b/xfce-base/Manifest.gz
diff --git a/xfce-base/xfce4-settings/Manifest b/xfce-base/xfce4-settings/Manifest
index f704dd2f3a5b..a2e2729dca8e 100644
--- a/xfce-base/xfce4-settings/Manifest
+++ b/xfce-base/xfce4-settings/Manifest
@@ -1,10 +1,12 @@
 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.2.tar.bz2 1029833 BLAKE2B c6180addbfa25f4ab9ea2ba4c4bc7131117c2cf60436fe3a695b7d297d0172463548b3a0d521b4607907fec1ebf02096a513a4a18af9094976ed17c053fb8c22 SHA512 cd3a56e7f1a9680575ba82276258aadcf620c472495504dd686c0eda1c730f32900c132eb502990f7b3a6904699f892a86b5853419bd4f72779d56836a5c6145
-DIST xfce4-settings-4.13.0.tar.bz2 1037084 BLAKE2B b13096251329161413f4711a535c88ea4d4502f3dfb9ac6a782110f9f15107c0cdf8935f8d884cd25aec179ee90c0e58cc6b34ee1626d2d49a9f972889b55995 SHA512 ae9094ce0a2a85d7d38a72bbc355f5d06741ec5db16ebcfab74e7504f1ba17360d1fc3e38b357665c3bacf065c02cd6c12c2d1619a18523b42efb311877dfa62
+DIST xfce4-settings-4.12.3.tar.bz2 1035504 BLAKE2B db045839ea075d08acbad2bb316a4b577df959312146f8487e667c1de3fe69d129e9c80a21b97834e7f86598d776d7aaf7104f7640429a45a6d02ca3ca6c8bc4 SHA512 46bde0de70d8ebcc869ea5ba4f3eb0f123fb2e6f16e8a837c301e445044d65d90843fe3c8274a53818099112e43ff6217dfffd32bc032560331f5ca5fc5ba3ad
 DIST xfce4-settings-4.13.1.tar.bz2 1034276 BLAKE2B 1211a14a0d2a1b33fa400e5957852fc21a0b25e3b8abf880be552f4e2306e81337fdb1686c00b6c56607f24e55418a99498886e2e302ca9f52da606042e96af7 SHA512 e108ccf306599716c2fbc0fc11cd0b05fc89909c51e3bc5513745ac0279432d93c690f9f8d7faeb4bd8ffbd1d7a271276b0f690040692ca2d3f3a1ac55b62ccd
+DIST xfce4-settings-4.13.2.tar.bz2 1043277 BLAKE2B acbb2b78ce7002afb1489491f0cd856b42ee7db6441a908e1244aa22a0bd497de4ba11bd31cff33d2c4a5f0a94bec6a63244c7c493d15deac7d8b5016ec8c0a1 SHA512 3564ee50914a6cb1955457c2b7bc5b515815142b04df418c70ed87692bc9aa87365af61682f07a5d979501df0fe32fe229f5be927fe0233855dfd9f454ff9643
 EBUILD xfce4-settings-4.12.0-r2.ebuild 1573 BLAKE2B 4678ab6ee86da69004b9665daec2d1fdafd77cca518120a597898ebd20780198b4ca2a8bbc31f1c265703090c9cde5408ddaca7607c51636a8602c7f3b01acb0 SHA512 65a30d30a81b375d4729f1ad925d27cb6041434d1c8d564a7f0d51c8d98ef6cfabbf4ae354c1a7a2fa2368d3727a41c0e4f6cce42bd3a7e325b755e61ee902f6
 EBUILD xfce4-settings-4.12.2.ebuild 1559 BLAKE2B 04f03e9c2a56b9d3991f393fa69a1ec0005a0b3186fa81ea27b10df626dd511dbcdff4bcb2133a1373709ec87407e2fa230fa63ab4799693ec6654301ad5a014 SHA512 1ba5706abda0cffe26df6d739598899a0e5173a68df9974850aa87a6b0c8ad184913d27ae989e10e8edfc1496a3c71b758c3b9876a7a65db3becf8f66768faa1
-EBUILD xfce4-settings-4.13.0.ebuild 1771 BLAKE2B 24225bd3d339d9d6e63e3d4fac3f4c55f15ffbe7ae2cb131d2815f4485c570508c9a17f799b4c99786de0e0d4e820d82876fd9014fab5768410e52b34684e370 SHA512 282a46253ea003b541ea2fb28d2c074f08f88339d5db8aca99fa592e1a0287c0b2a00177be93b39eb4c13e5e9c729bcd2a730e0aa6f2d9e6475e12eb0d6c3d06
+EBUILD xfce4-settings-4.12.3.ebuild 1559 BLAKE2B 04f03e9c2a56b9d3991f393fa69a1ec0005a0b3186fa81ea27b10df626dd511dbcdff4bcb2133a1373709ec87407e2fa230fa63ab4799693ec6654301ad5a014 SHA512 1ba5706abda0cffe26df6d739598899a0e5173a68df9974850aa87a6b0c8ad184913d27ae989e10e8edfc1496a3c71b758c3b9876a7a65db3becf8f66768faa1
 EBUILD xfce4-settings-4.13.1.ebuild 1553 BLAKE2B e014eb160a0765e36b8625ec051fc1ef5014c9b836c42a2c91d27fd0fda90091a4e270cdd428fab64cfaa0d777c17ffb4dcdf887698b748283c0beb484d63bda SHA512 5a55273e2500f3a1a23f31dce9a1160cd6d21fd86a50508bc845b8f8de4df26f022de50c745b4a3fd296b77e53a5654c966021c5c886f0e1032c2fd25d4d50b6
+EBUILD xfce4-settings-4.13.2.ebuild 1553 BLAKE2B e014eb160a0765e36b8625ec051fc1ef5014c9b836c42a2c91d27fd0fda90091a4e270cdd428fab64cfaa0d777c17ffb4dcdf887698b748283c0beb484d63bda SHA512 5a55273e2500f3a1a23f31dce9a1160cd6d21fd86a50508bc845b8f8de4df26f022de50c745b4a3fd296b77e53a5654c966021c5c886f0e1032c2fd25d4d50b6
 MISC metadata.xml 479 BLAKE2B d15c203e15371edc17aabffe86e690c03c7e853e78c74e0de5753f977dbb9d080813706e3d3170dffb952591abc70f0aea6ac96ce9ca24ca7dbb627beeb8ea1f SHA512 56e89d92ba3fc3c53a86855721394993d8ac930549f19389728e0f8d60de6e92eb3475aeb0e09ca8f43412ba5e86c59482e7488dd5d0cd357968fabc6b3227b9
diff --git a/xfce-base/xfce4-settings/xfce4-settings-4.12.3.ebuild b/xfce-base/xfce4-settings/xfce4-settings-4.12.3.ebuild
new file mode 100644
index 000000000000..1a6651fff45d
--- /dev/null
+++ b/xfce-base/xfce4-settings/xfce4-settings-4.12.3.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2-utils
+
+DESCRIPTION="Configuration system for the Xfce desktop environment"
+HOMEPAGE="https://www.xfce.org/projects/"
+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="input_devices_libinput libcanberra libnotify upower +xklavier"
+
+RDEPEND=">=dev-libs/dbus-glib-0.100
+	>=dev-libs/glib-2.24
+	media-libs/fontconfig
+	>=x11-libs/gtk+-2.20:2
+	x11-libs/libX11
+	>=x11-libs/libXcursor-1.1
+	>=x11-libs/libXi-1.3
+	>=x11-libs/libXrandr-1.2
+	>=xfce-base/garcon-0.2
+	>=xfce-base/exo-0.8
+	>=xfce-base/libxfce4ui-4.11
+	>=xfce-base/libxfce4util-4.11
+	>=xfce-base/xfconf-4.10
+	libcanberra? ( >=media-libs/libcanberra-0.25[sound] )
+	input_devices_libinput? ( x11-drivers/xf86-input-libinput )
+	libnotify? ( >=x11-libs/libnotify-0.7 )
+	upower? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) )
+	xklavier? ( >=x11-libs/libxklavier-5 )"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig
+	sys-devel/gettext
+	>=x11-proto/inputproto-1.4
+	x11-proto/xproto"
+
+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)
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/xfce-base/xfce4-settings/xfce4-settings-4.13.0.ebuild b/xfce-base/xfce4-settings/xfce4-settings-4.13.2.ebuild
index 85aea3fa15d5..e333ed8566d9 100644
--- a/xfce-base/xfce4-settings/xfce4-settings-4.13.0.ebuild
+++ b/xfce-base/xfce4-settings/xfce4-settings-4.13.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit fdo-mime gnome2-utils
+inherit gnome2-utils
 
 DESCRIPTION="Configuration system for the Xfce desktop environment"
 HOMEPAGE="https://www.xfce.org/projects/"
@@ -25,7 +25,7 @@ RDEPEND=">=dev-libs/dbus-glib-0.100
 	>=xfce-base/exo-0.11
 	>=xfce-base/libxfce4ui-4.12
 	>=xfce-base/libxfce4util-4.12
-	>=xfce-base/xfconf-4.12
+	>=xfce-base/xfconf-4.13
 	libcanberra? ( >=media-libs/libcanberra-0.25[sound] )
 	input_devices_libinput? ( x11-drivers/xf86-input-libinput )
 	libnotify? ( >=x11-libs/libnotify-0.7 )
@@ -38,8 +38,6 @@ DEPEND="${RDEPEND}
 	>=x11-proto/inputproto-1.4
 	x11-proto/xproto"
 
-DOCS=( AUTHORS ChangeLog NEWS TODO )
-
 src_configure() {
 	econf \
 		$(use_enable upower upower-glib) \
@@ -49,18 +47,10 @@ src_configure() {
 		$(use_enable libcanberra sound-settings)
 }
 
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
 pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
 	gnome2_icon_cache_update
 }
 
 pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
 	gnome2_icon_cache_update
 }