gentoo resync : 02.08.2019

4 files changed, 22 insertions, 13 deletions

diff --git a/xfce-base/xfce4-panel/Manifest b/xfce-base/xfce4-panel/Manifest
index d81368122579..384cb4d359bd 100644
--- a/xfce-base/xfce4-panel/Manifest
+++ b/xfce-base/xfce4-panel/Manifest
@@ -1,7 +1,7 @@
 DIST xfce4-panel-4.12.2.tar.bz2 1167175 BLAKE2B 09d16c58bb2d78242069fc2191009af6bb737fd6571f7d9ceef4b2b2dc0f0be6fcdad17aa588f69573b9d7f62ca0c54ec712bd467ff793b6952ede733889136b SHA512 b455e28ecbd9e2fc152e1132a806307597157605fef19c61091fce90984b2eded2c0b691d1fa2475c218c9d0b12103e348e648a32d3e8d0aa9ca210b7ae36a9e
-DIST xfce4-panel-4.13.5.tar.bz2 1259668 BLAKE2B 533f1be8d240787678eae401c07db7d159b2f43c212d57d4fca4bf53f58f033fd12bc193de1740a65dd513658889f5fb404154356bc33eba59fefea8bea27526 SHA512 3eb4034bd6eae38f8f533b8cd2cae4ec8b40cab5f0d6810639baad641b4adaf15d03254ec79cd49d04e3498d3a4752bd9e968a0383468e7337106b3665092c4e
 DIST xfce4-panel-4.13.6.tar.bz2 1279153 BLAKE2B dd340dc9f50f7aa7baeb441c22c3705666938638e7de70e8fe286ae4c6e15e156626a64940bccca00e5ded4046a6a2588972e0578929672dcd399dc5f1c7ea3b SHA512 affbf3ce5ba62f5a40ce01554ad0cae34ab57beabcaa674b0d134c515ed49e98bf4269f66f16faee33d2ebeb8254ef69642786d3bd5bbb1b7c2f28e2b344ebd5
