gentoo resync : 16.09.2020

6 files changed, 612 insertions, 0 deletions

diff --git a/x11-misc/macopix/Manifest b/x11-misc/macopix/Manifest
index 004f264833e8..70051d5f3507 100644
--- a/x11-misc/macopix/Manifest
+++ b/x11-misc/macopix/Manifest
@@ -1,5 +1,10 @@
 AUX macopix-1.7.4-windres.patch 1842 BLAKE2B 78f1ea6f8ce906c65437dcfbfec777c7c565d00fcc21619b9d71f24295297c9bfdc9bb02f8bd5ca576eb0f5d6b23b1fede712e9615c5e0658ed4368a1105d19f SHA512 02980ad64f1711d744e17d9d906349b729661f00b290218f3b03284c40181d57056174ff9eab1a53a6367d497e7d8ab519076c22995bc0261c9ab6f526a45881
+AUX macopix-3.4.0-CVE-2015-8614.patch 3701 BLAKE2B 261c5214910d76a8eaf85180aed9bc2ee8a5a4ccf24f011b4211aa2326cff3d2ed1a5aed473cac710f6abfe59737fc05549397d944038ef1cbcd7e0f7ae02119 SHA512 0ea37c298b97edb4fc600e6d86d13ba50849843f20995dc3ac62708eefade7f46397992a9c39d475dab0b39a5928f769b7f862636123dca489541a1cc8704381
+AUX macopix-3.4.0-Werror.patch 387 BLAKE2B 0f79e3cd3de0994289cf9b7ff42a849ed70e57c815cdf716892001740e5a5f6b7e335267c388329454aff6f6a62a1bc7d619c6fe7119e796a100e97565ea75fa SHA512 855be914f3e463904261bbef8b48fa35e83d213acb9c787112b1fd6a80b7f13f4bf842bc0617099bcbfae5fff05c69653adfd36e886f6d739c8106a75e78df99
+AUX macopix-3.4.0-fno-common.patch 8807 BLAKE2B b21a6ee329d43b7bec0f86303f5cc2cd49b5731792645053a97be3ee8c56ece1993dac6ab9c727a7528ffa82ab99ff669f553aae2d517fc23c7eaff0c64facb0 SHA512 92866d617ec37bd9ca9214faf199046b561bf91abda2247ffd8cc7f4cb3547ef5e7ebad90c26b32bbe5984c6b51396fa5a2dbce19ce5689b0af1a5dfebaf0cc0
+AUX macopix-3.4.0-windres.patch 271 BLAKE2B 8bec698d590413b88412b7eedc6bead1849affe54ad6e67f7b80cdce57909bb64b9aba1ca8b3629d179260b93d9094a64fbbe77ead4e9b5883f5920253749788 SHA512 c3d5b80325f18f22e14434561ef26e798b639d5a35a52d718fa5bfa408aa9c77069b979b63b23d3e7594e93fd60da6e93dab77585959ab603ca23468e216d1a4
 DIST macopix-1.7.4.tar.bz2 725481 BLAKE2B 1712dba8efe53fa78077d77faf7a84654bb87c72b6d9067484ce8b54da448326543082e2a245fbe1b61c824084744f51c0de321076a0e23586514c694840a040 SHA512 6010f98ecd3aad4325e81f037589cc4e79d857d513687f5243adb6ef3768ace5cddf4f5cdce977a75a4dc769b52bb541bdeefe92cdc012471de950ee81592db7
