gentoo resync : 15.12.2017

3 files changed, 74 insertions, 8 deletions

diff --git a/xfce-base/xfce4-panel/Manifest b/xfce-base/xfce4-panel/Manifest
index e0fc44b6c95e..50128ceb7d78 100644
--- a/xfce-base/xfce4-panel/Manifest
+++ b/xfce-base/xfce4-panel/Manifest
@@ -1,9 +1,11 @@
 DIST xfce4-panel-4.12.0.tar.bz2 1107470 BLAKE2B 2291b7739de0268d292963e4dc78e6e98c85180b0facd8be765691413053729d3eb198c22b381b9697b2fa4099c4de48404ce9367fd9b7fa17f3a0e6060e819c SHA512 9b5d0d51ac2c312d54e8daeea95bd861891e652faeee8b4a7dbf4b33507b70bf7b4fbca7cb8f2d3573699ae940a14d5a9a41da24f324db256146d8b7db8519a8
 DIST xfce4-panel-4.12.1.tar.bz2 1142476 BLAKE2B a1105bb872c4e506c5d530c494ee41907839b91701d8c596694391a567462919d12c6c536158d1460483f392c5dd4fd4ca7db0f716e8ae66abd87892919b691f SHA512 8bdc2a560a698e7d41429b40cde51ea1bec5aba211b6ee89b46822a38176e27e332efa785d93901d598b17171c739406e7f983372aaa49177db0f868aea985a4
-DIST xfce4-panel-4.13.0.tar.bz2 1182789 BLAKE2B 1f9e4c025865546f70b3e7f73afc8782544caff7ab86866e1d2408a50804851f0824de392b35669d894e601a8e8a1ef3443e446df6abd82f0550cee4628f76ef SHA512 16d5e265d9cdea8a2a5e11b39901ab399e2423038406fcad3d6df164183d29591a9884c205459217229a7dcc3365d59034971a1008fe3471716236fb9df64de2
+DIST xfce4-panel-4.12.2.tar.bz2 1167175 BLAKE2B 09d16c58bb2d78242069fc2191009af6bb737fd6571f7d9ceef4b2b2dc0f0be6fcdad17aa588f69573b9d7f62ca0c54ec712bd467ff793b6952ede733889136b SHA512 b455e28ecbd9e2fc152e1132a806307597157605fef19c61091fce90984b2eded2c0b691d1fa2475c218c9d0b12103e348e648a32d3e8d0aa9ca210b7ae36a9e
 DIST xfce4-panel-4.13.1.tar.bz2 1209889 BLAKE2B 385885cbace0da1dd85c797effb0387101e2b5bdc3781e02df7c793bbba5209876d6fb3b0f3356b5c7d9ec5a47e9b6366ef7f557706b73cb955f766c188072da SHA512 87eb939880ce2c1c677bc46544529c53c3658d31ee10787ef39d88e6ad28870840f3173bded743d0f7bf9e4f2b752fc44140fc3d0c6af9c84e6b2393fba63422
+DIST xfce4-panel-4.13.2.tar.bz2 1231467 BLAKE2B 994aa5daf3e2c09c96dfda82a67bdd5f28dad1edb2ed85fc5c9ac5c314eb426bb6431f9ae9e3fc5b5ee49fd818255c7c2f6abd58bf323a1ac92d2ca520a5224c SHA512 d26ffd904bc2dc1e8b866215c6c07e1c4052d8c46378c33dd45c90833cb4e80c452b7dc5f8d7dab0cfe28657c3eb0f4cb620b823938f54f8eb1ae1e4f8077ed0
 EBUILD xfce4-panel-4.12.0-r1.ebuild 1043 BLAKE2B 1585e2784763e5e45aa0269063851494f29dae6fa4f1f96ed1c7357cb9eec50c38a6e10a5d47defbaec12b412bda9cc1baa48a3effdb64b3932c7ce5d50cf7f3 SHA512 e62be4a2bbe1b8f582ca5a79f6be9996dd2d781f14a1a0492e33c7ed9f275e73163c6413a823a46bbc94bd75baf8df0bdc7b0ca92a35b2d9c733c1f9c0ed5f88
 EBUILD xfce4-panel-4.12.1-r1.ebuild 1038 BLAKE2B 948263536b1b59fe969ec1b514ff026014d54a7177db0f27a98f01486cb5730dba68e3f57bf144f3ec3691e1454020abaf721678e301f0aa1a36ea850b06c5f9 SHA512 03de37918cea674b02bea1f1670904fc703af37b0590562245f753d90a5dcaf47e5ff6117f39c8fd71637e3d91b1867d406449d78a942f7c8808d150bf3cb2f1
