gentoo (valentine's day) resync : 14.02.2021

4 files changed, 4 insertions, 46 deletions

diff --git a/x11-wm/icewm/Manifest b/x11-wm/icewm/Manifest
index a7f6581fd887..6828da0ee94b 100644
--- a/x11-wm/icewm/Manifest
+++ b/x11-wm/icewm/Manifest
@@ -1,11 +1,10 @@
 AUX icewm 33 BLAKE2B 5605658012ad8ed16bbd4cf0c4cb7cbe5204f73c20ef2c3d9fef1011a80b9e68863de64b45e4b043604b147c9d31f3f5d2617d067b694f5ec5329ad895472b0e SHA512 3fe619e59cc5d354242ccd85d3b1982dd7db6d0f6170f46f9d33975872f6d5a342a08d69db763162dc43681eedb96e9ba5075455bf54adf4fb86bf19887bf6e0
-AUX icewm-2.1.0-appmenu_fix.patch 1200 BLAKE2B c68ccef66b08e43eb97da0624218aa36bea070c6030c8a8c1e8724fce3f12590270620b1e56d09ac01fa713f90b71e82344227fdc62941938c54a6cbc05f23f6 SHA512 7cecdcf8d55ec49ee3c3fa145dc492c6a143690abfd3677937799ef636a5f9db3d7cb65790225337895c32d7cb26c2c888052c6374831123ec56ba1f826b2309
 DIST icewm-1.9.2.tar.lz 1694602 BLAKE2B cf30a695ba48093b386aa2f3af5120e78a9fcc57da9038bcd546ade0986e1bc359a3da91d2eeeb8d3a105173f5d755223675a84b38cfc8c907269efd2561c706 SHA512 7b4f8c47c636a0113af576bc1bcd9fde111ae70eb0bcf21fb1d906ca43bea4d8b0337a728e5da35bcfeabd56c66fd0d14581d7377f063dd750fdf01362b24be2
 DIST icewm-2.0.1.tar.lz 1694439 BLAKE2B 1476f33fa7350a98b7eca8c5c265455d0a78b28bcbd35ab78969b528ae02d3c960fb73cf2b24ea999ee5e08c9f0641d3502c7d5ed8b285777162c334d645b6db SHA512 ac4126b38d592aed60d2269f58c5a1612b61e871565e3c3e51bc2b430e4da6a4708f78e86c16091fa4dfb9eefd4109ae89102ab708e3bce9a44f1e5fe1970c59
-DIST icewm-2.1.0.tar.lz 1696214 BLAKE2B ba91eac4ea425fc9979d1c64fbc2a4c59f1d8004138f31b1e184484cfcaaca7c1a550cd160ff3683a4f663e54efdd5f8ded001317765485259a1f19b8de794a3 SHA512 a57ebbf76640b5296c90c105bdc9b9b2cc55546d324fa18b2e7bfc6bee4442b56176bda4a584d6a73b2297203e1966d7646354bb6e0baaf64fdf0acdb357ee58
 DIST icewm-2.1.1.tar.lz 1695855 BLAKE2B 81903735a71e13953635a4d70547f2518983b5e58fd9e90124e4aecb6b9b53827d48f77bbff3cec59b929456f4c1ab14fde999bbc45f90c8916bbb1017b8eb20 SHA512 7d0acd655f505755fe0b1186b7422a254805bd1c56f00170ecac90272c31c1c0673f781e4e89e04682515b7313dd57b78797398a81edc62b86abc6991abfc45c
+DIST icewm-2.1.2.tar.lz 1694969 BLAKE2B 640af2b7afb34ebcf6fc4f1762161bd8cae124e58735ad3e5af3f8a12723ead71e491fbef9e9119792c54e4e116c7cc491847da1e103b2c46765044bfda71f2d SHA512 92c52b057c7ac1c81eb72cb01d4041715fae2b1c221ecc0e5286a9bfad87e1607a3d7c60dde125436ad32c9a72dac01ee82a3bfe4b671b2d458ba3ce4c0c5a62
 EBUILD icewm-1.9.2.ebuild 2751 BLAKE2B ffbbde71ff1e7e055de75878203dfcfe4ddf47e0883f9c51d9ed4a68d007c1d294d2bc33ce0009b0fb4b5b8c679a341aefc30252fe3fd3cc0a963574a3b31955 SHA512 42c3df4c4709f963e23264785acb1e56df30fb1b580fbdc06029e86cb7c7fe1b78b4dc46d250cae50195404ccd166582d2560940076f7823e368e36de333e333
-EBUILD icewm-2.0.1.ebuild 2949 BLAKE2B 7cbb263b4244bc2112c5dd6ac91a0b970d31e3ce36034a31d036e1fd77d34923da8de8bfe64ef4d212984640d932727a9b362bf7f2ff6ecea10a9ae57db15906 SHA512 96ef7961a4754b355678b222b1c99f5ea7efc2cf2ec5badf951458fadee580c26a5614dccb540b9685d118e6761cf20df14b71b7ce7ef98f84b8df8bfb596e19
-EBUILD icewm-2.1.0-r1.ebuild 3000 BLAKE2B 08a69f1874b68ed1192dbe7025c4f77f66325577350d670df66030e23f86d2b8c978e21fec1858112148c5249abdafc44d663c01a9410aae1a00ed337333012a SHA512 5240155015ce0f1fec204f6e0b724ce9de66be497dd2c8e253a7d0b33b3c5c50f0539fcece9394b24e1b9898f6051e4b052a64c681bbc5ba91d7e49b8b55ac6a
+EBUILD icewm-2.0.1.ebuild 2946 BLAKE2B 70fc1a755565ffbc82b3eca5c5ec01a84d7969a6e58fd1f47e10a4f17872af7332979a912c8b30d1e2d6295a81c132fd60dc4682f3a03ef75f04fc6a6ffe6be6 SHA512 3b7d8a7f1f044a2ee5ac8a18abdd014194f117e75ae2bbc5107165f3dc5bfd10e1d984bb1c5a245883fc11a38e1a542c70eb0c4089bff8a00f1bab140fef54c4
 EBUILD icewm-2.1.1.ebuild 2949 BLAKE2B 7cbb263b4244bc2112c5dd6ac91a0b970d31e3ce36034a31d036e1fd77d34923da8de8bfe64ef4d212984640d932727a9b362bf7f2ff6ecea10a9ae57db15906 SHA512 96ef7961a4754b355678b222b1c99f5ea7efc2cf2ec5badf951458fadee580c26a5614dccb540b9685d118e6761cf20df14b71b7ce7ef98f84b8df8bfb596e19
+EBUILD icewm-2.1.2.ebuild 2949 BLAKE2B 7cbb263b4244bc2112c5dd6ac91a0b970d31e3ce36034a31d036e1fd77d34923da8de8bfe64ef4d212984640d932727a9b362bf7f2ff6ecea10a9ae57db15906 SHA512 96ef7961a4754b355678b222b1c99f5ea7efc2cf2ec5badf951458fadee580c26a5614dccb540b9685d118e6761cf20df14b71b7ce7ef98f84b8df8bfb596e19
 MISC metadata.xml 747 BLAKE2B a986dc65f9b603519ef92fecc63cadd2921d6569e8735956a55ce91673426082e367664cce23c2b80cec19e0d997da357ac8f9d3d78c738ad92f42f6f426c225 SHA512 f9b84c60b780b5999c8a295b64bdf1bdb734108984e48f1271257cb35602df024a347560526de52f43ede16f67031551f4ae3f37401d3320e4dbdfb913e557fe
diff --git a/x11-wm/icewm/files/icewm-2.1.0-appmenu_fix.patch b/x11-wm/icewm/files/icewm-2.1.0-appmenu_fix.patch
deleted file mode 100644
index d159e4d38e3f..000000000000
--- a/x11-wm/icewm/files/icewm-2.1.0-appmenu_fix.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 1d28361a69d773ba0d026119ff197d38900eac0a Mon Sep 17 00:00:00 2001
-From: Bert Gijsbers <gijsbers@science.uva.nl>
-Date: Sat, 23 Jan 2021 16:02:21 +0100
-Subject: [PATCH] Don't unarm menu popup buttons for issue #527.
-
----
- src/ybutton.cc | 9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/src/ybutton.cc b/src/ybutton.cc
-index 1c11756d..745a8f21 100644
---- a/src/ybutton.cc
-+++ b/src/ybutton.cc
-@@ -58,7 +58,7 @@ YButton::~YButton() {
-     }
-     popdown();
-     if (fPopup && fPopup->isShared() == false) {
--        delete fPopup;
-+        delete fPopup; fPopup = nullptr;
-     }
-     if (--buttonObjectCount == 0) {
-         normalButtonFont = null;
-@@ -289,8 +289,13 @@ void YButton::handleButton(const XButtonEvent &button) {
-             setSelected(false);
-         }
-     }
-+    bool unarm = fEnabled && fArmed
-+              && button.type == ButtonRelease
-+              && button.button == Button1
-+              && getClickCount() == 1
-+              && dragging();
-     YWindow::handleButton(button);
--    if (fEnabled && button.type == ButtonRelease && button.button == Button1) {
-+    if (unarm && !fPopupActive) {
-         setArmed(false, false);
-     }
- }
diff --git a/x11-wm/icewm/icewm-2.0.1.ebuild b/x11-wm/icewm/icewm-2.0.1.ebuild
index ec1d0545c005..d813efb61965 100644
--- a/x11-wm/icewm/icewm-2.0.1.ebuild
+++ b/x11-wm/icewm/icewm-2.0.1.ebuild
@@ -11,7 +11,7 @@ LICENSE="GPL-2"
 SRC_URI="https://github.com/ice-wm/icewm/releases/download/${PV}/${P}.tar.lz"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc sparc x86"
 IUSE="+alsa ao bidi debug +gdk-pixbuf imlib nls truetype uclibc xinerama"
 
 # Tests broken in all versions, patches welcome, bug #323907, #389533
diff --git a/x11-wm/icewm/icewm-2.1.0-r1.ebuild b/x11-wm/icewm/icewm-2.1.2.ebuild
index 57f469f48b79..ec1d0545c005 100644
--- a/x11-wm/icewm/icewm-2.1.0-r1.ebuild
+++ b/x11-wm/icewm/icewm-2.1.2.ebuild
@@ -81,10 +81,6 @@ BDEPEND="
 	nls? ( >=sys-devel/gettext-0.19.8 )
 "
 
-PATCHES=(
-	"${FILESDIR}/${P}-appmenu_fix.patch"
-)
-
 pkg_pretend() {
 	if use gdk-pixbuf && use imlib ; then
 		einfo 'Confilcting USE flags have been enabled:'