gentoo christmass resync : 25.12.2020

5 files changed, 186 insertions, 158 deletions

diff --git a/x11-plugins/wmmaiload/Manifest b/x11-plugins/wmmaiload/Manifest
index faa64dfedeef..d17a858c5149 100644
--- a/x11-plugins/wmmaiload/Manifest
+++ b/x11-plugins/wmmaiload/Manifest
@@ -1,5 +1,7 @@
 AUX wmmaiload-2.2.1-checkthread.patch 387 BLAKE2B 2c79203a230b8caa9cb3ff85443380843144318146c61750d4c7b7113df9ae51960541adc3d76cbfed412cf1dc7c91687a224f549cb898bcd0a7cb70926fc2cc SHA512 a2edea4c4c0beecd5fe764bf8a591a8367d76997bd747f0c2b11ed6f268f88d57aae0d0c0a085ab9b48c7eca42fe1d2fe3f5ea3246981d42868fedf2336da7d1
-AUX wmmaiload-2.2.1-gtk.patch 6148 BLAKE2B 082a2f93bde9fe08c227770789e1e1b54286f69506fb8208550c46f92a985f5a73854ffd96fb96d1026bf70a13180e0109fb5a4572e3d07fd8c9280412730efe SHA512 f0766111c10af4a3d658804f8fbf4a628df49947fad3f350e2399ae10ffeaf5083291759172155647e54b101dccc2dd66520483302d20f59557e57933564bcb6
+AUX wmmaiload-2.3.0-fno-common.patch 3189 BLAKE2B ce81f29d6b8fb3c95eaeb1859d86cd45a935e595785c26ee756cdebf8b9f7f340b966020796c6ee96d943b3aea7ff81df48d3c05af6119d31cf6c81d5748a2a9 SHA512 689c196834783f969c58d3a3244eb289c0d0a34b7a9c32f9b374f07325b3077f8e231afa1fe91832d0e99e4cc2a54c6a85cf9839bec65a588288e57df60804d3
+AUX wmmaiload-2.3.0-ssl.patch 1008 BLAKE2B 2d62d5549df7facd43df932365bccb11324c90ec79dc0aedc1fc42bde5474aa82c51ab42420bda06d6ae2282d26c8cc8aaf59597bbdee4fdebcec31b0ba509f3 SHA512 2976bba5207b77c80ceb0d1759a170f03915fe7746f051a07a1862e748e1d9f95b717670c5ef7692de8fa995b1a1bf018a15f1ec8a70165dcbe5dff691c12352
 DIST wmmaiload-2.3.0.tar.bz2 42852 BLAKE2B abee44716ff74e48a480881c3327bc4a4f02600044a587b3322429567a3454f01c733542fbaa42cb074a2da48ecd1c453d19ed42c30efc04e634c44330d729d3 SHA512 c4e63eb2868474e3b76f5f4f401bdd23172f23dfdb0e90712e3eca607494057e067805b83a53490d38b6f7b2c876e2ec8fdb1d95b871d3febeeda35369550de9
 EBUILD wmmaiload-2.3.0-r1.ebuild 1113 BLAKE2B a3cd913239de19f6a5ff5e14fb29eef7604b8b1905aa64032b8b327a73dad27a0c6d08eaac75c01cbd64f3b4f576d1e5694e5318bb9f825a182c1ee3e17ad9b9 SHA512 a72ed432d9bb9a1a74ef9d8871d41a6ce92a5afd44394a9b0c51f51b7ce0f85fcd450bac3858ef93c946b9852577d7dfc831eaf1e0b2e39b4f2305655995570d
+EBUILD wmmaiload-2.3.0-r2.ebuild 1035 BLAKE2B 7f64f7542d12e3238a540055e243ab59af69ac2cc39a7d7b6642a9859a18a5347dfcc86faf4c8dd5e6dcbf7d7d2dc6eacee4249b2e8a5855e990c3769a3db6a5 SHA512 9bcd425fe90dc0cc764427d123608c1055b5a2fb5040452598e0bd616151ef39a316e8e84e92adabf7c21dd3e17257b0c2b5812ea80be795e61fd4932b1c9470
 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmmaiload/files/wmmaiload-2.2.1-gtk.patch b/x11-plugins/wmmaiload/files/wmmaiload-2.2.1-gtk.patch
