gentoo resync : 28.09.2019

3 files changed, 11 insertions, 75 deletions

diff --git a/xfce-base/xfce4-panel/Manifest b/xfce-base/xfce4-panel/Manifest
index 567a2c25e745..e8a8b7bb630e 100644
--- a/xfce-base/xfce4-panel/Manifest
+++ b/xfce-base/xfce4-panel/Manifest
@@ -1,9 +1,7 @@
 DIST xfce4-panel-4.12.2.tar.bz2 1167175 BLAKE2B 09d16c58bb2d78242069fc2191009af6bb737fd6571f7d9ceef4b2b2dc0f0be6fcdad17aa588f69573b9d7f62ca0c54ec712bd467ff793b6952ede733889136b SHA512 b455e28ecbd9e2fc152e1132a806307597157605fef19c61091fce90984b2eded2c0b691d1fa2475c218c9d0b12103e348e648a32d3e8d0aa9ca210b7ae36a9e
-DIST xfce4-panel-4.13.6.tar.bz2 1279153 BLAKE2B dd340dc9f50f7aa7baeb441c22c3705666938638e7de70e8fe286ae4c6e15e156626a64940bccca00e5ded4046a6a2588972e0578929672dcd399dc5f1c7ea3b SHA512 affbf3ce5ba62f5a40ce01554ad0cae34ab57beabcaa674b0d134c515ed49e98bf4269f66f16faee33d2ebeb8254ef69642786d3bd5bbb1b7c2f28e2b344ebd5
-DIST xfce4-panel-4.13.7.tar.bz2 1288128 BLAKE2B 76ee79904a6f412ea42bb7d3261064c4b683fe52df1ac60dccbbae0585da97e86ee1d2a5cf9ac46ed1b66bb915e812965df8e1af16b8833e7cb431955ac4770f SHA512 916a60f9a8eadbce75d3833039c5e6bd2f8db06d60bcedde5f91ce77d0a8a005faf049c3c7832ec29c4441611a21155f864686b00ea9c11b2c476ac2eb471ceb
 DIST xfce4-panel-4.14.0.tar.bz2 1291792 BLAKE2B 16cc35eba39440fd03ff0e55ed1750f52291734e73dc3358f9ea4c819af328205db3e3b62f823f1ac116faa2db162df0ea4709c7f573f1b867a531970158de35 SHA512 47a91b9ce7277612848fd1b48f9c0d6e5169cd0405a99863d685e7a9c5aa3cb8f30694ecdbf657e0f289278dc0c003c8b0784ff03e41e82c1886847ad292972f
+DIST xfce4-panel-4.14.1.tar.bz2 1294087 BLAKE2B d88100d068348aab32f7a133ca98e17c1586f3d6c5ffcb53493e953930108d4d1ebd0972d84c4bd077ab58c4a3ae34303682084daff4e34a168c5c2f981597bf SHA512 1c86362489677f2e04cf3b98dbc1a80b4998335c00a47d256e741446f00437ad04539041648848eca1f45fa1fa70974ca6cf65cb7f762a79a46c16484557e400
 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
 EBUILD xfce4-panel-4.14.0.ebuild 1499 BLAKE2B 36a0768d8ee93c8fc33960e304662b52fba9f71c9123f364940ba4696c1c696ed6699fc4c32030182b49ed5220295eb1627754176763c5a501e22dbbeae304d3 SHA512 567f1f199e3f55f8a647d15497b7bc51e0fa53a904fd57be5bba0d57bee45212863a256b434bfbf2126aa2dd1084637c206529ce94e807a790ff9a2badfae96b
+EBUILD xfce4-panel-4.14.1.ebuild 1499 BLAKE2B 36a0768d8ee93c8fc33960e304662b52fba9f71c9123f364940ba4696c1c696ed6699fc4c32030182b49ed5220295eb1627754176763c5a501e22dbbeae304d3 SHA512 567f1f199e3f55f8a647d15497b7bc51e0fa53a904fd57be5bba0d57bee45212863a256b434bfbf2126aa2dd1084637c206529ce94e807a790ff9a2badfae96b
 MISC metadata.xml 322 BLAKE2B 30f74676e7071e50ef0a877f83148fb5c90b6706e31b9a9b71540c7d5488ec04eed647e345aefe701315855fd047ca721a91031ef1cd7ca04388236d4a404d5e SHA512 3d6a3a46f9e77eb4904ac9385a4ddb3337b97f450c26895c2c3032095f94eb92420fe8d814da7696e4dc7aed3d8ca395aeca7c46914babfa845c6f61cbbe97c7
diff --git a/xfce-base/xfce4-panel/xfce4-panel-4.13.6.ebuild b/xfce-base/xfce4-panel/xfce4-panel-4.13.6.ebuild
deleted file mode 100644
index f29470f5e4c0..000000000000
--- a/xfce-base/xfce4-panel/xfce4-panel-4.13.6.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils xdg-utils
-
-DESCRIPTION="Panel for the Xfce desktop environment"
-HOMEPAGE="https://www.xfce.org/projects/"
-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 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="introspection"
-
-RDEPEND=">=dev-libs/glib-2.42:=
-	>=x11-libs/cairo-1:=
-	>=x11-libs/gtk+-2.20:2=
-	>=x11-libs/gtk+-3.22: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.13:=[introspection?]
-	>=xfce-base/xfconf-4.13:=
-	introspection? ( dev-libs/gobject-introspection:= )"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	dev-util/gtk-doc-am
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_configure() {
-	local myconf=(
-		$(use_enable introspection)
-
-		# enable GTK+2 compatibility
-		--enable-gtk2
-	)
-
-	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.7.ebuild b/xfce-base/xfce4-panel/xfce4-panel-4.14.1.ebuild
index cd40513a3018..0598e0545e8d 100644
--- a/xfce-base/xfce4-panel/xfce4-panel-4.13.7.ebuild
+++ b/xfce-base/xfce4-panel/xfce4-panel-4.14.1.ebuild
@@ -12,20 +12,21 @@ 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 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="introspection vala"
+IUSE="+gtk2 introspection vala"
 REQUIRED_USE="vala? ( introspection )"
+RESTRICT="!gtk2? ( test )"
 
-RDEPEND=">=dev-libs/glib-2.42:=
-	>=x11-libs/cairo-1:=
-	>=x11-libs/gtk+-2.20:2=
-	>=x11-libs/gtk+-3.22:3=[introspection?]
-	x11-libs/libX11:=
-	x11-libs/libwnck:3=
+RDEPEND=">=dev-libs/glib-2.42
+	>=x11-libs/cairo-1
+	>=x11-libs/gtk+-3.22: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.13:=[introspection?]
 	>=xfce-base/xfconf-4.13:=
+	gtk2? ( >=x11-libs/gtk+-2.20:2 )
 	introspection? ( dev-libs/gobject-introspection:= )"
 DEPEND="${RDEPEND}
 	vala? ( $(vala_depend) )
@@ -42,11 +43,9 @@ src_prepare() {
 
 src_configure() {
 	local myconf=(
+		$(use_enable gtk2)
 		$(use_enable introspection)
 		$(use_enable vala)
-
-		# enable GTK+2 compatibility
-		--enable-gtk2
 	)
 
 	use vala && vala_src_prepare