gentoo resync : 03.11.2019

3 files changed, 3 insertions, 70 deletions

diff --git a/xfce-base/xfce4-panel/Manifest b/xfce-base/xfce4-panel/Manifest
index ace23e9d59bd..6423d87280b5 100644
--- a/xfce-base/xfce4-panel/Manifest
+++ b/xfce-base/xfce4-panel/Manifest
@@ -1,7 +1,5 @@
-DIST xfce4-panel-4.12.2.tar.bz2 1167175 BLAKE2B 09d16c58bb2d78242069fc2191009af6bb737fd6571f7d9ceef4b2b2dc0f0be6fcdad17aa588f69573b9d7f62ca0c54ec712bd467ff793b6952ede733889136b SHA512 b455e28ecbd9e2fc152e1132a806307597157605fef19c61091fce90984b2eded2c0b691d1fa2475c218c9d0b12103e348e648a32d3e8d0aa9ca210b7ae36a9e
-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.14.0.ebuild 1499 BLAKE2B 36a0768d8ee93c8fc33960e304662b52fba9f71c9123f364940ba4696c1c696ed6699fc4c32030182b49ed5220295eb1627754176763c5a501e22dbbeae304d3 SHA512 567f1f199e3f55f8a647d15497b7bc51e0fa53a904fd57be5bba0d57bee45212863a256b434bfbf2126aa2dd1084637c206529ce94e807a790ff9a2badfae96b
+DIST xfce4-panel-4.15.0.tar.bz2 1271290 BLAKE2B 6062ed76d8372f5e1ab9def67bcc8c4006ef269309b47740c331c8afef8f320069478846e802c6a090c4a6aa465d79c75e028d52b8f09dd8e1dafa11c8d415ec SHA512 3f4d9a097cb9b9a4ec4296b518e91b13394ca063664c78768dc3e2a964090177485c189c3ff3e118b179d58aafdb27d2edf67ddb49434290eaed157b449fc817
 EBUILD xfce4-panel-4.14.1.ebuild 1493 BLAKE2B 44dceb87cf9a401d27d7fd4b1dda25bbed6d244a8ce0b886b2288a7eb93905ca14d9e48a14f5c8791db3c63c9edae0bed44e12abc03135c3ba91fa994bc48715 SHA512 628a7fc9bfa4baf8cd87d2b577793000bd389147430fc2c5be677218a0f3377e418e9f20ee92d234b7eada4c6fec152dedda0276765e1c4a6c4d3cacbd047075
+EBUILD xfce4-panel-4.15.0.ebuild 1411 BLAKE2B f50f045e4c2a1b80a2917e9808c102c7dba18596d27ce5efe62d35fb3e74cd04693bd1b9bf25db2b9fcc173334ed4001887dc15a353fabe1320102387147ac22 SHA512 35544da6c0f69f586f901c436e2394d58f58a82e1ff83fd3322a0a9c59b2d6e62a09ba58bf311445f515b88454131feb62e73bf8551b1660c60c82a42858e556
 MISC metadata.xml 322 BLAKE2B 30f74676e7071e50ef0a877f83148fb5c90b6706e31b9a9b71540c7d5488ec04eed647e345aefe701315855fd047ca721a91031ef1cd7ca04388236d4a404d5e SHA512 3d6a3a46f9e77eb4904ac9385a4ddb3337b97f450c26895c2c3032095f94eb92420fe8d814da7696e4dc7aed3d8ca395aeca7c46914babfa845c6f61cbbe97c7
diff --git a/xfce-base/xfce4-panel/xfce4-panel-4.12.2.ebuild b/xfce-base/xfce4-panel/xfce4-panel-4.12.2.ebuild
deleted file mode 100644
index a65a873337c8..000000000000
--- a/xfce-base/xfce4-panel/xfce4-panel-4.12.2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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="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=""
-
-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.14.0.ebuild b/xfce-base/xfce4-panel/xfce4-panel-4.15.0.ebuild
index 0598e0545e8d..b4d4d7358e0f 100644
--- a/xfce-base/xfce4-panel/xfce4-panel-4.14.0.ebuild
+++ b/xfce-base/xfce4-panel/xfce4-panel-4.15.0.ebuild
@@ -12,9 +12,8 @@ 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="+gtk2 introspection vala"
+IUSE="introspection vala"
 REQUIRED_USE="vala? ( introspection )"
-RESTRICT="!gtk2? ( test )"
 
 RDEPEND=">=dev-libs/glib-2.42
 	>=x11-libs/cairo-1
@@ -26,7 +25,6 @@ RDEPEND=">=dev-libs/glib-2.42
 	>=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) )
@@ -43,7 +41,6 @@ src_prepare() {
 
 src_configure() {
 	local myconf=(
-		$(use_enable gtk2)
 		$(use_enable introspection)
 		$(use_enable vala)
 	)