gentoo resync : 18.11.2018

5 files changed, 3 insertions, 186 deletions

diff --git a/xfce-base/xfwm4/Manifest b/xfce-base/xfwm4/Manifest
index a88ca0461909..574181019f09 100644
--- a/xfce-base/xfwm4/Manifest
+++ b/xfce-base/xfwm4/Manifest
@@ -1,12 +1,8 @@
-AUX xfwm4-4.13.0-ctrl-f1.patch 998 BLAKE2B 9124fb6d749875de12cdc4794e923c621a6dbd7d6ee01ccbdaa876a72f41ce1fa2f5dff1ab4b718aa400c46f5a0c65c9d193c413a6ca78d07e99a077ac683134 SHA512 266977cbbedb5656196276c9441922346d936f1cdebdcfb24253add1c4d643344e00046e5574a534a5b5b70ca13826797f6202700b4aac09e0281e5c518428ba
 DIST xfwm4-4.12.4.tar.bz2 1208874 BLAKE2B 60b584d71bc4696bae83897d80cd90d9c13233d1971c823eea6417c8020a0440dc0d648df4e11b27947915ca57130ea3bc7b588e902dc7db74945349ff9ac514 SHA512 a33530b08f094456c45ad7c627ba34d3772eaeacdc9f422a3a54a16194d494cb1d6798122398d917fb8bc970db7e1184d9dc8edefc365dacc86de22be397b43d
 DIST xfwm4-4.12.5.tar.bz2 1215450 BLAKE2B 3a156af589ec7391245edbedbc6e10ac9c746121f68e4bd0c64e30b9b0c11abfe13c1fb77321249edd4e5c8d3051f62f135093fabfd8ba215573d330fd3745c2 SHA512 b723638b9cd858beb75232a251471cfb2d01ddb412b536c3f0b432e1f894014e1ad51c77d208d5439ae8a8d970344d0146d5f9475106c1b66d22715af7af42d9
-DIST xfwm4-4.13.0.tar.bz2 1229878 BLAKE2B 9d7f3d6121a1d1522294a659204d391e120b971cbca00f53f0a0d37f256f2ad65dc6ac1cfd5355d78fa5bd811ed8f7d4013081a10470f18e3edb9fcc0395e218 SHA512 01c6cc31dc179ccb51f9881f64ee9e4e16320ab888381d0b203ca0b2a46097048c30eabe7083aaec869c80e8e358c287896d6a1965a36ed6f2f981c27cfb2dce
 DIST xfwm4-4.13.1-patchset.tar.bz2 2739 BLAKE2B 895ac4939c9f9ab75e7f9e5b237cc731dd619bc87ac7a4f6623dc30ef5f4b7e0a80c826881a430b9c1d42ae0172fb72af2d4ff7c5ad6b54890f6d9233c4ecf49 SHA512 aa918e8efb050b87afb90594cfeb69a4457117b6bd47142d16f3cdf3d1cd7a4d9d2670dbbb68d939f5d2e52a05b42cefb59325963aabad84fd82ddf1f6ffd6f5
 DIST xfwm4-4.13.1.tar.bz2 1224120 BLAKE2B 983b12775ba8998598efb22a2a7ab6f539cb1c6074c3fbaa882b9627e5ad0ff3b96ed0d4352c31dd04451c37dd706404147b87bd899f6b6f1b38df0162b82a15 SHA512 2ac5acdefff3a89b8525719b345dfeb2dc71104b4da341afe99d7c57c049753c4cdb81a512d1f344e5fb463c7143673e83316b63888777bdcf254c4a07ca8320
 EBUILD xfwm4-4.12.4.ebuild 1526 BLAKE2B fb44b379be5c8e5420d2b58b8754f7accbe518442c48b707a36e10ce62220212ea5c6b005d5c3abe3082d24108689adbaac03cb412138983de73c308dcd2da78 SHA512 87d67c9e6ff47c4b785fcbc8e71007ed5af134552fec9616b41bc26a81b72428314999d9969ab261ddd88c1bef4184f78d17a4a9f06970c1ec4565089de1a390
