gentoo resync : 02.08.2019

4 files changed, 7 insertions, 81 deletions

diff --git a/xfce-base/libxfce4ui/Manifest b/xfce-base/libxfce4ui/Manifest
index 7a0b11a2e68a..57694b316716 100644
--- a/xfce-base/libxfce4ui/Manifest
+++ b/xfce-base/libxfce4ui/Manifest
@@ -1,7 +1,5 @@
 DIST libxfce4ui-4.13.4.tar.bz2 684065 BLAKE2B 1da875832683b5e06b8e91b4078be8122ae85a91560d7b1768cb8c880fcf5e1d7cd07d24927ae3325ba9c500c6c2cd30e717e517775492b9948add0711f5aa40 SHA512 c82d6ff7ea0da4fc0f664bab92f1e9531162996a26bb092e6ba651cfc4551732cbcd8023908d428b47906c17c331c14bf4804256566ca564befa218dc1194206
-DIST libxfce4ui-4.13.5.tar.bz2 742371 BLAKE2B 1ddfed2f6b2c360e39a00c5bbe7c9e2a01595197e808531438eb8f84e8e13680c4fa8a29f0d1ba61be0726222d253921740e73f960fedd12c3ec8339c345ea81 SHA512 5ce49c7052392ac0df74b0d5069fa7880d7b322a15b10c5c20932f10ae06529be2b21d95f7e1c10a8ecb2e38cce9a2d880ac107c3ce1e7f51d570d5ece7b7d3c
-DIST libxfce4ui-4.13.6.tar.bz2 734078 BLAKE2B 18dab32e0d01066f21bcebefbf3c0e96a0c8209f78a7a0577a9592a632005d88f91c7f477f2ad5f5ca499699324a1cb95d9c23356b53d50923e025bd43f63549 SHA512 1992bf5d41fdc200281004f035542f6b5f225edad20e37c9c47fc531e94055473c3747be6026740f0ec32f5ff5f1a42072b624e71b326467711c724372dca8c4
-EBUILD libxfce4ui-4.13.4.ebuild 1733 BLAKE2B 36374a9f88c975b57ccfc7e03b2589ad4c08242290aa692308b43e9e68522dfb7ee061acc059562c70d0a46f3112c0c0bd787d4e162ae45161119b4988bad6ba SHA512 9e972e257858f985b1f105aceeb5a59be40e6d2401b344aa042ee238cbae9ef3b06bd0defb8c66a3553657cfb031f870d03481bc7bde92871b3cf551532b5887
-EBUILD libxfce4ui-4.13.5.ebuild 1742 BLAKE2B 78326ca8b4ed0a27c49f4798d5b56ac46a74635567cefb0e81693f8f029792eaf23ec5ffb0b621e2246cfd79caf7d9fa3c305b32303df872d6c734e47be4b84c SHA512 a14b4b7441711cb1c9daa7de8e2e3dee27be1fdbfe123bd1cd3950847ee1baae60c8c6459f26f7c1b53cc0210b6cbfa2c5978c3e0e195de890921c7b9a40b98d
-EBUILD libxfce4ui-4.13.6.ebuild 1741 BLAKE2B fbc6832b4cb2f76d63d08db3d47fb264e640d56e313f5d586c46ad5bc34515fdd88ffe3526898b508b8a1b124e2dff05e1cba562743cf7defb9bef133230fa63 SHA512 172b3b03a3b66a54129a9fb07aee74e015f3b2cd2b3499d4b537312656b7392d4bcb8fa2e417ae33619717b22970baad2cc3e58494f75a957d0e6d5434d2d10e
+DIST libxfce4ui-4.13.7.tar.bz2 738592 BLAKE2B e59727f05d4772a164ed097ad8629a7327a8a6eafb99d78f3aab093879195b20d2e7f7192dbc3f1c8df67836b98695d274e64744dc57271bd87f9cd1e6e50adc SHA512 bcee0bd7b1f1200c195809b8484778326d02637c06754e876d0fdcdfb860ea642fc342c3fc5cb4b181bfbd58f17a695cc1fa1b318725f774f3b79e544ee4b32d
+EBUILD libxfce4ui-4.13.4.ebuild 1723 BLAKE2B 698707c36f3a30b529171b1a28bd2718e2d4496222704c91c8b86c47098d2a33d0b0fbb0035cdfa371d4d469b9b79c0918d58aaed708a0e826a0fbdd7017b76f SHA512 d58835c325c64a905ee6d34a9647f2cc9c1691d096b99383b1d165dd1d4d4ac6b21b447e23fc64e13717ab957a2d3ebe93621a283acb4062ef411d3714181412
+EBUILD libxfce4ui-4.13.7.ebuild 1731 BLAKE2B 30d3994b8df3509a67c7244ed62d87169c68dfdafb98089d24939512b9dd9695b3833c006be5e297d6e129fe5183ecbae3fb86367ba303a0fb84dbaa5ae6e86a SHA512 4da02374411dd9bf12809deea135f97ce81da05f2a6c6c7be537cc1ffdd26195087d9ab6aa24efbffb840b703760f2388ec67c4a5775a835a8d6ebbb339144be
 MISC metadata.xml 348 BLAKE2B b833ebf4da605db088c633bbd7e8a5747edbffae3671d6049154f89b6ecdcf3054624b5e17d55332f405608d57dd3022c1dd78b81376bd2d28c063291d32073c SHA512 f3894d3ccb668e76deaa0651414359838402d2b1e11fbe816375e6147f89847257008d5807766796fb1249217f6454a5f5896941e7ce3bc79dce09b130db4fc6