deleted file mode 100644
index 38c8625e51ac..000000000000
--- a/x11-plugins/wmmaiload/files/wmmaiload-2.2.1-gtk.patch
+++ /dev/null
@@ -1,157 +0,0 @@
-diff -ur wmmaiload-2.2.1.orig/wmmaiload/dockapp.c wmmaiload-2.2.1/wmmaiload/dockapp.c
---- wmmaiload-2.2.1.orig/wmmaiload/dockapp.c	2005-07-12 22:39:47.000000000 +0300
-+++ wmmaiload-2.2.1/wmmaiload/dockapp.c	2008-01-12 11:53:00.000000000 +0200
-@@ -27,6 +27,7 @@
- #include <sys/time.h>
- #include <sys/types.h>
- #include <unistd.h>
-+#include <stdlib.h>
- 
- #define WINDOWED_SIZE_W 64
- #define WINDOWED_SIZE_H 64
-diff -ur wmmaiload-2.2.1.orig/wmmaiload-config/actions.c wmmaiload-2.2.1/wmmaiload-config/actions.c
---- wmmaiload-2.2.1.orig/wmmaiload-config/actions.c	2005-07-13 22:54:46.000000000 +0300
-+++ wmmaiload-2.2.1/wmmaiload-config/actions.c	2008-01-12 11:54:15.000000000 +0200
-@@ -3,6 +3,7 @@
-  */
- 
- #include <stdlib.h>
-+#include <string.h>
- #include "defines.h"
- #include "variables.h"
- #include "dialogs.h"
-diff -ur wmmaiload-2.2.1.orig/wmmaiload-config/dialogs.c wmmaiload-2.2.1/wmmaiload-config/dialogs.c
---- wmmaiload-2.2.1.orig/wmmaiload-config/dialogs.c	2005-07-07 21:54:17.000000000 +0300
-+++ wmmaiload-2.2.1/wmmaiload-config/dialogs.c	2008-01-12 11:47:42.000000000 +0200
-@@ -38,7 +38,6 @@
-                            bouton, TRUE, TRUE, 0);
-         GTK_WIDGET_SET_FLAGS(GTK_WIDGET(bouton), GTK_CAN_DEFAULT);
-         gtk_widget_grab_default(GTK_WIDGET(bouton));
--        gtk_widget_draw_default(GTK_WIDGET(bouton));
-         gtk_widget_show(bouton);
- 
-         bouton = gtk_button_new_with_label("No");
-@@ -97,7 +96,6 @@
-                            bouton, TRUE, TRUE, 0);
-         GTK_WIDGET_SET_FLAGS(GTK_WIDGET(bouton), GTK_CAN_DEFAULT);
-         gtk_widget_grab_default(GTK_WIDGET(bouton));
--        gtk_widget_draw_default(GTK_WIDGET(bouton));
-         gtk_widget_show(bouton);
- 
-         gtk_container_set_border_width(GTK_CONTAINER
-diff -ur wmmaiload-2.2.1.orig/wmmaiload-config/Init.make wmmaiload-2.2.1/wmmaiload-config/Init.make
---- wmmaiload-2.2.1.orig/wmmaiload-config/Init.make	2005-08-26 21:37:33.000000000 +0300
-+++ wmmaiload-2.2.1/wmmaiload-config/Init.make	2008-01-12 11:48:12.000000000 +0200
-@@ -35,9 +35,9 @@
- #
- 
- CROSS_COMPILE =
--USER_CPPFLAGS = `gtk-config --cflags`
-+USER_CPPFLAGS = `pkg-config gtk+-2.0 --cflags`
- USER_CFLAGS   =
--USER_LDFLAGS  = `gtk-config --libs` -lX11
-+USER_LDFLAGS  = `pkg-config gtk+-2.0 --libs` -lX11
- 
- 
- #*****************************************************************
-Only in wmmaiload-2.2.1/wmmaiload-config: Init.make.orig
-diff -ur wmmaiload-2.2.1.orig/wmmaiload-config/main.c wmmaiload-2.2.1/wmmaiload-config/main.c
---- wmmaiload-2.2.1.orig/wmmaiload-config/main.c	2005-07-13 22:51:28.000000000 +0300
-+++ wmmaiload-2.2.1/wmmaiload-config/main.c	2008-01-12 11:54:01.000000000 +0200
-@@ -3,6 +3,8 @@
-  */
- 
- #include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
- #include <gtk/gtk.h>
- #include "config.h"
- #include "defines.h"
-diff -ur wmmaiload-2.2.1.orig/wmmaiload-config/mainwindow.c wmmaiload-2.2.1/wmmaiload-config/mainwindow.c
---- wmmaiload-2.2.1.orig/wmmaiload-config/mainwindow.c	2005-07-13 22:51:52.000000000 +0300
-+++ wmmaiload-2.2.1/wmmaiload-config/mainwindow.c	2008-01-12 11:47:42.000000000 +0200
-@@ -10,9 +10,9 @@
- #include "actions.h"
- 
- 
--static GtkWidget *edit;
--static GtkWidget *set;
--static GtkWidget *remove;
-+static GtkWidget *b_edit;
-+static GtkWidget *b_set;
-+static GtkWidget *b_remove;
- 
- static gint list_sel_cb (GtkCList *clist,
-                          gint row,
-@@ -21,9 +21,9 @@
-                          void *data)
- {
-         selected_row = row;
--        gtk_widget_set_sensitive(edit, TRUE);
--        gtk_widget_set_sensitive(set, TRUE);
--        gtk_widget_set_sensitive(remove, TRUE);
-+        gtk_widget_set_sensitive(b_edit, TRUE);
-+        gtk_widget_set_sensitive(b_set, TRUE);
-+        gtk_widget_set_sensitive(b_remove, TRUE);
-         return TRUE;
- }
- 
-@@ -35,9 +35,9 @@
-                     void *data)
- {
-         selected_row = -1;
--        gtk_widget_set_sensitive(edit, FALSE);
--        gtk_widget_set_sensitive(set, FALSE);
--        gtk_widget_set_sensitive(remove, FALSE);
-+        gtk_widget_set_sensitive(b_edit, FALSE);
-+        gtk_widget_set_sensitive(b_set, FALSE);
-+        gtk_widget_set_sensitive(b_remove, FALSE);
-         return TRUE;
- }
- 
-@@ -230,7 +230,7 @@
-         gtk_table_attach_defaults(GTK_TABLE(table), bouton, 0, 1, 0, 1);
-         gtk_widget_set_sensitive(bouton, FALSE);
-         gtk_widget_show(bouton);
--        edit = bouton;
-+        b_edit = bouton;
- 
-         bouton = gtk_button_new_with_label(" Set default ");
-         gtk_signal_connect(GTK_OBJECT(bouton), "clicked",
-@@ -238,7 +238,7 @@
-         gtk_table_attach_defaults(GTK_TABLE(table), bouton, 1, 2, 0, 1);
-         gtk_widget_set_sensitive(bouton, FALSE);
-         gtk_widget_show(bouton);
--        set = bouton;
-+        b_set = bouton;
- 
-         bouton = gtk_button_new_with_label(" Remove box ");
-         gtk_signal_connect(GTK_OBJECT(bouton), "clicked",
-@@ -246,7 +246,7 @@
-         gtk_table_attach_defaults(GTK_TABLE(table), bouton, 2, 3, 0, 1);
-         gtk_widget_set_sensitive(bouton, FALSE);
-         gtk_widget_show(bouton);
--        remove = bouton;
-+        b_remove = bouton;
- 
-         /*--- Frame 5 ---*/
-         frame = gtk_frame_new(NULL);
-@@ -322,7 +322,6 @@
-         gtk_box_pack_start(GTK_BOX(buttons_hbox), bouton, TRUE, TRUE, 0);
-         GTK_WIDGET_SET_FLAGS(GTK_WIDGET(bouton), GTK_CAN_DEFAULT);
-         gtk_widget_grab_default(GTK_WIDGET(bouton));
--        gtk_widget_draw_default(GTK_WIDGET(bouton));
-         gtk_widget_show(bouton);
- 
-         bouton = gtk_button_new_with_label(" Cancel ");
-diff -ur wmmaiload-2.2.1.orig/wmmaiload-config/popedit.c wmmaiload-2.2.1/wmmaiload-config/popedit.c
---- wmmaiload-2.2.1.orig/wmmaiload-config/popedit.c	2005-07-07 21:54:17.000000000 +0300
-+++ wmmaiload-2.2.1/wmmaiload-config/popedit.c	2008-01-12 11:47:42.000000000 +0200
-@@ -68,7 +68,6 @@
-                            bouton, TRUE, TRUE, 0);
-         GTK_WIDGET_SET_FLAGS(GTK_WIDGET(bouton), GTK_CAN_DEFAULT);
-         gtk_widget_grab_default(GTK_WIDGET(bouton));
--        gtk_widget_draw_default(GTK_WIDGET(bouton));
-         gtk_widget_show(bouton);
- 
-         bouton = gtk_button_new_with_label("Cancel");
diff --git a/x11-plugins/wmmaiload/files/wmmaiload-2.3.0-fno-common.patch b/x11-plugins/wmmaiload/files/wmmaiload-2.3.0-fno-common.patch
new file mode 100644
index 000000000000..f4c0eb9763b6
--- /dev/null
+++ b/x11-plugins/wmmaiload/files/wmmaiload-2.3.0-fno-common.patch
@@ -0,0 +1,113 @@
+diff -Naur wmmaiload-2.3.0.orig/wmmaiload-config/main.c wmmaiload-2.3.0/wmmaiload-config/main.c
+--- wmmaiload-2.3.0.orig/wmmaiload-config/main.c	2005-07-13 21:51:28.000000000 +0200
++++ wmmaiload-2.3.0/wmmaiload-config/main.c	2020-12-20 22:04:03.170530520 +0100
+@@ -11,6 +11,18 @@
+ #include "mainwindow.h"
+ #include "actions.h"
+ 
++int backlight;
++int update_interval;
++int boxnum;
++int check_delay;
++int switch_authorized;
++int run_once;
++int test_size;
++char *config_file;
++char *light_color;
++char *command;
++char *notif_cmd;
++MailBox *mboxes;
+ 
+ void Usage ()
+ {
+diff -Naur wmmaiload-2.3.0.orig/wmmaiload-config/mainwindow.c wmmaiload-2.3.0/wmmaiload-config/mainwindow.c
+--- wmmaiload-2.3.0.orig/wmmaiload-config/mainwindow.c	2009-02-23 03:58:00.000000000 +0100
++++ wmmaiload-2.3.0/wmmaiload-config/mainwindow.c	2020-12-20 22:05:14.978622375 +0100
+@@ -9,6 +9,19 @@
+ #include "mainwindow.h"
+ #include "actions.h"
+ 
++GtkWidget *application;
++GtkWidget *filelist;
++GtkWidget *wid_backlight;
++GtkWidget *wid_blink;
++GtkWidget *wid_interval;
++GtkWidget *wid_checkdelay;
++GtkWidget *wid_color;
++GtkWidget *wid_command;
++GtkWidget *wid_notify;
++GtkWidget *wid_runonce;
++GtkWidget *wid_testsize;
++
++int selected_row;
+ 
+ static GtkWidget *b_edit;
+ static GtkWidget *b_set;
+diff -Naur wmmaiload-2.3.0.orig/wmmaiload-config/mainwindow.h wmmaiload-2.3.0/wmmaiload-config/mainwindow.h
+--- wmmaiload-2.3.0.orig/wmmaiload-config/mainwindow.h	2005-07-07 20:54:17.000000000 +0200
++++ wmmaiload-2.3.0/wmmaiload-config/mainwindow.h	2020-12-20 22:05:14.978622375 +0100
+@@ -7,19 +7,19 @@
+ 
+ #include <gtk/gtk.h>
+ 
+-GtkWidget *application;
+-GtkWidget *filelist;
+-GtkWidget *wid_backlight;
+-GtkWidget *wid_blink;
+-GtkWidget *wid_interval;
+-GtkWidget *wid_checkdelay;
+-GtkWidget *wid_color;
+-GtkWidget *wid_command;
+-GtkWidget *wid_notify;
+-GtkWidget *wid_runonce;
+-GtkWidget *wid_testsize;
++extern GtkWidget *application;
++extern GtkWidget *filelist;
++extern GtkWidget *wid_backlight;
++extern GtkWidget *wid_blink;
++extern GtkWidget *wid_interval;
++extern GtkWidget *wid_checkdelay;
++extern GtkWidget *wid_color;
++extern GtkWidget *wid_command;
++extern GtkWidget *wid_notify;
++extern GtkWidget *wid_runonce;
++extern GtkWidget *wid_testsize;
+ 
+-int selected_row;
++extern int selected_row;
+ 
+ gint list_unsel_cb (GtkCList *clist,
+                     gint row,
+diff -Naur wmmaiload-2.3.0.orig/wmmaiload-config/variables.h wmmaiload-2.3.0/wmmaiload-config/variables.h
+--- wmmaiload-2.3.0.orig/wmmaiload-config/variables.h	2005-07-07 20:54:17.000000000 +0200
++++ wmmaiload-2.3.0/wmmaiload-config/variables.h	2020-12-20 22:04:03.170530520 +0100
+@@ -7,17 +7,17 @@
+ 
+ #include "defines.h"
+ 
+-int backlight;
+-int update_interval;
+-int boxnum;
+-int check_delay;
+-int switch_authorized;
+-int run_once;
+-int test_size;
+-char *config_file;
+-char *light_color;
+-char *command;
+-char *notif_cmd;
+-MailBox *mboxes;
++extern int backlight;
++extern int update_interval;
++extern int boxnum;
++extern int check_delay;
++extern int switch_authorized;
++extern int run_once;
++extern int test_size;
++extern char *config_file;
++extern char *light_color;
++extern char *command;
++extern char *notif_cmd;
++extern MailBox *mboxes;
+ 
+ #endif
diff --git a/x11-plugins/wmmaiload/files/wmmaiload-2.3.0-ssl.patch b/x11-plugins/wmmaiload/files/wmmaiload-2.3.0-ssl.patch
new file mode 100644
index 000000000000..812563486256
--- /dev/null
+++ b/x11-plugins/wmmaiload/files/wmmaiload-2.3.0-ssl.patch
@@ -0,0 +1,24 @@
+diff -Naur wmmaiload-2.3.0.orig/wmmaiload/Init.make wmmaiload-2.3.0/wmmaiload/Init.make
+--- wmmaiload-2.3.0.orig/wmmaiload/Init.make	2005-08-28 21:14:57.000000000 +0200
++++ wmmaiload-2.3.0/wmmaiload/Init.make	2020-12-20 22:10:24.487996211 +0100
+@@ -45,7 +45,7 @@
+ # SPECIFIC INFORMATIONS :
+ #
+ 
+-LIB_SSL = $(shell grep -q '^OPTIONS.*HAVE_SSL' ../Config.make && echo '-lssl')
++LIB_SSL = $(shell grep -q '^OPTIONS.*HAVE_SSL' ../Config.make && echo '-lssl -lcrypto')
+ LIB_THREADS = $(shell grep -q '^OPTIONS.*HAVE_THREADS' ../Config.make && echo '-lpthread')
+ 
+ CROSS_COMPILE =
+diff -Naur wmmaiload-2.3.0.orig/wmmaiload/ssl.c wmmaiload-2.3.0/wmmaiload/ssl.c
+--- wmmaiload-2.3.0.orig/wmmaiload/ssl.c	2005-07-30 15:52:55.000000000 +0200
++++ wmmaiload-2.3.0/wmmaiload/ssl.c	2020-12-20 22:10:30.327001632 +0100
+@@ -39,7 +39,7 @@
+ 
+         OpenSSL_add_all_algorithms();
+ 
+-        method = SSLv2_client_method();
++        method = SSLv23_client_method();
+         ctx = SSL_CTX_new(method);
+         return ctx;
+ }
diff --git a/x11-plugins/wmmaiload/wmmaiload-2.3.0-r2.ebuild b/x11-plugins/wmmaiload/wmmaiload-2.3.0-r2.ebuild
new file mode 100644
index 000000000000..79edd2c03eb7
--- /dev/null
+++ b/x11-plugins/wmmaiload/wmmaiload-2.3.0-r2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+DESCRIPTION="dockapp that monitors one or more mailboxes"
+HOMEPAGE="http://tnemeth.free.fr/projets/dockapps.html"
+SRC_URI="http://tnemeth.free.fr/projets/programmes/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/gtk+:2
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.2.1-checkthread.patch
+	"${FILESDIR}"/${P}-fno-common.patch
+	"${FILESDIR}"/${P}-ssl.patch
+)
+
+src_configure() {
+	# The ./configure script is not autoconf based, therefore don't use econf:
+	./configure -p /usr || die
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		CPP="$(tc-getCPP)" \
+		CFLAGS="${CFLAGS}" \
+		DEBUG_LDFLAGS="" \
+		LDFLAGS="${LDFLAGS}" \
+		DEBUG_CFLAGS=""
+}
+
+src_install() {
+	dobin ${PN}/${PN} ${PN}-config/${PN}-config
+	doman doc/*.1
+	dodoc AUTHORS ChangeLog FAQ NEWS README THANKS TODO doc/sample.${PN}rc
+}