media-gfx/xfig: Version bump to 3.2.8b

* Bump to EAPI=8
* Move media-libs/netpbm from DEPEND/RDEPEND to optfeature
* Remove unneeded dependencies: x11-libs/libXaw, x11-libs/libXi
* Add needed dependencies: media-libs/tiff, x11-libs/libX11, x11-libs/libXpm
* Remove IUSE="jpeg" and IUSE="postscript", as they're always enabled
  upstream now.
* Remove IUSE="nls" and add (+) to x11-libs/libXaw3d's unicode USE-dep
* Switch from virtual/jpeg to media-libs/libjpeg-turbo
* Add patch to build with -lflto

Bug: https://bugs.gentoo.org/807784
Closes: https://bugs.gentoo.org/761424
Signed-off-by: Matt Turner <mattst88@gentoo.org>

2 files changed, 76 insertions, 0 deletions

diff --git a/media-gfx/xfig/files/xfig-3.2.8b-Fix-build-with-flto.patch b/media-gfx/xfig/files/xfig-3.2.8b-Fix-build-with-flto.patch
new file mode 100644
index 000000000000..344d4df06e69
--- /dev/null
+++ b/media-gfx/xfig/files/xfig-3.2.8b-Fix-build-with-flto.patch
@@ -0,0 +1,62 @@
+https://sourceforge.net/p/mcj/tickets/149/
+
+From 938c4089e6cc09e6e327f15d622c064865f837ae Mon Sep 17 00:00:00 2001
+From: Matt Turner <mattst88@gmail.com>
+Date: Sat, 27 Aug 2022 09:14:55 -0400
+Subject: [PATCH] Fix build with -flto
+
+With CFLAGS="-lflto" the tests fail to build because main() is
+redeclared with a different type:
+
+../src/main.c:651:1: error: type of ‘main’ does not match original declaration [-Werror=lto-type-mismatch]
+  651 | main(int argc, char **argv)
+      | ^
+test1.c:47:1: note: type mismatch in parameter 1
+   47 | main(void)
+      | ^
+test1.c:47:1: note: type ‘void’ should match type ‘int’
+test1.c:47:1: note: ‘main’ was previously declared here
+
+Simply change the definitions of main() in the tests to match
+the one in src/main.c.
+---
+ tests/test1.c | 4 +++-
+ tests/test2.c | 4 +++-
+ tests/test4.c | 4 +++-
+ 3 files changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/tests/test1.c b/tests/test1.c
+index 83cf930..da76dd7 100644
+--- a/tests/test1.c
++++ b/tests/test1.c
+@@ -44,8 +44,10 @@ round_coords(int *x, int *y)
+ }
+ 
+ int
+-main(void)
++main(int argc, char *argv[])
+ {
++	(void)	argc;
++	(void)	argv;
+ 	int errcode = 0;
+ 
+ 	cur_pointposn = 2;	/* == P_GRID1, see mode.h */
+diff --git a/tests/test2.c b/tests/test2.c
+index ab3b434..02e919c 100644
+--- a/tests/test2.c
++++ b/tests/test2.c
+@@ -77,8 +77,10 @@ compare(int xc, int yc, int n, int pts[n][2])
+ }
+ 
+ int
+-main(void)
++main(int argc, char *argv[])
+ {
++	(void)	argc;
++	(void)	argv;
+ 	int x, y, yspacing, xc, yc, dist, xdist;
+ 	int error = 0;
+ 	int pts_square[2][2];
+-- 
+2.35.1
+
diff --git a/media-gfx/xfig/files/xfig-3.2.8b-app-defaults.patch b/media-gfx/xfig/files/xfig-3.2.8b-app-defaults.patch
new file mode 100644
index 000000000000..3ca0f99963ac
--- /dev/null
+++ b/media-gfx/xfig/files/xfig-3.2.8b-app-defaults.patch
@@ -0,0 +1,14 @@
+diff -ruN xfig-3.2.8b.orig/app-defaults/Fig xfig-3.2.6a/app-defaults/Fig
+--- xfig-3.2.8b.orig/app-defaults/Fig.in	2017-01-10 00:27:39.000000000 +0100
++++ xfig-3.2.8b/app-defaults/Fig.in	2017-03-24 16:22:14.702253419 +0100
+@@ -10,6 +10,10 @@
+ 
+ ! some sample settings you may want to change
+ 
++! If the following resource is set to false, xfig will use metric units
++! by default.
++Fig.inches:	false
++
+ ! The following fixes a problem that some window managers have
+ ! with xfig continually resizing itself
+