-EBUILD xfce4-panel-4.12.2.ebuild 1504 BLAKE2B 35b2d7c2dbf64d7596d0b413b7ac059d7b163119098dd1019bd4afa9fec3cd20133be387f2d8cf855067cd1305c73f52e9542ead6d2a307ae17d9160caa2d1a9 SHA512 d3c4d3f4097d93e6e17a35dbe20239551cc35257604ccc679571c45efe941e504e356bb1d61fface34182d920b78f20e46c8363c86b8195295cebaf02da042f5
-EBUILD xfce4-panel-4.13.5.ebuild 1342 BLAKE2B 5c38816b491f669710e2e71c927025448eb4d8a01f0c366f96e6e982634e0efddce1879ae40c5069c07ae17751dc344dbc8943844ac8e377e6f4e06f65c83c86 SHA512 4ffa6dcca11069ec55c93f0fd0bd0d113dd938dfc90cbd7a744ed95ff6008349ef47850f83866393dcf33117e4382fe30d787efcf32ec3223ce2363dab2e150a
-EBUILD xfce4-panel-4.13.6.ebuild 1342 BLAKE2B 5c38816b491f669710e2e71c927025448eb4d8a01f0c366f96e6e982634e0efddce1879ae40c5069c07ae17751dc344dbc8943844ac8e377e6f4e06f65c83c86 SHA512 4ffa6dcca11069ec55c93f0fd0bd0d113dd938dfc90cbd7a744ed95ff6008349ef47850f83866393dcf33117e4382fe30d787efcf32ec3223ce2363dab2e150a
+DIST xfce4-panel-4.13.7.tar.bz2 1288128 BLAKE2B 76ee79904a6f412ea42bb7d3261064c4b683fe52df1ac60dccbbae0585da97e86ee1d2a5cf9ac46ed1b66bb915e812965df8e1af16b8833e7cb431955ac4770f SHA512 916a60f9a8eadbce75d3833039c5e6bd2f8db06d60bcedde5f91ce77d0a8a005faf049c3c7832ec29c4441611a21155f864686b00ea9c11b2c476ac2eb471ceb
+EBUILD xfce4-panel-4.12.2.ebuild 1491 BLAKE2B 12dab0bd4770c030e2ff4832d223c06d24da5947d324b0d7c0969fee86e70b7821cfc8bbfe8f6031f57c6f683b033a69c68d8b7c975d66ca78ca6890d9b537e1 SHA512 f1207ea0902c5288b81596959c93e0ff0d8a7026d122cf7750e79aa8eeb8c498df2bee5ca74f0dcb77e7c5ac206de6109d13f219da318661255dc8c566b8e8cf
+EBUILD xfce4-panel-4.13.6.ebuild 1332 BLAKE2B cf1d10ab77e93319b1d0e9e0112d40eb848c06d76ab26bdf41d6f9ed18b8709b827a85809c99d2a8d710c7aafb589552659ffabd5ac3c6ffe66d8cad401688a0 SHA512 76d6935c1d25abd10ae953770c2ce13ecc43c28c22d84ff2f53052f839bc0f40857699f7af3d5e7127365914fb46e57d14990b2459d71beff698f44fdf4d4e1f
+EBUILD xfce4-panel-4.13.7.ebuild 1492 BLAKE2B 1a50249d830963389f9f76e35f1c2b86b9be6e7c64373566ded2de7d63a54cf0c5fb4f5a0c8a8a29a11c844898c26514ec2f094ed321edf7b8bc18b443c0c9cc SHA512 992c9b8625b035f57a2d46a496a4bd90f8080d3228ed18b0a89415632f06d18ea84483c7757e8493273268c04ea2e09505f385acca727c3aa95a34a59b12b1b6
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-base/xfce4-panel/xfce4-panel-4.12.2.ebuild b/xfce-base/xfce4-panel/xfce4-panel-4.12.2.ebuild
index 6e821e9bc726..a65a873337c8 100644
--- a/xfce-base/xfce4-panel/xfce4-panel-4.12.2.ebuild
+++ b/xfce-base/xfce4-panel/xfce4-panel-4.12.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=dev-libs/dbus-glib-0.100:=
diff --git a/xfce-base/xfce4-panel/xfce4-panel-4.13.6.ebuild b/xfce-base/xfce4-panel/xfce4-panel-4.13.6.ebuild
index d395f32b9ac4..f29470f5e4c0 100644
--- a/xfce-base/xfce4-panel/xfce4-panel-4.13.6.ebuild
+++ b/xfce-base/xfce4-panel/xfce4-panel-4.13.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="introspection"
 
 RDEPEND=">=dev-libs/glib-2.42:=
diff --git a/xfce-base/xfce4-panel/xfce4-panel-4.13.5.ebuild b/xfce-base/xfce4-panel/xfce4-panel-4.13.7.ebuild
index d395f32b9ac4..cd40513a3018 100644
--- a/xfce-base/xfce4-panel/xfce4-panel-4.13.5.ebuild
+++ b/xfce-base/xfce4-panel/xfce4-panel-4.13.7.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit gnome2-utils xdg-utils
+inherit vala xdg-utils
 
 DESCRIPTION="Panel for the Xfce desktop environment"
 HOMEPAGE="https://www.xfce.org/projects/"
@@ -11,8 +11,9 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="introspection"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="introspection vala"
+REQUIRED_USE="vala? ( introspection )"
 
 RDEPEND=">=dev-libs/glib-2.42:=
 	>=x11-libs/cairo-1:=
@@ -27,20 +28,28 @@ RDEPEND=">=dev-libs/glib-2.42:=
 	>=xfce-base/xfconf-4.13:=
 	introspection? ( dev-libs/gobject-introspection:= )"
 DEPEND="${RDEPEND}
+	vala? ( $(vala_depend) )
 	dev-lang/perl
 	dev-util/gtk-doc-am
 	dev-util/intltool
 	sys-devel/gettext
 	virtual/pkgconfig"
 
+src_prepare() {
+	# stupid vala.eclass...
+	default
+}
+
 src_configure() {
 	local myconf=(
 		$(use_enable introspection)
+		$(use_enable vala)
 
 		# enable GTK+2 compatibility
 		--enable-gtk2
 	)
 
+	use vala && vala_src_prepare
 	econf "${myconf[@]}"
 }
 
@@ -51,11 +60,11 @@ src_install() {
 }
 
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 	xdg_desktop_database_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 	xdg_desktop_database_update
 }