-EBUILD xfwm4-4.12.5.ebuild 1558 BLAKE2B bb4409211fd13a1ce52189b284dff93313c14b7a83f7520c033d057c674a2aad60add8f98e40cbb5c9a2be15b1dec2f0e0080a100ffc78971ec98f2374a11763 SHA512 5af645ff4b16e4215405bfd567907e9063489ab9ecd2e12d4719f40517544b0aeca8c6334c33fad4535574f06a62443ac874215b39aa0988c8b24c79113b5be1
-EBUILD xfwm4-4.13.0-r1.ebuild 1752 BLAKE2B f35aca2c13b7104805d4bac0787c6b03b90bef02ca32bdf306f98bda1ec00d929b3066d8158b400cadb6e011cebd003ebe7c6a777fab0c9fc851a2f55db4a447 SHA512 62821ac7e4454357071cc1953e47d05b3f5d84b367e5d3856ddf726120e692b0e4161597c8046ae32732ae395b891064d66b2efabf497652f3b9adfda9786700
+EBUILD xfwm4-4.12.5.ebuild 1553 BLAKE2B 244f517b4a3baeeeb907c2497582a14f06f764c4925bd30bbb35bd47e4700f627798ccbfcde9c7ee51fee3e4b9d74bfad9680863707ff8dd44e482e4be360d62 SHA512 0a0c53d9ed150bee06a021b1c4cc2d74d921b2ee536375432b34de1060485be535a9fadf9566a84b7f7ca35f90193fef9f91a226b826ff8d4ae370b189151681
 EBUILD xfwm4-4.13.1-r1.ebuild 1897 BLAKE2B 28113547afdd5fc3671ba6414a05560a29050a1fdd21edcad7976b94dbd045dc2ec502d62db0fcefa960ad94603f0cf94716da0644fe8a936339f24ce0b074d2 SHA512 e9be0515a5cfcd81ce74cac2640f10b1bb34b57af7f709f5390e073d6e3b744de8664a0ae2ed58ef601d9ca3a2adab5985a7618dcd426a5f3d40ed83a7c94c2f
-EBUILD xfwm4-4.13.1.ebuild 1722 BLAKE2B 2e1113a5fdc7ad12266f1057b49b95a09d56d4d2eb12c6ff3665b49074781b65e9a2c5e7d9a2947e7a2c7f45238d630fba7fda1c976f551cd662f82102e28013 SHA512 788876e3fa69a3160d04febe1908558a444c83c699774c5a2685afb336a2b5f7323cf27392d25f02bf715fe7c84df0fca24cb2db04ea345d5f21348e2a9178f5
 MISC metadata.xml 336 BLAKE2B 7e0ae4707d98e66226f9572838507c6178d676c00d37b3beb7251a69459ae92ddf8e1061e9a6400d38497c14a22484bdf3e34aad7635f16a1cf4fdc6b9af2966 SHA512 099c7eb76cf479f56e499b979a2461c002088bac30838d46eb228a1810593453b95c26c4f9b0a4cc504fad9eaa3c8e73e5925e26886fff542ec3232fc425bd86
diff --git a/xfce-base/xfwm4/files/xfwm4-4.13.0-ctrl-f1.patch b/xfce-base/xfwm4/files/xfwm4-4.13.0-ctrl-f1.patch
deleted file mode 100644
index 28624ee754c5..000000000000
--- a/xfce-base/xfwm4/files/xfwm4-4.13.0-ctrl-f1.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 012bdbfc826466d7ffae0c52387ae949aa17aabe Mon Sep 17 00:00:00 2001
-From: Olivier Fourdan <fourdan@xfce.org>
-Date: Thu, 23 Mar 2017 11:40:46 +0100
-Subject: [PATCH] Revert "Add PointerMotionHintMask"
-
-Bug: 12534
-
-This reverts commit 0dfb55407a830572f03297b3c118fac1f3c5b80d.
----
- src/client.c     | 1 -
- src/moveresize.c | 1 -
- 2 files changed, 2 deletions(-)
-
-diff --git a/src/client.c b/src/client.c
-index 668c11b0b..6a16971a3 100644
---- a/src/client.c
-+++ b/src/client.c
-@@ -73,7 +73,6 @@
- #define FRAME_EVENT_MASK \
-     SubstructureNotifyMask|\
-     SubstructureRedirectMask|\
--    PointerMotionHintMask|\
-     PointerMotionMask|\
-     ButtonMotionMask|\
-     FocusChangeMask|\
-diff --git a/src/moveresize.c b/src/moveresize.c
-index 026cc0d9e..1c07e8ed7 100644
---- a/src/moveresize.c
-+++ b/src/moveresize.c
-@@ -53,7 +53,6 @@
- #include "xsync.h"
- 
- #define MOVERESIZE_EVENT_MASK \
--    PointerMotionHintMask | \
-     PointerMotionMask | \
-     ButtonMotionMask | \
-     ButtonReleaseMask | \
diff --git a/xfce-base/xfwm4/xfwm4-4.12.5.ebuild b/xfce-base/xfwm4/xfwm4-4.12.5.ebuild
index b1ef18f4ba3a..2cadb01c6353 100644
--- a/xfce-base/xfwm4/xfwm4-4.12.5.ebuild
+++ b/xfce-base/xfwm4/xfwm4-4.12.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ 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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="dri startup-notification +xcomposite"
 
 RDEPEND="dev-libs/dbus-glib:=
