gentoo resync : 03.03.2021

4 files changed, 11 insertions, 86 deletions

diff --git a/xfce-base/libxfce4ui/Manifest b/xfce-base/libxfce4ui/Manifest
index 8f1b98e11283..33ebd16311c0 100644
--- a/xfce-base/libxfce4ui/Manifest
+++ b/xfce-base/libxfce4ui/Manifest
@@ -1,5 +1,3 @@
-DIST libxfce4ui-4.14.1.tar.bz2 756175 BLAKE2B d487cc0a04b6053ead6670eeb83cafe1c4098818d5ad6a94a81176720d78cfd65160156961cbb526baa1640ae66a5c6958f707b7078c412d81fcd24cc8cf4013 SHA512 f42f41da3a683a0c56c3b1e7ba420c4f50909d2613e681d053b09b50bc0eb7f750f44c892e94b0ee8b9207983a87c0cadbda1ad93d0df74ae351dc8812025407
 DIST libxfce4ui-4.16.0.tar.bz2 837838 BLAKE2B a7e0612bb2a6e47fb9e03c69f1f014740b1ed0f363e198823b328980c106bf5566c880cdeac254291a44ff5a4fc6c8ae95c0396b37e6869e0ec3721897c75d43 SHA512 07ce8399ca860d5414f91b0795ba61eff21b6022a9e8c26de77a6c4e6c45371e10318b626a892b7e2998d95c7e92cf32c2cd48fdefc291bb5521fe8a6cf93aed
-EBUILD libxfce4ui-4.14.1.ebuild 1704 BLAKE2B 83defd465a237ed31b648de09e2f657c3510d3dec1b52a217b4795be00e6206aa7b14f7b073c16cfe0def3155eb577e0a3b0985bc5a582ab6d0f9c264b47c408 SHA512 69d4fb24cc2a9b56e0fa2bc5d4d754cf8e02be58095a96fa0b459c84a8939b36adbd157c1debd42f116f77f484839d518d561d1218c4d1a0acb2c806c3c471cc
-EBUILD libxfce4ui-4.16.0.ebuild 1720 BLAKE2B 16d57a2d6b40c109f393683f758bff2ef837f3b591d0dbc638ef99d63d8a28f707714612e0f1991627bd5604539fd8606d6739e2a0de7c100d7c029158a43b35 SHA512 8e797eeee7bea97dc43324cce5437fb4bd9ba59224871db03ea81788c96918a4f4c2b2aec93de8e8bf0268c04fe282440594065af9f7debf550ca8c4a67fde21
-MISC metadata.xml 500 BLAKE2B 8c4d37d66b1a09a2fe75a1083c83c05ce98d694decbb2aa17d639383c91ab960ca1b729b71ee9a47636f3de4a130a6d0c6ead94a7983090746f355cc4156ba06 SHA512 e1578203a3f9dd88b7df619fdad8ca1ef9e83536f4453b8c302211b6d257d5f5ff09419f769bbf5fb0be0ea10a148107533cf0422bb96833b0d906f4f8ee9155
+EBUILD libxfce4ui-4.16.0.ebuild 1718 BLAKE2B cf127062d1f94a01a639938ebf7bf33cfb4cd4a2235797d91dcb0269eaf6f142dbaa15e71f433015738c1a6ff206bf6a898a687b02b9ae1a895083140a335f23 SHA512 317f89bfe1001b2106df18307754fa06810e3b907157e8fce0902e5767bcf813b7c7cd7fc4458f45d7439fed0a37a8d54ceb20a37736ae69bdd9d5515f51cc16
+MISC metadata.xml 414 BLAKE2B 4d93f626e3c5f6a5d95a1dac1d7caa2f44d294a3206cd5c2452ef1b1c2bc827e923adadec524b9013cfbbd6db5d907fa7e17be2e78b5bd24552b86ff5b5fe448 SHA512 3b0170eb48cad8b1fdfaafa9747c783c5efc906892dc928476992eb9915e1a2fb3864f7f90e513c649c17392916a3dffdc5021955132cb2535698ed7083f566a
diff --git a/xfce-base/libxfce4ui/libxfce4ui-4.14.1.ebuild b/xfce-base/libxfce4ui/libxfce4ui-4.14.1.ebuild
deleted file mode 100644
index f5d7585f78c5..000000000000
--- a/xfce-base/libxfce4ui/libxfce4ui-4.14.1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg-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+ GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="debug glade +gtk2 introspection startup-notification vala"
-REQUIRED_USE="vala? ( introspection )"
-RESTRICT="!gtk2? ( test )"
-
-RDEPEND=">=dev-libs/glib-2.42: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= )
-	gtk2? ( >=x11-libs/gtk+-2.24:2= )
-	introspection? ( dev-libs/gobject-introspection:= )
-	startup-notification? ( x11-libs/startup-notification:= )
-	!xfce-base/xfce-utils"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )"
-
-src_prepare() {
-	# stupid vala.eclass...
-	default
-}
-
-src_configure() {
-	local myconf=(
-		$(use_enable gtk2)
-		$(use_enable introspection)
-		$(use_enable startup-notification)
-		$(use_enable vala)
-		# 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() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/xfce-base/libxfce4ui/libxfce4ui-4.16.0.ebuild b/xfce-base/libxfce4ui/libxfce4ui-4.16.0.ebuild
index 3372adeff840..b3654c0d1649 100644
--- a/xfce-base/libxfce4ui/libxfce4ui-4.16.0.ebuild
+++ b/xfce-base/libxfce4ui/libxfce4ui-4.16.0.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 ~sparc x86 ~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="debug glade +introspection startup-notification system-info vala"
 REQUIRED_USE="vala? ( introspection )"
 
diff --git a/xfce-base/libxfce4ui/metadata.xml b/xfce-base/libxfce4ui/metadata.xml
index dec4318de656..5306afcc9705 100644
--- a/xfce-base/libxfce4ui/metadata.xml
+++ b/xfce-base/libxfce4ui/metadata.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>xfce@gentoo.org</email>
-    <name>XFCE Team</name>
-  </maintainer>
-  <use>
-    <flag name="glade">Build support for Glade 3's GtkBuilder implementation</flag>
-    <flag name="gtk2">Build deprecated GTK+2 libxfce4ui-1 library.</flag>
-    <flag name="system-info">Enable system information in xfce4-about.</flag>
-  </use>
+	<maintainer type="project">
+		<email>xfce@gentoo.org</email>
+		<name>XFCE Team</name>
+	</maintainer>
+	<use>
+		<flag name="glade">Build support for Glade 3's GtkBuilder implementation</flag>
+		<flag name="system-info">Enable system information in xfce4-about.</flag>
+	</use>
 </pkgmetadata>