diff --git a/xfce-base/libxfce4ui/libxfce4ui-4.13.4.ebuild b/xfce-base/libxfce4ui/libxfce4ui-4.13.4.ebuild
index 6af639e0b19d..83e9a2c0479b 100644
--- a/xfce-base/libxfce4ui/libxfce4ui-4.13.4.ebuild
+++ b/xfce-base/libxfce4ui/libxfce4ui-4.13.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="debug glade introspection startup-notification vala"
 REQUIRED_USE="vala? ( introspection )"
 
diff --git a/xfce-base/libxfce4ui/libxfce4ui-4.13.5.ebuild b/xfce-base/libxfce4ui/libxfce4ui-4.13.5.ebuild
deleted file mode 100644
index 17185100603a..000000000000
--- a/xfce-base/libxfce4ui/libxfce4ui-4.13.5.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils vala
-
-DESCRIPTION="Unified widget and session management libs for Xfce"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="debug glade introspection startup-notification vala"
-REQUIRED_USE="vala? ( introspection )"
-
-RDEPEND=">=dev-libs/glib-2.42:2=
-	>=x11-libs/gtk+-2.24:2=
-	>=x11-libs/gtk+-3.18:3=[introspection?]
-	x11-libs/libX11:=
-	x11-libs/libICE:=
-	x11-libs/libSM:=
-	>=xfce-base/libxfce4util-4.12:=[introspection?]
-	>=xfce-base/xfconf-4.12:=
-	glade? ( dev-util/glade:3.10= )
-	introspection? ( dev-libs/gobject-introspection:= )
-	startup-notification? ( x11-libs/startup-notification:= )
-	vala? ( $(vala_depend) )
-	!xfce-base/xfce-utils"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_prepare() {
-	# stupid vala.eclass...
-	default
-}
-
-src_configure() {
-	local myconf=(
-		$(use_enable introspection)
-		$(use_enable startup-notification)
-		$(use_enable vala)
-		# TODO: check revdeps and make it optional one day
-		--enable-gtk2
-		# requires deprecated glade:3 (gladeui-1.0), bug #551296
-		--disable-gladeui
-		# this one's for :3.10
-		$(use_enable glade gladeui2)
-		--with-vendor-info=Gentoo
-	)
-
-	use vala && vala_src_prepare
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/xfce-base/libxfce4ui/libxfce4ui-4.13.6.ebuild b/xfce-base/libxfce4ui/libxfce4ui-4.13.7.ebuild
index de16912946b7..e44453634d38 100644
--- a/xfce-base/libxfce4ui/libxfce4ui-4.13.6.ebuild
+++ b/xfce-base/libxfce4ui/libxfce4ui-4.13.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="LGPL-2+ GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="debug glade introspection startup-notification vala"
 REQUIRED_USE="vala? ( introspection )"
 
@@ -26,13 +26,13 @@ RDEPEND=">=dev-libs/glib-2.42:2=
 	glade? ( dev-util/glade:3.10= )
 	introspection? ( dev-libs/gobject-introspection:= )
 	startup-notification? ( x11-libs/startup-notification:= )
-	vala? ( $(vala_depend) )
 	!xfce-base/xfce-utils"
 DEPEND="${RDEPEND}
 	dev-lang/perl
 	dev-util/intltool
 	sys-devel/gettext
-	virtual/pkgconfig"
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )"
 
 src_prepare() {
 	# stupid vala.eclass...