diff --git a/xfce-base/xfwm4/xfwm4-4.13.0-r1.ebuild b/xfce-base/xfwm4/xfwm4-4.13.0-r1.ebuild
deleted file mode 100644
index 398cd2db17a7..000000000000
--- a/xfce-base/xfwm4/xfwm4-4.13.0-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils
-
-DESCRIPTION="Window manager 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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="opengl startup-notification +xcomposite xpresent"
-
-RDEPEND="dev-libs/dbus-glib:=
-	>=dev-libs/glib-2.20:=
-	>=x11-libs/gtk+-2.24:2=
-	x11-libs/libX11:=
-	x11-libs/libXext:=
-	x11-libs/libXrandr:=
-	x11-libs/libXrender:=
-	x11-libs/pango:=
-	>=x11-libs/libwnck-2.30:1=
-	>=xfce-base/libxfce4util-4.10:=
-	>=xfce-base/libxfce4ui-4.11:=
-	>=xfce-base/xfconf-4.10:=
-	opengl? ( media-libs/libepoxy:=[X(+)] )
-	startup-notification? ( x11-libs/startup-notification:= )
-	xpresent? ( x11-libs/libXpresent )
-	xcomposite? (
-		x11-libs/libXcomposite:=
-		x11-libs/libXdamage:=
-		x11-libs/libXfixes:=
-		)"
-# libICE/libSM: not really used anywhere but checked by configure
-#   https://bugzilla.xfce.org/show_bug.cgi?id=11914
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	x11-libs/libICE
-	x11-libs/libSM
-	xfce-base/exo
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog COMPOSITOR NEWS README TODO )
-PATCHES=(
-	"${FILESDIR}"/xfwm4-4.13.0-ctrl-f1.patch
-)
-
-src_configure() {
-	local myconf=(
-		$(use_enable opengl epoxy)
-		$(use_enable startup-notification)
-		--enable-xsync
-		--enable-render
-		--enable-randr
-		$(use_enable xpresent)
-		$(use_enable xcomposite compositor)
-	)
-
-	econf "${myconf[@]}"
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/xfce-base/xfwm4/xfwm4-4.13.1.ebuild b/xfce-base/xfwm4/xfwm4-4.13.1.ebuild
deleted file mode 100644
index 6c5cc896faef..000000000000
--- a/xfce-base/xfwm4/xfwm4-4.13.1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils
-
-DESCRIPTION="Window manager 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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="opengl startup-notification +xcomposite xpresent"
-
-RDEPEND="dev-libs/dbus-glib:=
-	>=dev-libs/glib-2.20:=
-	>=x11-libs/gtk+-3.20:3=
-	x11-libs/libX11:=
-	x11-libs/libXext:=
-	x11-libs/libXinerama:=
-	x11-libs/libXrandr:=
-	x11-libs/libXrender:=
-	x11-libs/pango:=
-	>=x11-libs/libwnck-3.14:3=
-	>=xfce-base/libxfce4util-4.10:=
-	>=xfce-base/libxfce4ui-4.12:=
-	>=xfce-base/xfconf-4.13:=
-	opengl? ( media-libs/libepoxy:=[X(+)] )
-	startup-notification? ( x11-libs/startup-notification:= )
-	xpresent? ( x11-libs/libXpresent )
-	xcomposite? (
-		x11-libs/libXcomposite:=
-		x11-libs/libXdamage:=
-		x11-libs/libXfixes:=
-		)"
-# libICE/libSM: not really used anywhere but checked by configure
-#   https://bugzilla.xfce.org/show_bug.cgi?id=11914
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	x11-libs/libICE
-	x11-libs/libSM
-	xfce-base/exo
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog COMPOSITOR NEWS README TODO )
-
-src_configure() {
-	local myconf=(
-		$(use_enable opengl epoxy)
-		$(use_enable startup-notification)
-		--enable-xsync
-		--enable-render
-		--enable-randr
-		$(use_enable xpresent)
-		$(use_enable xcomposite compositor)
-	)
-
-	econf "${myconf[@]}"
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}