gentoo resync : 14.07.2018

13 files changed, 613 insertions, 0 deletions

diff --git a/app-office/magicpoint/Manifest b/app-office/magicpoint/Manifest
new file mode 100644
index 000000000000..15682faea882
--- /dev/null
+++ b/app-office/magicpoint/Manifest
@@ -0,0 +1,13 @@
+AUX 50magicpoint-gentoo.el 195 BLAKE2B e7abbad45cdd3cad6e658d609d7e3e41d7be75740eca5982cc990af1448d17297a0240545e1205ba8a1a11ef73cb970cd95d4f021eec3d0df8bfd8465e961a84 SHA512 e601460b245be363da41f4076381a96b1155799850807d1b6862ea2677844f87960aa27c484ee8735fddeb63e5b940973492c0a2979ad6dea31707f5682806fe
+AUX magicpoint-1.11b-gentoo.diff 1412 BLAKE2B 63aedeeddf4a636d9095554bb2a5c7c6c1093bd97480631d791c8959da0e7313546050c979c28760ae0db29aeb9646a495a4d98b99d2acee5e8b933c742837cb SHA512 f3ae7d2ed64771b0af719442f572b50bb4a493de7b2b91b6de39750f52875a95c579b102ac0fc94294ac14dc03aea2bc5ccb8f62015e930bf25a1b1d6454c26e
+AUX magicpoint-1.13a-libpng15.patch 240 BLAKE2B 93ebf799b69a0f0133c9a6cae44d39ba49afdda22b5c7d25b398f8ae60e2dca6179c48cc67ef6dabc20f8b8f0d0a94ba4c18720d66bfdbded271a362f71ed05b SHA512 78855e421db27bdbacaa98ff0597106055cb6c8b537ad1edd4d55026669e9e948df9d6f76636bac6ed14f1a7c3509685f46eab02c1b56a0bde5e786f91adb16e
+AUX magicpoint-1.13a_p20121015-any-giflib.patch 3585 BLAKE2B 5cb2febf20cd1a3270cdc91e2e0bb72157d70be1e47bfeea4fc49594192332b1416d923b00ec3d9f305a3ac728c6efa791d00105032014dd883e44d20328b1bb SHA512 661e86eddc3c929651dd2d06b14638d4c92f03281447ee706203a99940bfca8783373ed8a175ddac73e2a6ccb2d8c25386aca39b977fbc3e631b5a16dcfc3536
+AUX magicpoint-1.13a_p20121015-draw-charset.patch 376 BLAKE2B 2162436ee734410c11461389ca430fcda0410031a649a00f96059e21a2a3575491b91fe35963c64fc692f0f761ea6623d6098ac364d844d094172385ff4fb773 SHA512 3aa3b7e4fa638a86e3a5241ad2768a44b0d3e1925dcbf23e4c5b9cd1fde9d3897b3785336be174d709c6172e47c34a5e1550cef05e868e0706cf2f91b73a160c
+AUX magicpoint-1.13a_p20121015-draw-stringtoolong.patch 310 BLAKE2B 13af238e0ceb7afd3fb6fbe27c9ea50435de74a9be24ed53cb021e8aa708d01abb23127ff54f26d20e59ff214e28ee6e22ac140918b2b7e3de57ad4a830dfb09 SHA512 65f77a096501ba27208bdc7e036ada66946e15c012b22e5dcae579141d399a7149bd647f9a5968f82ff34c344ce9c5ee4841be33a7fb911187b1def131bb7387
+AUX magicpoint-1.13a_p20121015-fontconfig.patch 1005 BLAKE2B eaf2ab5655b529fd8511b590cbd73638f6becc047c97ddd92a136ef998f284c96b471bf371085d799f964ea3f3961dfb70a0d51b16cc165fbd20ca15406ca2c0 SHA512 53fc5bbce474e4c60af75ad73f00108c40ab317b9b835f971e475f8f49a893a41614ec76345e220c8e7284032f7df1a7785e2ca91d5a66c4f99470d55b0f9603
+AUX magicpoint-1.13a_p20121015-gif-dimension.patch 493 BLAKE2B ae2e3f94f3b36b319d330504a31331e9c45429d750f2be6f8dffa299ef6541ad777d09520be72bb3ceb7c68b8fa6dc4f78a482dd1b8e0093faa2b2a5e4de0f0b SHA512 d8103374df7696ed6daf36c079c2e1f2efbfc8e774f77e06beec629b2064576325f311603ca7d1dfe3f65ed11dfaff1abd7ae70b4f78a5199e76e1d5030c5aa6
+AUX magicpoint-1.13a_p20121015-implicit-declaration.patch 3673 BLAKE2B 314f8b4022c53022f6e8e2a0612d480509916f3b857a6beaa840bbd08ea6f9e62be33dd295ce516c60162516b585fbd12884866ea184eff1bbbc6c55bec017b6 SHA512 be8da97dd37a59190cddc3f826094a343d2351d832d9bbb42a7a319149884e026fdd97018826162474bb2ffc0f88082cd4075a228487fd3d40e6b76c9ebdc029
+AUX magicpoint-1.13a_p20121015-parse-empty.patch 316 BLAKE2B 4d532b1e56bcc3d21035051b3a1e6421b02d83dd24a2e450b841f8f1c9740e19a266f5ca7619624d6046e6699507ef3a630ba605311977a466efd20b6c57fd19 SHA512 adb7a9e1585c907cd8f8b0f834391620cecf854702301715149ddc80af080115dbdd18c7f8622a5fc403df8f1205133909c98a2153461e4e8f4bf401b647f518
+DIST mgp-snap-20121015.tar.gz 886902 BLAKE2B c4f4730a805aee43f8fff7439cd18ab84f2dc73be6c249c3d8168da63fc0c32b4aff2d800345a35d3c22dd930c78f51e8cc64f4f74f0cf0aeb5f6cc4d145d4f0 SHA512 fa59b1ec04e2e191b74c25fd3ae9b4c855ad96d23e9e5b071c959f56b9d2064d7bdf9217b5c62c5733cc2d9ec17981947febd7afb2552f1145262225909cc711
+EBUILD magicpoint-1.13a_p20121015-r1.ebuild 3861 BLAKE2B 1f0da41a790cee9fc08e2f5be8e4ad226f6133d62264108bf9b1c21e1798b89ccf4431ab21276a0d8d1c83ffc26fe7995c19bf73c7e27ee0325241f944420712 SHA512 a009efa6ed9d3fc7aa643fc15c72ebd0ea9594b67918cbd449c3dc8201c182510f14de6cfeb5a12f4b570ea5752a36be3f9296310c6e4857c320466598c73058
+MISC metadata.xml 810 BLAKE2B 2489ad893263f28ecc54d0bb6db841694d11154d3d5bc956da80d796e948102520560f0967afdb646b768290b15e8e9e5ce5e5dec0e139f11f1e3bc6529521df SHA512 6e5604b7749ce93a9a0912df60a3b9228802db2efc57dd4e7f943074c97b9351d4df6def945381a73563de58ded0f954cb24718e605a846025c630dea3eb2d6d
diff --git a/app-office/magicpoint/files/50magicpoint-gentoo.el b/app-office/magicpoint/files/50magicpoint-gentoo.el
new file mode 100644
index 000000000000..301fcb4d4bb6
--- /dev/null
+++ b/app-office/magicpoint/files/50magicpoint-gentoo.el
@@ -0,0 +1,6 @@
+
+;;; magicpoint site-lisp configuration
+
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'mgp-mode "mgp-mode" "MagicPoint editor mode" t)
+(add-to-list 'auto-mode-alist '("\\.mgp\\'" . mgp-mode))
diff --git a/app-office/magicpoint/files/magicpoint-1.11b-gentoo.diff b/app-office/magicpoint/files/magicpoint-1.11b-gentoo.diff
new file mode 100644
index 000000000000..8c0d454972a3
--- /dev/null
+++ b/app-office/magicpoint/files/magicpoint-1.11b-gentoo.diff
@@ -0,0 +1,37 @@
+diff -urN magicpoint-1.10a.ORIG/mgp.h magicpoint-1.10a/mgp.h
+--- magicpoint-1.10a.ORIG/mgp.h	2003-06-06 16:18:25.000000000 +0900
++++ magicpoint-1.10a/mgp.h	2003-09-02 04:24:56.000000000 +0900
+@@ -93,7 +93,7 @@
+ #include "freetype.h"
+ 
+ #ifndef FREETYPEFONTDIR
+-#define FREETYPEFONTDIR	"/usr/local/share/fonts/ttf"
++#define FREETYPEFONTDIR	"/usr/X11R6/lib/X11/fonts/truetype"
+ #endif
+ #endif /*FREETYPE*/
+ 
+@@ -130,7 +130,7 @@
+ #define	UUDECODE	"/usr/bin/uudecode"
+ #endif
+ #ifndef GUNZIP
+-#define	GUNZIP		"/usr/contrib/bin/gunzip"
++#define	GUNZIP		"/bin/gunzip"
+ #endif
+ 
+ #define MAXPAGE		512
+diff -urN magicpoint-1.10a.ORIG/sample/default.mgp magicpoint-1.10a/sample/default.mgp
+--- magicpoint-1.10a.ORIG/sample/default.mgp	2001-08-11 01:40:54.000000000 +0900
++++ magicpoint-1.10a/sample/default.mgp	2003-09-02 04:24:56.000000000 +0900
+@@ -12,9 +12,9 @@
+ %% into the "tfdir" directory above:
+ %%	ftp://ftp.mew.org/pub/mgp/ttf-jp.tar.gz
+ %%
+-%deffont "standard"   tfont "standard.ttf",   tmfont "kochi-mincho.ttf"
+-%deffont "thick"      tfont "thick.ttf",      tmfont "goth.ttf"
+-%deffont "typewriter" tfont "typewriter.ttf", tmfont "goth.ttf"
++%deffont "standard"	xfont "serif" "iso10646"
++%deffont "thick"	xfont "sans-serif" "iso10646"
++%deffont "typewriter"	xfont "monospace" "iso10646"
+ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+ %%
+ %% Default settings per each line numbers.
diff --git a/app-office/magicpoint/files/magicpoint-1.13a-libpng15.patch b/app-office/magicpoint/files/magicpoint-1.13a-libpng15.patch
new file mode 100644
index 000000000000..7990b4685544
--- /dev/null
+++ b/app-office/magicpoint/files/magicpoint-1.13a-libpng15.patch
@@ -0,0 +1,11 @@
+--- image/png.c
++++ image/png.c
+@@ -86,7 +86,7 @@
+ 		return NULL;
+ 	}
+ 
+-	if (setjmp(png_ptr->jmpbuf)) {
++	if (setjmp(png_jmpbuf(png_ptr))) {
+ 		png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
+ 		fclose(fp);
+ 		return NULL;
diff --git a/app-office/magicpoint/files/magicpoint-1.13a_p20121015-any-giflib.patch b/app-office/magicpoint/files/magicpoint-1.13a_p20121015-any-giflib.patch
new file mode 100644
index 000000000000..0e7903a8dcf0
--- /dev/null
+++ b/app-office/magicpoint/files/magicpoint-1.13a_p20121015-any-giflib.patch
@@ -0,0 +1,140 @@
+--- kit.orig/image/gif.c	2000-03-07 07:59:56.000000000 +0100
++++ kit/image/gif.c	2016-01-12 17:35:49.792443794 +0100
+@@ -18,6 +18,18 @@
+ #include "image.h"
+ #include <gif_lib.h>
+ 
++static void stderrGifError(GifFileType *gifp, int e) {
++#if defined(GIFLIB_MAJOR) /* added in 4.2.0 along with GifError{,String}() */
++# if GIFLIB_MAJOR >= 5
++	fprintf(stderr, "\nGIF-LIB error: %s.\n", GifErrorString(gifp ? gifp->Error : e));
++# else
++	fprintf(stderr, "\nGIF-LIB error: %s.\n", GifErrorString());
++# endif
++#else
++	PrintGifError();
++#endif
++}
++
+ static void
+ tellAboutImage(name, gifp)
+ 	char *name;
+@@ -49,10 +61,17 @@
+ 	GifFileType *GifFile;
+ 	ColorMapObject *ColorMap;
+ 	GifColorType *ColorMapEntry;
++	int gerr = 0;
+ 
++#if defined(GIFLIB_MAJOR) && GIFLIB_MAJOR >= 5
++	GifFile = DGifOpenFileName(fullname, &gerr);
++#else
+ 	GifFile = DGifOpenFileName(fullname);
+-	if (GifFile == NULL)
++#endif
++	if (GifFile == NULL) {
++		stderrGifError(GifFile, gerr);
+ 		return NULL;
++	}
+ 
+ 	if ((ScreenBuffer = (GifRowType *)
+ 	    malloc(GifFile->SHeight * sizeof(GifRowType *))) == NULL) {
+@@ -87,13 +106,13 @@
+ 	/* Scan the content of the GIF file and load the image(s) in: */
+ 	do {
+ 		if (DGifGetRecordType(GifFile, &RecordType) == GIF_ERROR) {
+-			PrintGifError();
++			stderrGifError(GifFile, 0);
+ 			exit(-1);
+ 		}
+ 		switch (RecordType) {
+ 		case IMAGE_DESC_RECORD_TYPE:
+ 			if (DGifGetImageDesc(GifFile) == GIF_ERROR) {
+-				PrintGifError();
++				stderrGifError(GifFile, 0);
+ 				exit(-1);
+ 			}
+ 			Row = GifFile->Image.Top; /* Image Position relative to Screen. */
+@@ -113,7 +132,7 @@
+ 							     j += InterlacedJumps[i]) {
+ 					if (DGifGetLine(GifFile, &ScreenBuffer[j][Col],
+ 					    Width) == GIF_ERROR) {
+-					    PrintGifError();
++					    stderrGifError(GifFile, 0);
+ 					    exit(-1);
+ 					}
+ 				}
+@@ -122,7 +141,7 @@
+ 				for (i = 0; i < Height; i++) {
+ 					if (DGifGetLine(GifFile, &ScreenBuffer[Row++][Col],
+ 					    Width) == GIF_ERROR) {
+-						PrintGifError();
++						stderrGifError(GifFile, 0);
+ 						exit(-1);
+ 					}
+ 				}
+@@ -131,7 +150,7 @@
+ 		case EXTENSION_RECORD_TYPE:
+ 			/* Skip any extension blocks in file: */
+ 			if (DGifGetExtension(GifFile, &ExtCode, &Extension) == GIF_ERROR) {
+-				PrintGifError();
++				stderrGifError(GifFile, 0);
+ 				exit(-1);
+ 			}
+ 			/* very adhoc transparency support */
+@@ -141,7 +160,7 @@
+ 			}
+ 			while (Extension != NULL) {
+ 				if (DGifGetExtensionNext(GifFile, &Extension) == GIF_ERROR) {
+-					PrintGifError();
++					stderrGifError(GifFile, 0);
+ 					exit(-1);
+ 				}
+ 			}
+@@ -179,8 +198,21 @@
+ 			pixline[x] = GifRow[x];
+ 	}
+ 
++#if defined(GIFLIB_MAJOR) && (GIFLIB_MAJOR > 5 || (GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1))
++	if (DGifCloseFile(GifFile, &gerr) == GIF_ERROR) {
++		stderrGifError(NULL, gerr);
++#else
+ 	if (DGifCloseFile(GifFile) == GIF_ERROR) {
+-		PrintGifError();
++# if defined(GIFLIB_MAJOR)
++#  if GIFLIB_MAJOR >= 5
++		stderrGifError(GifFile, 0);
++#  else
++		stderrGifError(NULL, GifError());
++#  endif
++# else
++		stderrGifError(NULL, 0);
++# endif
++#endif
+ 		exit(-1);
+ 	}
+ 
+@@ -195,12 +227,22 @@
+ {
+ 	GifFileType *gifp;
+ 	int ret;
++	int gerr = 0;
+ 
++#if defined(GIFLIB_MAJOR) && GIFLIB_MAJOR >= 5
++	gifp = DGifOpenFileName(fullname, &gerr);
++#else
+ 	gifp = DGifOpenFileName(fullname);
+-	if (gifp == NULL)
++#endif
++	if (gifp == NULL) {
++		stderrGifError(gifp, gerr);
+ 		ret = 0;
+-	else {
++	} else {
++#if defined(GIFLIB_MAJOR) && (GIFLIB_MAJOR > 5 || (GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1))
++		DGifCloseFile(gifp, &gerr);
++#else
+ 		DGifCloseFile(gifp);
++#endif
+ 		tellAboutImage(name);
+ 		ret = 1;
+ 	}
diff --git a/app-office/magicpoint/files/magicpoint-1.13a_p20121015-draw-charset.patch b/app-office/magicpoint/files/magicpoint-1.13a_p20121015-draw-charset.patch
new file mode 100644
index 000000000000..056b7ef02d87
--- /dev/null
+++ b/app-office/magicpoint/files/magicpoint-1.13a_p20121015-draw-charset.patch
@@ -0,0 +1,11 @@
+--- kit.orig/draw.c	2012-10-14 20:25:10.000000000 +0200
++++ kit/draw.c	2016-01-12 16:45:54.123549077 +0100
+@@ -2847,7 +2847,7 @@
+ 	char *seed;
+ 	char *registry;
+ 
+-	if (code >= 0xa0 && ((!argregistry || !argregistry[0]) && mgp_charset))
++	if (code >= 0xa0 && ((!argregistry || !argregistry[0]) && mgp_charset[0]))
+ 		registry = mgp_charset;
+ 	else 
+ 		registry = argregistry;
diff --git a/app-office/magicpoint/files/magicpoint-1.13a_p20121015-draw-stringtoolong.patch b/app-office/magicpoint/files/magicpoint-1.13a_p20121015-draw-stringtoolong.patch
new file mode 100644
index 000000000000..d965cb027cc0
--- /dev/null
+++ b/app-office/magicpoint/files/magicpoint-1.13a_p20121015-draw-stringtoolong.patch
@@ -0,0 +1,13 @@
+--- kit.orig/draw.c	2012-10-14 20:25:10.000000000 +0200
++++ kit/draw.c	2016-01-12 18:01:53.090388852 +0100
+@@ -1379,6 +1379,10 @@
+ 		}
+ 
+ 		q = draw_fragment(state, p, q - p, registry, charset16);
++		if (q == p) {
++			fprintf(stderr, "String '%s' too long for window!\n", p);
++			exit(1);
++		}
+ 
+ 		p = q;
+ 	}
diff --git a/app-office/magicpoint/files/magicpoint-1.13a_p20121015-fontconfig.patch b/app-office/magicpoint/files/magicpoint-1.13a_p20121015-fontconfig.patch
new file mode 100644
index 000000000000..9a49eb39282e
--- /dev/null
+++ b/app-office/magicpoint/files/magicpoint-1.13a_p20121015-fontconfig.patch
@@ -0,0 +1,33 @@
+# Bug #572658
+--- kit.orig/configure.in	2009-05-04 09:36:47.000000000 +0200
++++ kit/configure.in	2016-01-23 04:25:17.047720246 +0100
+@@ -16,6 +16,7 @@
+ AC_PROG_AWK
+ AC_PROG_YACC
+ AC_PROG_LEX
++PKG_PROG_PKG_CONFIG([0.22])
+ AC_PATH_PROGS(mgp_cv_path_perl, perl5 perl, no)
+ AC_SUBST(mgp_cv_path_perl)
+ AC_PATH_PROGS(mgp_cv_path_uuencode, uuencode, no)
+@@ -385,9 +386,9 @@
+     if test "$mgp_use_xft2" = "yes"; then
+   	  AC_MSG_CHECKING(for xft2 library..)
+ 	  AC_CHECK_LIB(Xft, XftFontOpen, 
+-		[LIBS="$LIBS -lXft -lfontconfig"
++		[LIBS="$LIBS -lXft `pkg-config --libs fontconfig`"
+ 		 AC_DEFINE(USE_XFT2) 
+-		 mgp_xft2_found=yes], [], [-lfontconfig])
++		 mgp_xft2_found=yes], [], [`pkg-config --libs fontconfig`])
+     fi
+   fi
+ fi
+@@ -507,6 +508,9 @@
+ 		AC_DEFINE(USE_M17N)
+ 		OPTFLAGS="$OPTFLAGS `m17n-config X --cflags`"
+ 		LIBS="$LIBS `m17n-config X --libs` -lm17n-core"
++		if test "x$ac_cv_header_fontconfig_fontconfig_h" = "xyes"; then
++			LIBS="$LIBS `pkg-config --libs fontconfig`"
++		fi
+ 	fi
+ fi
+ 
diff --git a/app-office/magicpoint/files/magicpoint-1.13a_p20121015-gif-dimension.patch b/app-office/magicpoint/files/magicpoint-1.13a_p20121015-gif-dimension.patch
new file mode 100644
index 000000000000..c95aa2dae411
--- /dev/null
+++ b/app-office/magicpoint/files/magicpoint-1.13a_p20121015-gif-dimension.patch
@@ -0,0 +1,11 @@
+--- kit.orig/image/gif.c	2016-01-12 16:54:40.469530579 +0100
++++ kit/image/gif.c	2016-01-12 16:56:10.676527408 +0100
+@@ -122,7 +122,7 @@
+ 			if (GifFile->Image.Left + GifFile->Image.Width > GifFile->SWidth ||
+ 			   GifFile->Image.Top + GifFile->Image.Height > GifFile->SHeight) {
+ 				fprintf(stderr,
+-"Image %d is not confined to screen dimension, aborted.\n");
++"Image %s is not confined to screen dimension, aborted.\n", fullname);
+ 				exit(-2);
+ 			}
+ 			if (GifFile->Image.Interlace) {
diff --git a/app-office/magicpoint/files/magicpoint-1.13a_p20121015-implicit-declaration.patch b/app-office/magicpoint/files/magicpoint-1.13a_p20121015-implicit-declaration.patch
new file mode 100644
index 000000000000..141353953e00
--- /dev/null
+++ b/app-office/magicpoint/files/magicpoint-1.13a_p20121015-implicit-declaration.patch
@@ -0,0 +1,136 @@
+diff -ru kit.orig/contrib/xwintoppm/dsimple.c kit/contrib/xwintoppm/dsimple.c
+--- kit.orig/contrib/xwintoppm/dsimple.c	1998-02-13 08:48:29.000000000 +0100
++++ kit/contrib/xwintoppm/dsimple.c	2016-01-12 14:30:21.199834909 +0100
+@@ -48,10 +48,12 @@
+ #endif
+ 
+ extern Bool silent;
++extern void usage();
+ unsigned long Resolve_Color();
+ Pixmap Bitmap_To_Pixmap();
+ Window Select_Window();
+ void out();
++void outl();
+ void blip();
+ Window Window_With_Name();
+ void Fatal_Error();
+@@ -495,6 +497,7 @@
+  *       printf with up to 7 arguments.
+  */
+ /* VARARGS1 */
++void
+ outl(msg, arg0,arg1,arg2,arg3,arg4,arg5,arg6)
+      char *msg;
+      char *arg0, *arg1, *arg2, *arg3, *arg4, *arg5, *arg6;
+diff -ru kit.orig/contrib/xwintoppm/xwintoppm.c kit/contrib/xwintoppm/xwintoppm.c
+--- kit.orig/contrib/xwintoppm/xwintoppm.c	1998-08-26 07:30:16.000000000 +0200
++++ kit/contrib/xwintoppm/xwintoppm.c	2016-01-12 14:29:46.892836115 +0100
+@@ -139,6 +139,13 @@
+ extern int (*_XErrorFunction)();
+ extern int _XDefaultError();
+ 
++void usage();
++void Error(char *);
++void Window_Dump(Window, FILE *);
++extern void outl();
++int Image_Size(XImage *);
++int Get_XColors(XWindowAttributes *, XColor **);
++
+ static long parse_long (s)
+     char *s;
+ {
+@@ -281,6 +288,7 @@
+  *              writting.
+  */
+ 
++void
+ Window_Dump(window, out)
+      Window window;
+      FILE *out;
+@@ -609,6 +617,7 @@
+ /*
+  * Report the syntax for calling xwd.
+  */
++void
+ usage()
+ {
+     fprintf (stderr,
+@@ -623,6 +632,7 @@
+  * Error - Fatal xwd error.
+  */
+ 
++void
+ Error(string)
+ 	char *string;	/* Error description string. */
+ {
+diff -ru kit.orig/ctlwords.c kit/ctlwords.c
+--- kit.orig/ctlwords.c	1999-02-15 00:02:25.000000000 +0100
++++ kit/ctlwords.c	2016-01-12 14:14:20.395868676 +0100
+@@ -24,6 +24,7 @@
+ 
+ #include <stdio.h>
+ #include <string.h>
++#include <stdlib.h>
+ 
+ main(int argc, char *argv[])
+ {
+diff -ru kit.orig/draw.c kit/draw.c
+--- kit.orig/draw.c	2012-10-14 20:25:10.000000000 +0200
++++ kit/draw.c	2016-01-12 14:15:12.847866833 +0100
+@@ -140,6 +140,8 @@
+ static void get_background_pixmap __P((struct ctrl *, struct render_state *));
+ static void regist_background_pixmap __P((XImageInfo *, Image *));
+ #ifdef MNG
++void mngload(char *, int, int, int, int);
++void mngpreload(struct render_state *, char *, int *, int *);
+ static void process_anim __P((struct render_state *, struct ctrl *));
+ static void obj_draw_anim __P((struct render_state *, 
+ 	u_int, u_int, struct render_object *));
+diff -ru kit.orig/image/image.h kit/image/image.h
+--- kit.orig/image/image.h      2004-07-28 17:47:31.000000000 +0200
++++ kit/image/image.h   2016-01-12 16:38:12.310565307 +0100
+@@ -10,6 +10,7 @@
+ 
+ #include "copyright.h"
+ #include <stdio.h>
++#include <stdlib.h>
+ 
+ #if defined(SYSV) || defined(VMS) || 1
+ #include <string.h>
+diff -ru kit.orig/image/window.c kit/image/window.c
+--- kit.orig/image/window.c	2004-07-28 17:47:31.000000000 +0200
++++ kit/image/window.c	2016-01-12 14:19:03.347858732 +0100
+@@ -16,8 +16,8 @@
+ #include <signal.h>
+ #include <errno.h>
+ #include <sys/types.h>
+-#ifdef SYSV
+-#include <unistd.h>
++#ifdef HAVE_UNISTD_H
++# include <unistd.h>
+ #endif
+ #if TIME_WITH_SYS_TIME
+ # include <sys/time.h>
+@@ -32,9 +32,6 @@
+ #if HAVE_SYS_SELECT_H
+ # include <sys/select.h>
+ #endif
+-#ifdef __APPLE__
+-#include <unistd.h>
+-#endif
+ 
+ /* SUPPRESS 560 */
+ 
+diff -ru kit.orig/mgp.h kit/mgp.h
+--- kit.orig/mgp.h	2010-05-04 00:28:00.000000000 +0200
++++ kit/mgp.h	2016-01-12 14:16:47.967863490 +0100
+@@ -831,6 +831,9 @@
+ #ifndef HAVE_USLEEP
+ extern void usleep __P((u_int));
+ #endif
++#ifndef HAVE_STRLCPY
++extern size_t strlcpy __P((char *, const char *, size_t));
++#endif
+ 
+ #ifdef FREETYPE
+ #define RASTERLIB
diff --git a/app-office/magicpoint/files/magicpoint-1.13a_p20121015-parse-empty.patch b/app-office/magicpoint/files/magicpoint-1.13a_p20121015-parse-empty.patch
new file mode 100644
index 000000000000..f3d38ccde03a
--- /dev/null
+++ b/app-office/magicpoint/files/magicpoint-1.13a_p20121015-parse-empty.patch
@@ -0,0 +1,11 @@
+--- kit.orig/parse.c	2010-05-04 00:28:00.000000000 +0200
++++ kit/parse.c	2016-01-12 19:20:41.882222658 +0100
+@@ -1258,7 +1258,7 @@
+ 	 */
+     {
+ 	int textseen;
+-	int contseen;
++	int contseen = 0;
+ 	for (page = 1; page <= maxpage; page++) {
+ 		line = page_attribute[page].pg_linenum;
+ 		for (l = 0; l <= line; l++) {
diff --git a/app-office/magicpoint/magicpoint-1.13a_p20121015-r1.ebuild b/app-office/magicpoint/magicpoint-1.13a_p20121015-r1.ebuild
new file mode 100644
index 000000000000..cb200d9236b5
--- /dev/null
+++ b/app-office/magicpoint/magicpoint-1.13a_p20121015-r1.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools elisp-common eutils toolchain-funcs
+
+MY_SNAP="${PV/*_p}"
+MY_P="mgp-snap-${MY_SNAP}"
+DESCRIPTION="An X11 based presentation tool"
+SRC_URI="ftp://sh.wide.ad.jp/WIDE/free-ware/mgp-snap/${MY_P}.tar.gz"
+HOMEPAGE="http://member.wide.ad.jp/wg/mgp/"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cjk contrib doc emacs examples fontconfig gif imlib m17n-lib mng nls png truetype"
+
+REQUIRED_USE="imlib? ( !gif !png )"
+S="${WORKDIR}/kit"
+
+COMMON_DEPEND="x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libXrender
+	x11-libs/libXmu
+	imlib? ( media-libs/imlib2[X] )
+	!imlib? (
+		gif? ( media-libs/giflib:= )
+		png? ( >=media-libs/libpng-1.4:0= )
+	)
+	truetype? (
+		x11-libs/libXft
+		media-libs/fontconfig
+	)
+	emacs? ( virtual/emacs )
+	m17n-lib? (
+		dev-libs/m17n-lib
+		fontconfig? ( media-libs/fontconfig )
+	)
+	mng? ( media-libs/libmng )"
+DEPEND="${COMMON_DEPEND}
+	sys-devel/autoconf
+	x11-base/xorg-proto
+	x11-libs/libxkbfile
+	app-text/rman
+	x11-misc/imake"
+RDEPEND="${COMMON_DEPEND}
+	contrib? ( dev-lang/perl )
+	nls? ( sys-devel/gettext )
+	truetype? ( cjk? ( media-fonts/sazanami ) )"
+
+SITEFILE=50${PN}-gentoo.el
+
+src_prepare() {
+	sed -i -e '/mgp_version =/s, (.*), ('${MY_SNAP}'),' mgp.c
+
+	epatch \
+		"${FILESDIR}"/${PN}-1.11b-gentoo.diff \
+		"${FILESDIR}"/${PN}-1.13a_p20121015-fontconfig.patch \
+		"${FILESDIR}"/${PN}-1.13a_p20121015-parse-empty.patch \
+		"${FILESDIR}"/${PN}-1.13a_p20121015-draw-charset.patch \
+		"${FILESDIR}"/${PN}-1.13a_p20121015-draw-stringtoolong.patch \
+		"${FILESDIR}"/${PN}-1.13a_p20121015-implicit-declaration.patch
+
+	if ! use imlib; then
+		epatch "${FILESDIR}"/${PN}-1.13a-libpng15.patch
+
+		# fix compability with libpng14
+		sed -i \
+			-e 's:png_set_gray_1_2_4_to_8:png_set_expand_gray_1_2_4_to_8:' \
+			configure.in image/png.c || die
+
+		if use gif; then
+			# bug #85720
+			sed -i -e "s/ungif/gif/g" configure.in || die
+
+			# bug #486248
+			epatch "${FILESDIR}"/${PN}-1.13a_p20121015-any-giflib.patch
+
+			# fix use of uninitialized memory in error message
+			epatch "${FILESDIR}"/${PN}-1.13a_p20121015-gif-dimension.patch
+		fi
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable gif) \
+		$(use_enable imlib) \
+		$(use_enable nls locale) \
+		$(use_enable truetype xft2) \
+		$(use_with m17n-lib) \
+		--disable-vflib \
+		--disable-freetype \
+		--x-libraries=/usr/lib/X11 \
+		--x-includes=/usr/include/X11
+}
+
+src_compile() {
+	xmkmf || die
+	# no parallel build possible anywhere
+	emake -j1 Makefiles
+
+	tc-export CC
+	emake -j1 \
+		CC="${CC}" \
+		CDEBUGFLAGS="${CFLAGS}" \
+		LOCAL_LDFLAGS="${LDFLAGS}" \
+		BINDIR=/usr/bin \
+		LIBDIR=/etc/X11
+
+	if use emacs; then
+		pushd contrib || die
+		elisp-compile *.el || die
+		popd
+	fi
+}
+
+src_install() {
+	emake -j1 \
+		DESTDIR="${D}" \
+		BINDIR=/usr/bin \
+		LIBDIR=/etc/X11 \
+		install
+
+	emake -j1 \
+		DESTDIR="${D}" \
+		DOCHTMLDIR=/usr/share/doc/${PF} \
+		MANPATH=/usr/share/man \
+		MANSUFFIX=1 \
+		install.man
+
+	use contrib && dobin contrib/mgp2{html,latex}.pl
+
+	if use emacs; then
+		pushd contrib || die
+		elisp-install ${PN} *.el *.elc || die
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+		popd
+	fi
+
+	dodoc FAQ README* RELNOTES SYNTAX TODO* USAGE*
+
+	if use examples; then
+		pushd sample || die
+		insinto /usr/share/doc/${PF}/examples
+		doins README* cloud.jpg dad.* embed*.mgp gradation*.mgp \
+			mgp-old*.jpg mgp.mng mgp3.xbm mgprc-sample \
+			multilingual.mgp sample*.mgp sendmail6*.mgp \
+			tutorial*.mgp v6*.mgp v6header.*
+		popd
+	fi
+}
+
+pkg_postinst() {
+	elog
+	elog "If you enabled xft2 support (default) you may specify xfont directive by"
+	elog "font name and font registry."
+	elog "e.g.)"
+	elog '%deffont "standard" xfont "sazanami mincho" "jisx0208.1983"'
+	elog
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/app-office/magicpoint/metadata.xml b/app-office/magicpoint/metadata.xml
new file mode 100644
index 000000000000..e2f701af1903
--- /dev/null
+++ b/app-office/magicpoint/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>peter@stuge.se</email>
+		<name>Peter Stuge</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription lang="en">
+		Magic Point is an X11 based presentation tool. It is designed to make
+		simple presentations easy while to make complicated presentations
+		possible. Its presentation file (whose suffix is typically .mgp) is
+		just text so that you can create presentation files quickly with your
+		favorite editor (e.g.  Emacs, vi).
+	</longdescription>
+	<use>
+		<flag name="contrib">Install additional contributed scripts</flag>
+	</use>
+</pkgmetadata>