gentoo resync : 23.09.2020

3 files changed, 0 insertions, 138 deletions

diff --git a/xfce-base/xfce4-settings/Manifest b/xfce-base/xfce4-settings/Manifest
index 85de267fe92d..cad1e6e76548 100644
--- a/xfce-base/xfce4-settings/Manifest
+++ b/xfce-base/xfce4-settings/Manifest
@@ -1,8 +1,5 @@
-AUX xfce4-settings-4.15.1-install-icons.patch 2160 BLAKE2B 35c3e66101d33e8213dd848194d9d5fa3cbb424b466f2538e5109329064b37d7130c4cc4b4cfd7f65ba023f68d9547d752903be5610925f543d0967a82ccb417 SHA512 e2a5120a65636cc30c381e2065f1322b94cab25bd42a6d79da321328c79cd801919c6e5de0cc11422a461d5f57c2b1a9a4cb9b225ceb4751b9fdd9dc6f816910
 DIST xfce4-settings-4.14.3.tar.bz2 1201308 BLAKE2B daf20e5adda24f3c1ecc88506c1a1cd03b33b379bafc236ed3b99404b816803288041de7d507072a311c3966bb0e040986e358ea94d01636c56ea31c1b843c8d SHA512 fcc5bfa98d8903dc3ac51ec909e542485a44f6c11ddca815508c2ed913410a0becd54b2db6761ee48f5a20d6ca08377eeefbb54bd0cb7cde0a0c0d4b65802ab5
-DIST xfce4-settings-4.15.1.tar.bz2 1366752 BLAKE2B 1f236d39529b7a403691bbc82e5776d3c36af4e3414aa43b49cafb2ed9a9f9793dcd6d2fde35ab0d1a6764976a13ec337e097e64f39f9d7961763487c6021bad SHA512 5749db022e70b7bda3a8de1a09d339a69bd55ef6151e5b0f03f3cdc11ecd285cafd44be36299731d0d535cc396f2ec5afca6255291cfc02e0388977ac5ef19b6
 DIST xfce4-settings-4.15.2.tar.bz2 1415214 BLAKE2B 508a2eaa8c73ab643ed42a768af3f2c5c97ac367a5dd5919f401424e21de6f9bea8a747d9920c396a313f3734ea1bd60d562a35bdd275b32314cc9658a2a4bda SHA512 f286be970d2351d1b47d7ff1ddf862093e8b88cd2d29aa088f81d48c30f120e03c0712526c562fb6fb3cc33939a7098c5d4de8938c1f825b87560544bad7606c
 EBUILD xfce4-settings-4.14.3.ebuild 1563 BLAKE2B 45a73d4ada2598eda4a41b52c695ea07ee0cd3f8aaa6649bcb7fe1a0279832157f17d00ed7406b9ed24ff91b4dc7c0f2bf80a5eaffc31e77b87960e097686459 SHA512 f1984880e7249b27ea37de135af9032460ec93ada9fce55287cfafa1d81abe72e6ab55fe970d7a2edc3af8abc266398ef1d4854992fa918af0eec36ea5e12167
-EBUILD xfce4-settings-4.15.1-r1.ebuild 1668 BLAKE2B 6b40caa5e907176a14b25e13a0ea853455a932d778a7cce87740790c28376c7e61c216b2628cedd1f089454721e7ad9f526db3c48b3000b38c166bcc010f7f8c SHA512 b96dd6e215eaac651d4e2557673f63a59499a933ec354645abe25dbccac4b43846b4e1b62c74d5a7d54e8ed7ed26b3d909ca97fb53a163209a5fe9d595b798ee
 EBUILD xfce4-settings-4.15.2.ebuild 1720 BLAKE2B b843192b87eda54d4b25b010f473d9864922d88878590576759c6cc457853195afbbb8882b471e4fe6c77f6592f29e33cf83e41c76a530345456c1163b2cf170 SHA512 f25fd28f77e09db964b54dd83c27524c02aea1f2b0e954b84123da128868cd58b3c6cbc0da4e4c4bc8a64c6952f4bb9534922da9da66c91e4ba965141d21fa61
 MISC metadata.xml 479 BLAKE2B d15c203e15371edc17aabffe86e690c03c7e853e78c74e0de5753f977dbb9d080813706e3d3170dffb952591abc70f0aea6ac96ce9ca24ca7dbb627beeb8ea1f SHA512 56e89d92ba3fc3c53a86855721394993d8ac930549f19389728e0f8d60de6e92eb3475aeb0e09ca8f43412ba5e86c59482e7488dd5d0cd357968fabc6b3227b9
