gentoo resync : 28.04.2021

3 files changed, 20 insertions, 26 deletions

diff --git a/x11-plugins/wmcalendar/Manifest b/x11-plugins/wmcalendar/Manifest
index 6ea86c5cce99..a92e18468304 100644
--- a/x11-plugins/wmcalendar/Manifest
+++ b/x11-plugins/wmcalendar/Manifest
@@ -1,5 +1,5 @@
-AUX wmcalendar-0.5.2-exit-sin-and-cos.patch 2051 BLAKE2B 2b24368f074ed9b806fb578a96d22c0479fff15607dcadcf71afa5f11f001543f69129bc1459e63062b3477cb19c19c5214705b51d2e23a2f581e367b7c82dc2 SHA512 55d2577e321d3261dcb8d9bf95e6d756d69952fd061109d4e93fa0cc5170cd1178efee1fa1d693aa826dbb5b659ca29e78b0f123af55ddfd83a37eef1c030d0e
-AUX wmcalendar-0.5.2-fno-common.patch 3891 BLAKE2B 73f2a7f6defc469f2130baafe5554716cf57f082e74b5dd9d2dd7442f95a94a4d0da50ee43d9f817c91938a66ac211a744d6fe015571e603ebfe1590dc87dc19 SHA512 a3c78e4af3236e31af9f7a597fbf8a0b52733bede9a2c3866a95b4fc886724e10d91899a973108555682d9e611f297316d4cd52d2ae584e7045ee4a6206adfed
+AUX wmcalendar-0.5.2-exit-sin-and-cos.patch 1835 BLAKE2B e85a288b71599ade23e00292c09eaa840eb271f1f96ca3e845462defbc3319912e33e7251b5d08b685a6fc81fab452fe12adff9b575f1ae13f3ed3224cacabc8 SHA512 dba719a3e12fca09f57e412a42e60b32e7d57590a76f606e4646e44bd783784b900e8323122191483f206c6b87e508801ad5c15810b4d98ce0624556b5ba92de
+AUX wmcalendar-0.5.2-fno-common.patch 3113 BLAKE2B 565792a4eb558e553a8c42affb630720b6275d98903094b1b9228b566cdae6bc50a7f91ee24cc1fe21ff514446912e56f47c31963860d116d5e1e1a58e452fac SHA512 8bd1a12b00005c0c9fe2402702034cc3cfef2b2cb76252c16e8315a8180d8f161ffb8c1dcad00a8a488061e0a25fd596bf78ac873131fe76257026890383f698
 AUX wmcalendar-0.5.2-ical.patch 387 BLAKE2B a9e8f848f29a2c83aae4e7f0efaec3efdcad6e56488ce8856a3ff19883b3a2c2ddf948148a8d7c45a3ba358f16274881a3ac8c93a081f4dac48e1ddc93ed334d SHA512 e7460227db5ca45ba3f909eba1ea95244d6464f496cbcbdb96e7879a728dbdcf64e8c25625ef05fb8f19713e400fc4b5c8f879526f734dd3e637d179e7186917
 AUX wmcalendar-0.5.2-rename_kill_func.patch 638 BLAKE2B b29503b9a3c6cfcac5cc970a6185c7a5f536a59baa9c2aae25b0f60507e20e6115889894dc82c336392d02c08d8cab4870352f32f94c5cf8656f470789ee12f6 SHA512 f81f3cdf3ea085dbd43e7b81d80c3d44c17945116996171a90f5823d711675851877e5474acdbd0f73989eb071d11826914e83420c596d1484fb4410a489e857
 DIST wmcalendar-0.5.2.tar.gz 42720 BLAKE2B b2de08905b368322013c3fd6fb4d87b5f7a986bee7b7de24fe2ce3be0003acc5e888dd01d9dedba85fa60ad211be23fb8623b432e5687e4ff2592b514dc549f0 SHA512 8d60a46f26657bf4876057ed092440018055e5a1ab6e2811a9c27f351533bfe6c941dbec10880daafe0858766cb890863cb66bfb70412e025a8d59ab96c663d7
diff --git a/x11-plugins/wmcalendar/files/wmcalendar-0.5.2-exit-sin-and-cos.patch b/x11-plugins/wmcalendar/files/wmcalendar-0.5.2-exit-sin-and-cos.patch
index 1d68111fc261..6ea767a7a2da 100644
--- a/x11-plugins/wmcalendar/files/wmcalendar-0.5.2-exit-sin-and-cos.patch
+++ b/x11-plugins/wmcalendar/files/wmcalendar-0.5.2-exit-sin-and-cos.patch
@@ -1,5 +1,5 @@
---- a/calendarfunc.c	2003-07-13 17:41:02.000000000 +0300
-+++ b/calendarfunc.c	2008-05-03 10:03:06.000000000 +0300
+--- a/calendarfunc.c
++++ b/calendarfunc.c
 @@ -22,7 +22,7 @@
  
  #include "calendarfunc.h"