+DIST macopix-3.4.0.tar.gz 2854634 BLAKE2B 95ecb17588562a86db7e2c7b8c0832ebaea5b56e2c80814c365058954ce2655ac91f0109b1b0db4f7b8c1a98fde7162ee6c23fe3b2187cbeb22681714df2a595 SHA512 99b9dbbc7ca0cb3fa9c1881800e019ccae1c6439f300f479625a5b4877a0578b4a68b131ecbc0adc4a4393a867fd0ac9df7b52adaf2057f14142d1ddaf54fd53
 DIST macopix-mascot-HxB-euc-ja-0.30.tar.gz 803473 BLAKE2B 943f30f19bf2108a7e412ca0404f8c47324fc2e9bac5c13c9fcf35d6a4c9944f25afee3754898e6449f46247572c35a42cbe9f7c1b123f3e9e00fc0f33a0a260 SHA512 8897bd6d30fe3372e91d00add2a1af5d7fd7384ce7668aa9b21952d5be863d04c63af8bb98846c59f54a87af3b60acbd008f6c62b68a22038f29a07e7ba19333
 DIST macopix-mascot-comic_party-euc-ja-1.02.tar.gz 20656 BLAKE2B d2a7022cad1856dcebc7594acad449d4de1909ab7f33788b69c562c2d376427d91e993b2c4300a968566d7fed8d3a7e6f7596ef3adcc7897ed6a1c8fd3bb5815 SHA512 b71a586faef6b878c150e7e8e412c70d8d08919736695108efe2f119aaa01347befcaf222990fbaba10daa57120645e5c77b5534df0e4224feddbaa15c80ecf2
 DIST macopix-mascot-cosmos-euc-ja-1.02.tar.gz 329269 BLAKE2B 87d2357778f6e5d91232054dca16abc71224c1837a7a66569c8891d0720e0ffb2e9ab8745c76f44d0c8827a89afc412d703a1e66e2e46b3c8d7e49940d8c7880 SHA512 05b126b872c7ddf7dfe5b6fdd9654b8f97f6e005d8fa8ad30277a379c333cb0defaad43f9165db4712fc7e4d755fdddd34dce49a99f89c56f4dc951340fc7b1b
@@ -12,4 +17,5 @@ DIST macopix-mascot-triangle_heart-euc-ja-1.02.tar.gz 310099 BLAKE2B f52f2ad14cd
 DIST macopix-mascot-tsukihime-euc-ja-1.02.tar.gz 616138 BLAKE2B 8616fb0f3b8e4b72c6576dfada3794dc3e387d250e3a6f64eb2b290ef793f62c43f20ef9c03d2b309f4fd3860ce828a562f28ec37ca55ce8e2831315ccbd8a63 SHA512 226a175846a1f81a5aeedab6d7b85e38903d3b85a88a4a2c9a91365ba8a149a9ee54d6174bf8c4595cbe6542d3afcebd440a4185402c2139310664059515a2c5
 EBUILD macopix-1.7.4-r1.ebuild 1813 BLAKE2B 91da4479a1a1385166ad0553b27610061e100486dd23b54dbfcdf97543aa6e180282b2f8283cbef50b3567308e9a1a3d5f611b104e46b3614083959cdcef0e97 SHA512 0d5f63840612f49787422e1a670b840db03f381d38cb686873a0bbd8e6cc86f2525b5dc826f4d003c769c03ec801920d389684fc7fa37838d78ddb4a2155f809
 EBUILD macopix-1.7.4-r2.ebuild 1794 BLAKE2B 77e5701b7376e7dd6bdca55bb0428091ccfee074db21885b1768c192f54056462afe11bafd88d6883c7c83d1b655d11b9ce1a6b20699a0b40d250de5ecf1794b SHA512 570bbe33da66bbd83c7d8292dde3033cd89c45482e4b2bffc6dedb12d1b2fc5aadf2f2eead9d1dfb4ca3f6cf1f0bfada9efa15eaeeabfbb444c7ed199b980301
+EBUILD macopix-3.4.0.ebuild 1876 BLAKE2B 15f98c786f0d25315b442ae83158b1447ed532bf41d6719d75a44004cdb5f16f3552f5230ff87146c49ae8c0b0cd953086ef6ac266119d0cc4a4a5353bfbb324 SHA512 6a5ec9ba297e604638c5b6b8c206f850052d33142cfd33e2791e8bbcc177b12378d7e426ab8c329509a2a5842dc6da48b135e981d2c3d8769b2911c0a11a0640
 MISC metadata.xml 272 BLAKE2B 4dbd2b5ae92564a97b2a06ab0ec6562e8dce2dd636aaf0788ee09f8688ca5d5b6483084a65366dfbe6d144d30170e5558bc5759adecb96abb405ea96a5147285 SHA512 ebe67da08587903b5b82fc194aa3c8f1ab65371f60d2c134928362e089550d9e9fd9531bffe8b676a345b5bf0ab209ce7f50d37d98201a88176f002e17582493