diff --git a/xfce-base/xfce4-settings/files/xfce4-settings-4.15.1-install-icons.patch b/xfce-base/xfce4-settings/files/xfce4-settings-4.15.1-install-icons.patch
deleted file mode 100644
index 2d84b8e7637d..000000000000
--- a/xfce-base/xfce4-settings/files/xfce4-settings-4.15.1-install-icons.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-# Upstream issue: https://gitlab.xfce.org/xfce/xfce4-settings/-/issues/176
-# This issue has been fixed in upstream master, so this patch won't be need in the future.
-
---- ./Makefile.am	2020-05-27 02:54:17.000000000 +0200
-+++ ./Makefile.am	2020-05-30 23:53:57.647209221 +0200
-@@ -6,15 +6,11 @@
- 	xfce4-settings-manager \
- 	xfce4-settings-editor \
- 	xfsettingsd \
--	po
--
--if HAVE_COLORD
--SUBDIRS += \
-+	po \
- 	icons
- 
- distuninstallcheck_listfiles = 						\
- 	find . -type f -print | grep -v ./share/icons/hicolor/icon-theme.cache
--endif
- 
- EXTRA_DIST = \
- 	intltool-extract.in \
---- ./Makefile.in	2020-05-27 03:07:44.000000000 +0200
-+++ ./Makefile.in	2020-05-30 23:54:08.477620446 +0200
-@@ -87,10 +87,6 @@
- POST_UNINSTALL = :
- build_triplet = @build@
- host_triplet = @host@
--@HAVE_COLORD_TRUE@am__append_1 = \
--@HAVE_COLORD_TRUE@	icons
--
--distuninstallcheck_listfiles = find . -type f -print
- subdir = .
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-@@ -160,8 +156,7 @@
- ETAGS = etags
- CTAGS = ctags
- CSCOPE = cscope
--DIST_SUBDIRS = common dialogs xfce4-settings-manager \
--	xfce4-settings-editor xfsettingsd po icons
-+DIST_SUBDIRS = $(SUBDIRS)
- am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in AUTHORS \
- 	COPYING ChangeLog INSTALL NEWS README TODO compile \
- 	config.guess config.sub install-sh ltmain.sh missing
-@@ -463,10 +457,17 @@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
--SUBDIRS = common dialogs xfce4-settings-manager xfce4-settings-editor \
--	xfsettingsd po $(am__append_1)
--@HAVE_COLORD_TRUE@distuninstallcheck_listfiles = \
--@HAVE_COLORD_TRUE@	find . -type f -print | grep -v ./share/icons/hicolor/icon-theme.cache
-+SUBDIRS = \
-+	common \
-+	dialogs \
-+	xfce4-settings-manager \
-+	xfce4-settings-editor \
-+	xfsettingsd \
-+	po \
-+	icons
-+
-+distuninstallcheck_listfiles = \
-+	find . -type f -print | grep -v ./share/icons/hicolor/icon-theme.cache
- 
- EXTRA_DIST = \
- 	intltool-extract.in \
- dist-tarZ: distdir
- 	@echo WARNING: "Support for distribution archives compressed with" \
- 		       "legacy program 'compress' is deprecated." >&2
diff --git a/xfce-base/xfce4-settings/xfce4-settings-4.15.1-r1.ebuild b/xfce-base/xfce4-settings/xfce4-settings-4.15.1-r1.ebuild
deleted file mode 100644
index 396625415b5d..000000000000
--- a/xfce-base/xfce4-settings/xfce4-settings-4.15.1-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit xdg-utils
-
-DESCRIPTION="Configuration system 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+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="colord input_devices_libinput libcanberra libnotify upower +xklavier"
-
-RDEPEND="
-	>=dev-libs/glib-2.45.8
-	media-libs/fontconfig
-	>=x11-libs/gtk+-3.20:3
-	x11-libs/libX11
-	>=x11-libs/libXcursor-1.1
-	>=x11-libs/libXi-1.3
-	>=x11-libs/libXrandr-1.2
-	>=xfce-base/garcon-0.2:=
-	>=xfce-base/exo-4.15.1:=
-	>=xfce-base/libxfce4ui-4.15.1:=
-	>=xfce-base/libxfce4util-4.12:=
-	>=xfce-base/xfconf-4.13:=
-	colord? ( x11-misc/colord:= )
-	libcanberra? ( >=media-libs/libcanberra-0.25[sound] )
-	input_devices_libinput? ( x11-drivers/xf86-input-libinput )
-	libnotify? ( >=x11-libs/libnotify-0.7 )
-	upower? ( >=sys-power/upower-0.9.23 )
-	xklavier? ( >=x11-libs/libxklavier-5 )
-	!<xfce-base/exo-4.15.1"
-DEPEND="${RDEPEND}
-	dev-util/gdbus-codegen
-	dev-util/intltool
-	virtual/pkgconfig
-	sys-devel/gettext
-	x11-base/xorg-proto"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-install-icons.patch
-)
-
-src_configure() {
-	local myconf=(
-		$(use_enable upower upower-glib)
-		$(use_enable input_devices_libinput xorg-libinput)
-		$(use_enable libnotify)
-		$(use_enable colord)
-		$(use_enable xklavier libxklavier)
-		$(use_enable libcanberra sound-settings)
-	)
-	econf "${myconf[@]}"
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}