@@ -9,8 +9,8 @@
  
  
  long persian_jdn(struct icaltimetype dt)
---- a/dockapp.c	2003-07-15 18:15:12.000000000 +0300
-+++ b/dockapp.c	2008-05-03 10:03:34.000000000 +0300
+--- a/dockapp.c
++++ b/dockapp.c
 @@ -23,6 +23,7 @@
   * modified by Seiichi SATO <ssato@sh.rim.or.jp>
   */
@@ -19,8 +19,8 @@
  #include "dockapp.h"
  
  #define WINDOWED_SIZE_W 64
---- a/Makefile	2003-07-15 18:19:26.000000000 +0300
-+++ b/Makefile	2008-05-03 10:11:48.000000000 +0300
+--- a/Makefile
++++ b/Makefile
 @@ -1,19 +1,15 @@
 -CC     = gcc
 +CC     ?= gcc
diff --git a/x11-plugins/wmcalendar/files/wmcalendar-0.5.2-fno-common.patch b/x11-plugins/wmcalendar/files/wmcalendar-0.5.2-fno-common.patch
index 9907634290a2..a889d4a9a9cc 100644
--- a/x11-plugins/wmcalendar/files/wmcalendar-0.5.2-fno-common.patch
+++ b/x11-plugins/wmcalendar/files/wmcalendar-0.5.2-fno-common.patch
@@ -1,6 +1,5 @@
-diff -Naur Src.orig/calendar.c Src/calendar.c
---- Src.orig/calendar.c	2007-01-15 01:14:32.000000000 +0100
-+++ Src/calendar.c	2020-03-29 13:25:39.390760510 +0200
+--- a/calendar.c
++++ b/calendar.c
 @@ -1,5 +1,10 @@
  #include "calendar.h"
  
@@ -12,9 +11,8 @@ diff -Naur Src.orig/calendar.c Src/calendar.c
  int  get_datetype(int day){return datetype[day][0];}
  
  /*------------------------------------------------------
-diff -Naur Src.orig/calendarfunc.c Src/calendarfunc.c
---- Src.orig/calendarfunc.c	2003-07-13 16:41:02.000000000 +0200
-+++ Src/calendarfunc.c	2020-03-29 13:24:07.630789052 +0200
+--- a/calendarfunc.c
++++ b/calendarfunc.c
 @@ -24,6 +24,7 @@
  #include <stdio.h>
  
@@ -23,9 +21,8 @@ diff -Naur Src.orig/calendarfunc.c Src/calendarfunc.c
  
  long persian_jdn(struct icaltimetype dt)
  {
-diff -Naur Src.orig/calendarfunc.h Src/calendarfunc.h
---- Src.orig/calendarfunc.h	2003-07-15 17:19:43.000000000 +0200
-+++ Src/calendarfunc.h	2020-03-29 13:23:23.468802848 +0200
+--- a/calendarfunc.h
++++ b/calendarfunc.h
 @@ -70,5 +70,5 @@
  
  int Ceil(float number);
@@ -33,9 +30,8 @@ diff -Naur Src.orig/calendarfunc.h Src/calendarfunc.h
 -int     datemoon[200][2];   /* hashtable for moonphase.[jdn%32][0] stores moonphase of day jdn, 
 +extern int     datemoon[200][2];   /* hashtable for moonphase.[jdn%32][0] stores moonphase of day jdn, 
  			    [jdn%32][1] stores jdn. */
-diff -Naur Src.orig/calendar.h Src/calendar.h
---- Src.orig/calendar.h	2007-01-15 01:13:50.000000000 +0100
-+++ Src/calendar.h	2020-03-29 13:25:57.657754851 +0200
+--- a/calendar.h
++++ b/calendar.h
 @@ -5,10 +5,10 @@
  #include <sys/stat.h>
  
@@ -51,9 +47,8 @@ diff -Naur Src.orig/calendar.h Src/calendar.h
  				 [jdn%32][1] stores jdn. */
  struct calobj{
      struct icaltimetype start;
-diff -Naur Src.orig/settings.c Src/settings.c
---- Src.orig/settings.c	2003-07-15 17:22:51.000000000 +0200
-+++ Src/settings.c	2020-03-29 13:26:31.673744323 +0200
+--- a/settings.c
++++ b/settings.c
 @@ -1,4 +1,14 @@
  #include "settings.h"
 +
@@ -69,9 +64,8 @@ diff -Naur Src.orig/settings.c Src/settings.c
  void set_lang(int language){lang = language;}
  void setAppicon(int app){appicon = app;}
  void enter_callback( GtkWidget *widget, GtkWidget *entry ){ 
-diff -Naur Src.orig/settings.h Src/settings.h
---- Src.orig/settings.h	2006-09-15 11:56:12.000000000 +0200
-+++ Src/settings.h	2020-03-29 13:26:37.732742450 +0200
+--- a/settings.h
++++ b/settings.h
 @@ -7,14 +7,14 @@