-EBUILD xfce4-panel-4.13.0.ebuild 1238 BLAKE2B 65a7edad5bffe6b87ba3f8060f441df1a75bc3a809c86dd8ca3da7a86da69439eea1de68dd3d203a4b9e9c10584a690a4698a259e40d72e2d30b5c630f583611 SHA512 fdf5d29d1f23615b2d4cad57d601045dedd68a801af2b47165ba12eec5d7b1566a857a9dd2458b84fded7a37f03f8415847a5ed6db86dbe1664e8dcb50290322
+EBUILD xfce4-panel-4.12.2.ebuild 1500 BLAKE2B 48a3c362da7500ac7700e0755215ae017614ff339097a430da506e05c2fbe1c0d7b7c3a1734c237a9ad3d34739fd3e0371f234ffe864f5a15ec6a5cba25fd34e SHA512 6933bc191c9d7a6c106584d08ba230dea0ce6af4bf5d10797b29aa1a58c194ea1c7c8df54740fa40e588457452d16a573961adb374d820435f5dc85863cdce23
 EBUILD xfce4-panel-4.13.1.ebuild 1203 BLAKE2B efd12fec4f9da9e9b96b98592882e177332099e015f819fcbc36e419a6d76c75cd50bfe17d474f3597f5c6f17f4074bef4215c7f8cd3084ef7987c0ccc753378 SHA512 fcba4e858f0b1378e35265ddb5b398cdac1074ce0eb2060f2d5d39d5832efed1ea73e34628d13d06defaf73723c1e908251541350744020288a564d02a6f5c63
+EBUILD xfce4-panel-4.13.2.ebuild 1332 BLAKE2B 5613eabebe9bb123d89daf27f0472089c98920b24eb918a2170cca61ee308c97663d9d852ff3011a8757c6e5232ecc1fb8f893efd5316236fbfc85f25c7832cb SHA512 30cc1b1f72f05c7ecf489ae451900c6fec6dde9540e176549d373b2f67673dce674beed4eded84fefcfbe195684d87c7c22b9ee57dadc32e67de380d94edb404
 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
new file mode 100644
index 000000000000..2c30d251cf98
--- /dev/null
+++ b/xfce-base/xfce4-panel/xfce4-panel-4.12.2.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-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="Panel 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 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=""
+
+RDEPEND=">=dev-libs/dbus-glib-0.100:=
+	>=dev-libs/glib-2.24:=
+	>=x11-libs/cairo-1:=
+	>=x11-libs/gtk+-2.20:2=
+	>=x11-libs/gtk+-3.2:3=
+	x11-libs/libX11:=
+	>=x11-libs/libwnck-2.31:1=
+	>=xfce-base/exo-0.8:=
+	>=xfce-base/garcon-0.3:=[gtk2(+)]
+	>=xfce-base/libxfce4ui-4.11:=
+	>=xfce-base/libxfce4util-4.11:=
+	>=xfce-base/xfconf-4.10:="
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	dev-util/gtk-doc-am
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+src_configure() {
+	# Some of the files are missing DBUS_CFLAGS. However, normally they
+	# don't fail because older versions of dep libs pull them in. Put
+	# them explicitly to work with all dependency versions.
+	local -x CPPFLAGS="${CPPFLAGS} $($(tc-getPKG_CONFIG) --cflags dbus-glib-1)"
+	local myconf=(
+		--enable-gtk3
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/xfce-base/xfce4-panel/xfce4-panel-4.13.0.ebuild b/xfce-base/xfce4-panel/xfce4-panel-4.13.2.ebuild
index 7781ed22415c..c6c34ed7b47e 100644
--- a/xfce-base/xfce4-panel/xfce4-panel-4.13.0.ebuild
+++ b/xfce-base/xfce4-panel/xfce4-panel-4.13.2.ebuild
@@ -12,20 +12,20 @@ SRC_URI="mirror://xfce/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="debug"
+IUSE="introspection"
 
-RDEPEND=">=dev-libs/dbus-glib-0.100:=
-	>=dev-libs/glib-2.24:=
+RDEPEND=">=dev-libs/glib-2.24:=
 	>=x11-libs/cairo-1:=
 	>=x11-libs/gtk+-2.20:2=
-	>=x11-libs/gtk+-3.16:3=
+	>=x11-libs/gtk+-3.16:3=[introspection?]
 	x11-libs/libX11:=
 	x11-libs/libwnck:3=
 	>=xfce-base/exo-0.11.2:=
 	>=xfce-base/garcon-0.5:=
 	>=xfce-base/libxfce4ui-4.13:=
-	>=xfce-base/libxfce4util-4.11:=
-	>=xfce-base/xfconf-4.12:="
+	>=xfce-base/libxfce4util-4.13:=[introspection?]
+	>=xfce-base/xfconf-4.13:=
+	introspection? ( dev-libs/gobject-introspection:= )"
 DEPEND="${RDEPEND}
 	dev-lang/perl
 	dev-util/gtk-doc-am
@@ -35,6 +35,8 @@ DEPEND="${RDEPEND}
 
 src_configure() {
 	local myconf=(
+		$(use_enable introspection)
+
 		# enable GTK+2 compatibility
 		--enable-gtk2
 	)