diff --git a/x11-misc/macopix/files/macopix-3.4.0-CVE-2015-8614.patch b/x11-misc/macopix/files/macopix-3.4.0-CVE-2015-8614.patch
new file mode 100644
index 000000000000..9bd9d9ecbd96
--- /dev/null
+++ b/x11-misc/macopix/files/macopix-3.4.0-CVE-2015-8614.patch
@@ -0,0 +1,143 @@
+From c3bbb22f131ea6e273d4921bd60c73e78a13e00b Mon Sep 17 00:00:00 2001
+From: "Ying-Chun Liu (PaulLiu)" <paulliu@debian.org>
+Date: Sat, 8 Aug 2020 03:45:19 +0800
+Subject: [PATCH] src/codeconv.c: Fix CVE-2015-8614
+
+This code comes from the latest claws-mail upstream which fixes
+the security issue.
+
+Signed-off-by: Ying-Chun Liu (PaulLiu) <paulliu@debian.org>
+---
+ src/codeconv.c | 74 ++++++++++++++++++++++++++++++++------------------
+ 1 file changed, 48 insertions(+), 26 deletions(-)
+
+diff --git a/src/codeconv.c b/src/codeconv.c
+index 254843e..0efbc13 100644
+--- a/src/codeconv.c
++++ b/src/codeconv.c
+@@ -128,10 +128,14 @@ typedef enum
+ void conv_jistoeuc(gchar *outbuf, gint outlen, const gchar *inbuf)
+ {
+ 	const guchar *in = inbuf;
+-	guchar *out = outbuf;
++	gchar *out = outbuf;
+ 	JISState state = JIS_ASCII;
+ 
+-	while (*in != '\0') {
++	/*
++	 * Loop outputs up to 3 bytes in each pass (aux kanji) and we
++	 * need 1 byte to terminate the output
++	 */
++	while (*in != '\0' && (out - outbuf) < outlen - 4) {
+ 		if (*in == ESC) {
+ 			in++;
+ 			if (*in == '$') {
+@@ -192,6 +196,7 @@ void conv_jistoeuc(gchar *outbuf, gint outlen, const gchar *inbuf)
+ 	}
+ 
+ 	*out = '\0';
++	return ;
+ }
+ 
+ #define JIS_HWDAKUTEN		0x5e
+@@ -263,10 +268,15 @@ static gint conv_jis_hantozen(guchar *outbuf, guchar jis_code, guchar sound_sym)
+ void conv_euctojis(gchar *outbuf, gint outlen, const gchar *inbuf)
+ {
+ 	const guchar *in = inbuf;
+-	guchar *out = outbuf;
++	gchar *out = outbuf;
+ 	JISState state = JIS_ASCII;
+ 
+-	while (*in != '\0') {
++	/*
++	 * Loop outputs up to 6 bytes in each pass (aux shift + aux
++	 * kanji) and we need up to 4 bytes to terminate the output
++	 * (ASCII shift + null)
++	 */
++	while (*in != '\0' && (out - outbuf) < outlen - 10) {
+ 		if (isascii(*in)) {
+ 			K_OUT();
+ 			*out++ = *in++;
+@@ -286,26 +296,32 @@ void conv_euctojis(gchar *outbuf, gint outlen, const gchar *inbuf)
+ 			}
+ 		} else if (iseuchwkana1(*in)) {
+ 			if (iseuchwkana2(*(in + 1))) {
+-			  guchar jis_ch[2];
+-			  gint len;
+-			  
+-			  if (iseuchwkana1(*(in + 2)) &&
+-			      iseuchwkana2(*(in + 3)))
+-			    len = conv_jis_hantozen
+-			      (jis_ch,
+-			       *(in + 1), *(in + 3));
+-			  else
+-			    len = conv_jis_hantozen
+-			      (jis_ch,
+-			       *(in + 1), '\0');
+-			  if (len == 0)
+-			    in += 2;
+-			  else {
+-			    K_IN();
+-			    in += len * 2;
+-			    *out++ = jis_ch[0];
+-			    *out++ = jis_ch[1];
+-			  }
++				if (0) {
++					HW_IN();
++					in++;
++					*out++ = *in++ & 0x7f;
++				} else {
++					guchar jis_ch[2];
++					gint len;
++
++					if (iseuchwkana1(*(in + 2)) &&
++					    iseuchwkana2(*(in + 3)))
++						len = conv_jis_hantozen
++							(jis_ch,
++							 *(in + 1), *(in + 3));
++					else
++						len = conv_jis_hantozen
++							(jis_ch,
++							 *(in + 1), '\0');
++					if (len == 0)
++						in += 2;
++					else {
++						K_IN();
++						in += len * 2;
++						*out++ = jis_ch[0];
++						*out++ = jis_ch[1];
++					}
++				}
+ 			} else {
+ 				K_OUT();
+ 				in++;
+@@ -340,14 +356,19 @@ void conv_euctojis(gchar *outbuf, gint outlen, const gchar *inbuf)
+ 
+ 	K_OUT();
+ 	*out = '\0';
++	return ;
+ }
+ 
+ void conv_sjistoeuc(gchar *outbuf, gint outlen, const gchar *inbuf)
+ {
+ 	const guchar *in = inbuf;
+-	guchar *out = outbuf;
++	gchar *out = outbuf;
+ 
+-	while (*in != '\0') {
++	/*
++	 * Loop outputs up to 2 bytes in each pass and we need 1 byte
++	 * to terminate the output
++	 */
++	while (*in != '\0' && (out - outbuf) < outlen - 3) {
+ 		if (isascii(*in)) {
+ 			*out++ = *in++;
+ 		} else if (issjiskanji1(*in)) {
+@@ -386,6 +407,7 @@ void conv_sjistoeuc(gchar *outbuf, gint outlen, const gchar *inbuf)
+ 	}
+ 
+ 	*out = '\0';
++	return ;
+ }
+ 
+ void conv_anytoeuc(gchar *outbuf, gint outlen, const gchar *inbuf)
diff --git a/x11-misc/macopix/files/macopix-3.4.0-Werror.patch b/x11-misc/macopix/files/macopix-3.4.0-Werror.patch
new file mode 100644
index 000000000000..e3f84dba8e37
--- /dev/null
+++ b/x11-misc/macopix/files/macopix-3.4.0-Werror.patch
@@ -0,0 +1,11 @@
+--- a/m4/visibility.m4
++++ b/m4/visibility.m4
+@@ -32,7 +32,7 @@
+     AC_MSG_CHECKING([whether the -Werror option is usable])
+     AC_CACHE_VAL([gl_cv_cc_vis_werror], [
+       gl_save_CFLAGS="$CFLAGS"
+-      CFLAGS="$CFLAGS -Werror"
++      CFLAGS="$CFLAGS -Werror -setthisupforfailure"
+       AC_COMPILE_IFELSE(
+         [AC_LANG_PROGRAM([[]], [[]])],
+         [gl_cv_cc_vis_werror=yes],
diff --git a/x11-misc/macopix/files/macopix-3.4.0-fno-common.patch b/x11-misc/macopix/files/macopix-3.4.0-fno-common.patch
new file mode 100644
index 000000000000..745997046461
--- /dev/null
+++ b/x11-misc/macopix/files/macopix-3.4.0-fno-common.patch
@@ -0,0 +1,357 @@
+From f29175b892026dbc4a8ad321e426f22e0a09b248 Mon Sep 17 00:00:00 2001
+From: "Ying-Chun Liu (PaulLiu)" <paulliu@debian.org>
+Date: Sat, 8 Aug 2020 03:48:43 +0800
+Subject: [PATCH] Porting to gcc 10
+
+GCC will reject multiple definitions of global variables starting
+from gcc-10. We need to move the definitions to a real object file.
+And in headers we only extern it.
+
+Signed-off-by: Ying-Chun Liu (PaulLiu) <paulliu@debian.org>
+---
+ src/main.c |  42 ++++++++++++++++++
+ src/main.h | 123 +++++++++++++++++++++++++++++++----------------------
+ 2 files changed, 113 insertions(+), 52 deletions(-)
+
+diff --git a/src/main.c b/src/main.c
+index 7944618..ce187a1 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -35,6 +35,48 @@
+ // *** GLOBAL ARGUMENT ***
+ 
+ gboolean FlagInstalledMenu;
++enum MENU_EXT_t MENU_EXT;
++enum MaCoPiXFolder_t MaCoPiXFolder;
++enum ClockMode_t ClockMode;
++enum HomePos_t HomePos;
++enum MoveMode_t MoveMode;
++#ifdef USE_OSX
++enum MAC_LAYER_MODE_t MAC_LAYER_MODE;
++#endif
++enum FFPos_t FFPos;
++enum AutoBar_t AutoBar;
++enum PosBalloon_t PosBalloon;
++enum TypBalloon_t TypBalloon;
++enum DuetAnimeMode_t DuetAnimeMode;
++enum TypInterpolate_t TypInterpolate;
++enum ClockType_t ClockType;
++enum MenuSelect_t MenuSelect;
++enum GuiFontConf_t GuiFontConf;
++enum GuiColorConf_t GuiColorConf;
++enum SetReleaseData_t SetReleaseData;
++enum MailStatus0_t MailStatus0;
++enum MailPixPos_t MailPixPos;
++enum MailStatus_t MailStatus;
++enum SignalAction_t SignalAction;
++enum ConsMode_t ConsMode;
++enum ScanMenuDir_t ScanMenuDir;
++enum CompositeFlag_t CompositeFlag;
++#ifdef USE_GTK3
++GdkPixbuf *pixbuf_main, *pixbuf_clk, *pixbuf_bal;
++#ifdef USE_WIN32
++GdkPixbuf *pixbuf_sdw;
++#endif
++#else  // USE_GTK3
++GdkPixmap *pixmap_main, *pixmap_clk, *pixmap_bal;
++#ifdef USE_WIN32
++GdkPixmap *pixmap_sdw;
++#endif
++#endif // USE_GTK3
++gint window_x, window_y;
++gboolean supports_alpha;
++gboolean flag_balloon;
++
++pid_t http_pid;
+ 
+ // Prototype of functions in this file
+ #ifdef USE_GTK3
+diff --git a/src/main.h b/src/main.h
+index 496815e..42577a6 100644
+--- a/src/main.h
++++ b/src/main.h
+@@ -217,10 +217,11 @@
+ #define MENU_EXTRACT_GTAR_COMMAND "tar -zxf %s -C %s "
+ 
+ // MENU
+-enum{ MENU_MENU,
++enum MENU_EXT_t { MENU_MENU,
+ 	MENU_LHA,
+ 	MENU_TAR
+-	}MENU_EXT;
++};
++extern enum MENU_EXT_t MENU_EXT;
+ 
+ 
+ // 画像ファイル用拡張子
+@@ -252,11 +253,12 @@ enum{ MENU_MENU,
+ #define SOUNDDIR "sound" G_DIR_SEPARATOR_S
+ 
+ // Folder
+-enum{ FOLDER_DEFAULT,
++enum MaCoPiXFolder_t { FOLDER_DEFAULT,
+ 	FOLDER_PIX,
+ 	FOLDER_SOUND,
+ 	FOLDER_CURRENT
+-	}MaCoPiXFolder;
++};
++extern enum MaCoPiXFolder_t MaCoPiXFolder;
+ 
+ // 個人用セーブファイル
+ //  (USER_DIR中に作成 : マスコット非依存パラメータを保存)
+@@ -292,10 +294,11 @@ enum{ FOLDER_DEFAULT,
+ 
+ 
+ // CLOCK_MODE
+-enum{ CLOCK_NO,
++enum ClockMode_t { CLOCK_NO,
+       CLOCK_PIXMAP,
+       CLOCK_PANEL
+-}ClockMode;
++};
++extern enum ClockMode_t ClockMode;
+ 
+ //ANIME
+ #define MAX_PIXMAP   64
+@@ -330,47 +333,54 @@ enum{ CLOCK_NO,
+ #define ROOTOFF_Y (-10)
+ 
+ // Home Position Mode
+-enum{ HOMEPOS_NEVER, HOMEPOS_VANISH, HOMEPOS_BAR } HomePos;
++enum HomePos_t { HOMEPOS_NEVER, HOMEPOS_VANISH, HOMEPOS_BAR };
++extern enum HomePos_t HomePos;
+ 
+ // Titlebar Offset for Focus Follow
+ enum{ FF_BAR_ABS, FF_BAR_REL };
+ 
+ 
+ // MOVE mode
+-enum{
++enum MoveMode_t {
+   MOVE_FIX,
+   MOVE_FOCUS
+-}MoveMode;
++};
++extern enum MoveMode_t MoveMode;
+ 
+ #ifdef USE_OSX
+-enum {
++enum MAC_LAYER_MODE_t {
+      MAC_LAYER_DEFAULT,
+      MAC_LAYER_TOP,
+      NUM_MAC_LAYER
+-}MAC_LAYER_MODE;
++};
++extern enum MAC_LAYER_MODE_t MAC_LAYER_MODE;
+ #endif
+ 
+ // Focus Follow 基準位置
+-enum{ FF_SIDE_LEFT, FF_SIDE_RIGHT } FFPos;
++enum FFPos_t { FF_SIDE_LEFT, FF_SIDE_RIGHT };
++extern enum FFPos_t FFPos;
+ 
+ // Focus Autobar タイトルバー算出法
+-enum{ AUTOBAR_MANUAL, AUTOBAR_ORDINAL, AUTOBAR_COMPIZ } AutoBar;
++enum AutoBar_t { AUTOBAR_MANUAL, AUTOBAR_ORDINAL, AUTOBAR_COMPIZ };
++extern enum AutoBar_t AutoBar;
+ 
+ 
+ // Balloon Position
+-enum{
++enum PosBalloon_t{
+   BAL_POS_LEFT,
+     BAL_POS_RIGHT
+-    } PosBalloon;
++    };
++extern enum PosBalloon_t PosBalloon;
+ 
+ // Balloon Mode
+-enum{BALLOON_NORMAL,
++enum TypBalloon_t {BALLOON_NORMAL,
+        BALLOON_MAIL,
+        BALLOON_POPERROR,
+        BALLOON_SOCKMSG,
+        BALLOON_DUET,
+        BALLOON_SYS
+-       } TypBalloon;
++       };
++extern enum TypBalloon_t TypBalloon;
+ 
+ // Biff用 Balloonの自然消滅コマ数
+ #define BALLOON_EXPIRE    150
+@@ -394,39 +404,41 @@ typedef enum {
+ #define DEF_DUET_DELAY    20
+ 
+ // Duet Anime mode
+-enum{
++enum DuetAnimeMode_t {
+   DUET_CLICK,
+     DUET_RANDOM
+-    }DuetAnimeMode;
+-
++    };
++extern enum DuetAnimeMode_t DuetAnimeMode;
+ 
+ // Interpolation Style for Magnification
+-enum{	 MAG_IP_NEAREST,
++enum TypInterpolate_t {	 MAG_IP_NEAREST,
+ 	 MAG_IP_TILES,
+ 	 MAG_IP_BILINEAR,
+ 	 MAG_IP_HYPER
+-	   } TypInterpolate;
+-
++	   };
++extern enum TypInterpolate_t TypInterpolate;
+ 
+ //Clock タイプ
+-enum{ CLOCK_TYPE_24S, 
++enum ClockType_t { CLOCK_TYPE_24S, 
+ 	CLOCK_TYPE_24M, 
+ 	CLOCK_TYPE_12S, 
+-	CLOCK_TYPE_12M } ClockType;
+-
++	CLOCK_TYPE_12M };
++extern enum ClockType_t ClockType;
+ 
+ // Font size ratio for AM/PM sign
+ #define CLOCK_AMPM_RATIO 0.6
+ 
+ // Install mode
+-enum{   MENU_SELECT, 
++enum MenuSelect_t {   MENU_SELECT, 
+ 	MENU_INSTALL_USER,
+ 	MENU_INSTALL_COMMON,
+ 	START_MENU_SELECT,
+ 	START_MENU_INSTALL_USER,
+ 	START_MENU_INSTALL_COMMON,
+ 	NUM_INSTALL_MODE
+- } MenuSelect;
++ };
++extern enum MenuSelect_t MenuSelect;
++
+ 
+ //DEFAULT Alpha
+ #define DEF_ALPHA_MAIN 100
+@@ -542,14 +554,15 @@ static GdkColor color_lred=   {0, 0xFFFF, 0xBBBB, 0xBBBB};
+ 
+ 
+ // for Callback of Configuration Dialog
+-enum{CONF_FONT_CLK,	   
++enum GuiFontConf_t {CONF_FONT_CLK,	   
+        CONF_FONT_BAL,	   
+        CONF_DEF_FONT_CLK,
+        CONF_DEF_FONT_BAL,
+        INIT_DEF_FONT_CLK,
+-       INIT_DEF_FONT_BAL} GuiFontConf;
++       INIT_DEF_FONT_BAL};
++extern enum GuiFontConf_t GuiFontConf;
+ 
+-enum{CONF_COLOR_CLK,
++enum GuiColorConf_t {CONF_COLOR_CLK,
+      CONF_COLOR_CLKBG,
+      CONF_COLOR_CLKBD,
+      CONF_COLOR_CLKSD,
+@@ -568,19 +581,21 @@ enum{CONF_COLOR_CLK,
+      CONF_COLOR_FS_BG0,
+      CONF_COLOR_FS_BG1,
+      NUM_CONF_COLOR
+-} GuiColorConf;
+-
+-enum{ SET_RELEASE_BALLOON, SET_RELEASE_CLOCK } SetReleaseData;
+-
++};
++extern enum GuiColorConf_t GuiColorConf;
+ 
++enum SetReleaseData_t { SET_RELEASE_BALLOON, SET_RELEASE_CLOCK };
++extern enum SetReleaseData_t SetReleaseData;
+ 
+ // Setting for BIFF
+ #define DEF_MAIL_INTERVAL 60
+ 
+ 
+-enum{ MAIL_NO, MAIL_LOCAL, MAIL_POP3, MAIL_APOP, MAIL_QMAIL, MAIL_PROCMAIL } MailStatus0;
++enum MailStatus0_t { MAIL_NO, MAIL_LOCAL, MAIL_POP3, MAIL_APOP, MAIL_QMAIL, MAIL_PROCMAIL };
++extern enum MailStatus0_t MailStatus0;
+ 
+-enum{ MAIL_PIX_LEFT, MAIL_PIX_RIGHT } MailPixPos;
++enum MailPixPos_t { MAIL_PIX_LEFT, MAIL_PIX_RIGHT };
++extern enum MailPixPos_t MailPixPos;
+ 
+ #undef POP_DEBUG  /* pop3 debugging mode */
+ 
+@@ -609,7 +624,8 @@ enum{ MAIL_PIX_LEFT, MAIL_PIX_RIGHT } MailPixPos;
+ #define BIFF_TOOLTIPS   TRUE
+ 
+ 
+-enum{ NO_MAIL, OLD_MAIL, NEW_MAIL, KEEP_NEW_MAIL } MailStatus;
++enum MailStatus_t { NO_MAIL, OLD_MAIL, NEW_MAIL, KEEP_NEW_MAIL };
++extern enum MailStatus_t MailStatus;
+ 
+ // mail status; array subscripts
+ 
+@@ -637,14 +653,17 @@ enum{ NO_MAIL, OLD_MAIL, NEW_MAIL, KEEP_NEW_MAIL } MailStatus;
+ 
+ 
+ // 時報用設定
+-enum{ SIGACT_NO, SIGACT_CLICK, SIGACT_CHANGE } SignalAction;
++enum SignalAction_t { SIGACT_NO, SIGACT_CLICK, SIGACT_CHANGE };
++extern enum SignalAction_t SignalAction;
+ 
+ 
+ // Consistency Check
+-enum{ CONS_MANUAL, CONS_AUTOOW, CONS_IGNORE } ConsMode;
++enum ConsMode_t { CONS_MANUAL, CONS_AUTOOW, CONS_IGNORE };
++extern enum ConsMode_t ConsMode;
+ 
+ // メニューの場所
+-enum{ SMENU_DIR_COMMON, SMENU_DIR_USER } ScanMenuDir;
++enum ScanMenuDir_t { SMENU_DIR_COMMON, SMENU_DIR_USER };
++extern enum ScanMenuDir_t ScanMenuDir;
+ 
+ 
+ typedef enum {
+@@ -661,11 +680,11 @@ typedef enum {
+ 
+ 
+ // COMPOSITE_FLAG
+-enum{ COMPOSITE_FALSE,
++enum CompositeFlag_t { COMPOSITE_FALSE,
+       COMPOSITE_TRUE,
+       COMPOSITE_UNKNOWN
+-}CompositeFlag;
+-
++};
++extern enum CompositeFlag_t CompositeFlag;
+ 
+ 
+ 
+@@ -1137,21 +1156,21 @@ typedef struct{
+ 
+ ///////////   Global Arguments   //////////
+ #ifdef USE_GTK3
+-GdkPixbuf *pixbuf_main, *pixbuf_clk, *pixbuf_bal;
++extern GdkPixbuf *pixbuf_main, *pixbuf_clk, *pixbuf_bal;
+ #ifdef USE_WIN32
+-GdkPixbuf *pixbuf_sdw;
++extern GdkPixbuf *pixbuf_sdw;
+ #endif
+ #else  // USE_GTK3
+-GdkPixmap *pixmap_main, *pixmap_clk, *pixmap_bal;
++extern GdkPixmap *pixmap_main, *pixmap_clk, *pixmap_bal;
+ #ifdef USE_WIN32
+-GdkPixmap *pixmap_sdw;
++extern GdkPixmap *pixmap_sdw;
+ #endif
+ #endif // USE_GTK3
+-gint window_x, window_y;
+-gboolean supports_alpha;
+-gboolean flag_balloon;
++extern gint window_x, window_y;
++extern gboolean supports_alpha;
++extern gboolean flag_balloon;
+ 
+-pid_t http_pid;
++extern pid_t http_pid;
+ 
+ 
+ ///////////   Proto types   //////////
diff --git a/x11-misc/macopix/files/macopix-3.4.0-windres.patch b/x11-misc/macopix/files/macopix-3.4.0-windres.patch
new file mode 100644
index 000000000000..39d509bcd355
--- /dev/null
+++ b/x11-misc/macopix/files/macopix-3.4.0-windres.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -57,7 +57,7 @@
+ AC_PROG_YACC
+ AM_PROG_LIBTOOL
+ 
+-AC_CHECK_PROG(WINDRES, windres, windres)
++AC_CHECK_PROG(WINDRES, windres-does-not-exist, windres)
+ AM_CONDITIONAL(HAVE_WINDRES, test x"$WINDRES" != x)
+ 
+ # Checks for header files.
diff --git a/x11-misc/macopix/macopix-3.4.0.ebuild b/x11-misc/macopix/macopix-3.4.0.ebuild
new file mode 100644
index 000000000000..4765b8dbb419
--- /dev/null
+++ b/x11-misc/macopix/macopix-3.4.0.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+DESCRIPTION="MaCoPiX (Mascot Constructive Pilot for X) is a desktop mascot application"
+HOMEPAGE="http://rosegray.sakura.ne.jp/macopix/index-e.html"
+
+BASE_URI="http://rosegray.sakura.ne.jp/macopix"
+SRC_URI="${BASE_URI}/${P}.tar.gz"
+
+# NOTE: These mascots are not redistributable on commercial CD-ROM.
+# The author granted to use them under Gentoo Linux.
+MACOPIX_MASCOTS="
+	macopix-mascot-HxB-euc-ja-0.30
+	macopix-mascot-marimite-euc-ja-2.20
+	macopix-mascot-cosmos-euc-ja-1.02
+	macopix-mascot-mizuiro-euc-ja-1.02
+	macopix-mascot-pia2-euc-ja-1.02
+	macopix-mascot-tsukihime-euc-ja-1.02
+	macopix-mascot-triangle_heart-euc-ja-1.02
+	macopix-mascot-comic_party-euc-ja-1.02
+	macopix-mascot-kanon-euc-ja-1.02
+	macopix-mascot-one-euc-ja-1.02
+"
+
+for i in ${MACOPIX_MASCOTS} ; do
+	SRC_URI+=" ${BASE_URI}/${i}.tar.gz"
+done
+
+# program itself is GPL-2, and mascots are free-noncomm
+LICENSE="GPL-2 free-noncomm"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="gnutls nls"
+
+RDEPEND="
+	dev-libs/glib:2
+	media-libs/libpng:0=
+	sys-devel/gettext
+	gnutls? ( net-libs/gnutls )
+	!gnutls? ( dev-libs/openssl:0= )
+	x11-libs/gtk+:3
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.4.0-CVE-2015-8614.patch
+	"${FILESDIR}"/${PN}-3.4.0-Werror.patch
+	"${FILESDIR}"/${PN}-3.4.0-fno-common.patch
+	"${FILESDIR}"/${PN}-3.4.0-windres.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with gnutls)
+}
+
+src_install() {
+	default
+
+	dodoc AUTHORS ChangeLog* NEWS *README*
+
+	# install mascots
+	for d in ${MACOPIX_MASCOTS} ; do
+		einfo "Installing ${d}..."
+		cd "${WORKDIR}/${d}" || die
+		insinto /usr/share/"${PN}"
+		doins *.mcpx *.menu
+		insinto /usr/share/"${PN}"/pixmap
+		doins *.png
+		docinto "${d}"
+		dodoc README.jp
+	done
+}