reinit the tree, so we can have metadata

20 files changed, 1162 insertions, 0 deletions

diff --git a/media-gfx/xfig/Manifest b/media-gfx/xfig/Manifest
new file mode 100644
index 000000000000..1287b6add03f
--- /dev/null
+++ b/media-gfx/xfig/Manifest
@@ -0,0 +1,23 @@
+AUX xfig-3.2.5b-app-defaults.patch 605 SHA256 a8dbc3c88d7f8c9c7810b360ebb60c8af8f54c56dd39164635e98ca9c6ad834b SHA512 5ff467feffc307200812d7d0d9b165178953e9dcf540f6a87d5baa00308a96ea69d2073a64bcde231e6bb43ebd2e811e8e0d0ec8bcc8efa4180037828cc9dc0d WHIRLPOOL a58682c3a0c567071f7d6b56350ee5bfb05db486b6ad4ae7ca8928e061cde6309fce283c93d1b691263fd525b90d17ff1070522d46fbf223d85ec238f4299329
+AUX xfig-3.2.5b-mkstemp.patch 983 SHA256 3c1264ae5957df3eb3893a32564294265ab84589578ce448530ed6636188bd7c SHA512 e31590f180b44799d7f11707efa80a765fe5f2caf827f3c1070d4c1da7b4baa774e60249f92e4d1d62d47fe220bf69c1ab96f019211b9dfaec8b6372cfaaf02e WHIRLPOOL adbd65baa60b99ac881258a03de892f7cdc1c1eebd7c33af7caa7dba445711f7b7bcd2eee1509af26f882df8428a917f5c814d4977280ad43852b05e0749cf2a
+AUX xfig-3.2.5b-network_images.patch 11918 SHA256 08d983eea753008d3a2a9c7bebf0f9035e795ad3038dbbb05c2a512d86163695 SHA512 17bf8519146b5085743d29959ad6416ed2a19da477d2aaa8d4cc82e0b53c060ee1ada036de1c79e4db91e5cc832978c80194b31b0444f0dcbb5edc1136c8afd3 WHIRLPOOL ebd9a6216533c0afa40c35ea0898932cee17388474df59e1eef78b69d7dc75e183af2e97798c080b7b5967f17242ecd2358a50a7ed48e344510d8cf9e6e8d10f
+AUX xfig-3.2.5b-papersize_b1.patch 1127 SHA256 36bed2e9bfe46868d5b750a12b892a7e20dbf7189d9fbbe4b0066411946d6f01 SHA512 6f302560bb359d1ea8ddb902aec1536d757ccb4655124ba00a6cbcc951eb607475b5abe1ae208c91a034a652d29b85c753af91f936bf4bab8bf0b0b259de2404 WHIRLPOOL c0d5f16c0032ea7c8c4f81951a276a703a7031b162f46c1a00e7764d65563113c583a9bed7d6bfb3f75597503447988a7be67f30ce58d1df2d499e0dc6501d8e
+AUX xfig-3.2.5b-pdfimport_mediabox.patch 1245 SHA256 40ecce3a59500c66879d4b5738ce80d6a6d105b1827b97a14c4e841cf596a5a9 SHA512 88d1cd6fc81e975209b86c0aa656760bcd1d1bc2bc393f3af16c905b5991a469dcd35660300d7c0c84de42c98018922125d6ff757e4dcd707b09931ff49abd39 WHIRLPOOL 41ccfe4cf345190a86164cc77438709c0603893416ee72e62a720574d4f4bc402352a95c6b8639cd3b4d5b875215165c808d3c6be7cd48c4253109df7623bd5c
+AUX xfig-3.2.5b-solaris.patch 507 SHA256 4962a510a0acac1ecb195743473a64f7e3fdd9327afca2a08d74efc574c1b35a SHA512 23cca988a45132e9a28657f3c03aa4c79d32cf4ed1875c210055e88ad07bf887843c13a7d02472af566493fd8a5f4acc533bcdc8e90ff907736b6a08073ca754 WHIRLPOOL 2ff09afd5649f7cdacd4fb0f5294936fbf1fea1148abb8696434194a963f1e4b9d1a3dfc4dacdc333034910cd52ddba369bd99d11c148e1b2eba83ab929bb1ba
+AUX xfig-3.2.5b-urwfonts.patch 4925 SHA256 2e588eed599d6a06342dd6be91fc9ce9999afbc010f98b974b2d05048bd6e232 SHA512 4b720e7f61b78ff10abbbfc78fc7749517555a6c6447667d629717bb843bc34a1c345640ba85b3f1aca0a35c189184d20148ed8baaf95f54b7172602d1e1c8f1 WHIRLPOOL 5d4da8806d1d9af0432aeaa7130fbcc988f0bcba94f1a965a4766f0c6e9635610f17d72c0de6ad1229130710107d9130fa7fcd4a54eb72dc9278028335bf1bf6
+AUX xfig-3.2.5c-XAW3D1_5E_notlocal.patch 1590 SHA256 bb4260c6b08cac2e8a8ec6042054ae026561f1bf5b66ecdaef54b57eb2e7ab25 SHA512 493b34b167ed0807c6f417f6d468d73170d3246576320582e9e9c8a7bbb55a7a14820eb756f7f05a3d53d942b8b4ef63689744d77c4c554d6e35f9e2be64a482 WHIRLPOOL 751fd604219f6508089fa02fe06d592103a84f9564ae9d36c29396c30d3ccc39675b27861268577caebbf370bc4fc72218703005a60694878d593f6932ed2244
+AUX xfig-3.2.5c-crash-on-exit.patch 526 SHA256 1594528e06a2f9f6767ce0e3343800a5fc0191462db8c960c30b96adcedc0e43 SHA512 e3e7baebab9b8efcb621971a873185ccf7202a98ba26ca505aeae1831e0f78ce87fb17f5c62ee646e5b21668922555f47817cf179796a02a53534e4648f0650e WHIRLPOOL 9190790b6955c23aa7df9a528024bf4a4e5cda055f7986c2c9adce0915bff10ce8325006d373716733293f956f54e375ff291a1ad673cf097d0715601f9f8b66
+AUX xfig-3.2.5c-darwin.patch 812 SHA256 cca6ae8af34c16d608038918d385197cd346576c1d88e35c48bba51958c045f2 SHA512 2aa3d845e8fa646cd8a4c0a6892d505c64c6750268b238e7327fb4fd4677401c1dbe976ae4abc5ebb1bb7b8f38e5b8f875b7051dd557eb33ea221489639d40de WHIRLPOOL 80e6fe98a2b3ce9c303ed2fca8fc655c36879a155e58a73da3de6b16dfbb20d937d6134d0eb08aaa5654222e5de09469c57f6eb664de23b6834a896bc07edc86
+AUX xfig-3.2.5c-png16.patch 635 SHA256 0e639c10bf07efd578751859f2be9fc4f0a4c3e47ea56726e59a7535bfb675aa SHA512 fab4b4ae381500221f2f1f4cf9eb486eb94f3d9bc8ff93b9bca8758430233b2031ed8917cfe67ead1f741612935640f31135c38ea7b19e3b215fd2bf4fa50892 WHIRLPOOL cf4e5fd87738c14d636ec69561646660790e7b753f8d3ed4f0729d185800c36130e94ede9e9b2ed9c75e41d30924182b931ea286f26b8e48b75c0594aebdf0bb
+AUX xfig-3.2.5c-spelling.patch 545 SHA256 9b145ae39611a221f2bb005adde99b0df7f30acdf5ed689adea9ee4ce77cfc84 SHA512 3e33470459b249acd65dec1f467e2527f05a625d5ec8d539d943144aedf784d231ed8750441b073e752dfaedda2aedb60bc64cb97b8ddafff72fca0f3f0325ab WHIRLPOOL 47abb2f709aa9830b2b3309d4726991202247720007635708a2951789aefe1add855015e92f806e699388684d09595c62959e54fc693bc21de0a3c1387d27102
+AUX xfig-3.2.6a-app-defaults.patch 502 SHA256 013079d058b8418f18fbdcab5d148a80f807631fe49915499736182d3911a971 SHA512 4c5b523f17cacc85839eeb287a82192c9c3d8c704cca34c8de87d38aa05fb502afdadb9169a396573fb977e650ca7a1fabbdab067fb128be024dea724cb791be WHIRLPOOL 6f794a7c70cc03c3a53b31aea8ab686fde4051a72c5b58f9e51297ca4ec5069566ba0b637b87b0714cfc2af8d792e76dc88eff843cc54a105e3eb497e65b2986
+AUX xfig-3.2.6a-solaris.patch 523 SHA256 22ee2d208466777a5a5b1946e2a6e42c041c2b8fdfb2a7af12be03036dae84bf SHA512 b2eb546b8fdd0d18bab3d9a2c183149fdb4fb278d5e2d8234f040c4fef727bec7461f861391027dea32028b822aa2e540824cb18af09769f32c7a1fb7bf48319 WHIRLPOOL e78062465c39c96aca3c8430b860c29af809bc6b422055b6236e9bf374a9371a89347ae3903070988b444e0d43bb005a19dc47f141ce2251720e97c141d6b018
+AUX xfig-3.2.6a-urwfonts.patch 4933 SHA256 1048fd2fc170e1ce7fd4743577b0d463c717c7cbc4f26a8687e0dce9a2c917f6 SHA512 29fea111b6c07f6ea28bc46259c0dc8d20b1bbf86e33d550037744b93d4f4de7ec9c4ea7fa14c5f91a4278848216d183ac841970c798140359e1fc317baac468 WHIRLPOOL 5310954b9add656a4eb27bfd7650ca93687980f60b22f48dcd9cb61e35571e1119f77bb3f69ae8057b85da473f81bb010ee781a3491277d3c20cd408d6570c45
+DIST xfig-full-3.2.6a.tar.xz 5502944 SHA256 51fa4f5006ebea0657a3b92c62dfbc0116ca63f581370f102af5970de45abd67 SHA512 82e292e050213b6d22be5e174224308b446505e25208f29d4f4c5e760a87ff4104b9dcea0a332241c9bca358e1d44336bb38c316eb3f28130d7c8828c10a805f WHIRLPOOL 56d94e6b3bbd6b419f9c0d10ee548ec52fe79bb70e14bca8b88e047090d33e06b63deab9d0bd87b3280883c04c0af5043bc143f738af9765e6d133adf64a5ff5
+DIST xfig.3.2.5c.full.tar.gz 6078933 SHA256 ea628f975b79ab175ab29220cc118274466497f6217f2989928317be2993a1f9 SHA512 763bd6fd43bff9b44f934dd6e16b0aa5142041f895e74564d28e7252e012f1c7728bbee40e3970357c7d3fd15aa109dbfcbc1d0a2203fa1a2ed770aabacd9525 WHIRLPOOL f2234fc9c1f011bdec301b447816f7bfd090bc2ca3471823afd0617ae15ceafb195dd81ddbb0b255f23e0256b35e12cdd30f44fb65d3fff23f444e4d26028726
+EBUILD xfig-3.2.5c-r1.ebuild 3203 SHA256 1343a0a73069534064c7139395e0568582348cd44fcb4c806a03f81ad0d5b3cc SHA512 45971e1e43c8f54d0c1a4a57596edae08e52239dd06dd066ff6186c6da759a823b78becd86d3249e17b98f1ef0aafe8aec552669120ebae634391a8d5d3d7b35 WHIRLPOOL 18194e74071058f597bc78ff0d91be6149df252122dc6a6aad043ec2205b81403b114f7e58550bd96f95d18446625f0b81eed032c5199970ce46464d89131e9b
+EBUILD xfig-3.2.5c.ebuild 3303 SHA256 e686fd8d619d4a6559aa321a8e7e0539437254d08ba8be3f5783ec0151fd095b SHA512 538cee1a1626c417a967f4c4810a0b8924169f61c153b67e8479243dab39041d05cda40e98e5bbc8c2fe5e571fb85acbe0425072c56906d08c53e4bce8be8c1b WHIRLPOOL 968d375d41b0745a148030f6ee74077b381a23e8b995f7f17f164ac0323344eeab513a6c63109616750ccf3abc2eca6dabc224ea45191db595883855ea346b53
+EBUILD xfig-3.2.6a.ebuild 1211 SHA256 00c787bd497ed85e87e3e0b5da35b8f036329bb4660cf07b65220a8032d653e5 SHA512 262069c86ed2cecf02e6f49720683a1811133a00ad0b1e7d3b22764bcea9e0f02087dce3675368d78ca336cd235e54fea9ed7b78e4207f60029000adb313b383 WHIRLPOOL 619b32833aa7f8725a90b8ab117be723e693def237da4046a1b198bd21e4ffc4269cd1d01b83db7dd412b690f0074b89b0245ad9fd5e6af9c1f454f22b27cc84
+MISC ChangeLog 3043 SHA256 41c7be17aa896b2e29f3aefb1527ea93cd4bbb13a90a422aa3c031e783943259 SHA512 5d9307a0ca663d7ac3855762d89f7e2c08c579f8e68bb6aa67468c6db548d5cf52085d1dac3dfe3c854d44fe854e7c053f484ab991c403ee83bc789a799f05af WHIRLPOOL 9124c62e7a271e5089eaa69d347f5a9e8410057339a7f9d31dd0822b5e6cce0717b7aa3b52660c85d772d9822669cd22ff5be0e1b83cd45ecd70a701ee0e2d60
+MISC ChangeLog-2015 14381 SHA256 0d3dd58a20fc1a029ba9dc4591fb7898814ebaefe55c55967e2f3a2fe6fb44b8 SHA512 3563a80240b8461d3a54a5382af46952ccd232dc2a9b1d2c301fbe484e10c6a1b3f8fc017651749b199a399d7812823f3c44390bca5cf4ec64421c6d961cc39c WHIRLPOOL e7ac55f1b255d64f29e5963f34d2624d86530e8e3530ea649c1ffdd14c9810abca89c6b87159a73b36d6a08ef186e9235e89be6963138cae40415f1525808531
+MISC metadata.xml 212 SHA256 00d100e8d1bbfee4c0e3dcd7695c183150d06133fddd672e246c21bc02c4c8d7 SHA512 05c3af7b4c872998a64d3d6dce356ad1bfeb67f4ec845e82e022a89c96945ba5fe8848df48b8736feb39bd4d9a7d6714f0895a9c824e3c67d903ea3da1ca0f22 WHIRLPOOL 1fd2058c94f0e8891205ed1e106759e99c8bd0f765618fc2fc801e566241b062a1219f5044b8b7ed1299b28a189846c2d125ea86b71f72e9fa403ad3f0dea4b3
diff --git a/media-gfx/xfig/files/xfig-3.2.5b-app-defaults.patch b/media-gfx/xfig/files/xfig-3.2.5b-app-defaults.patch
new file mode 100644
index 000000000000..560ddef94ebb
--- /dev/null
+++ b/media-gfx/xfig/files/xfig-3.2.5b-app-defaults.patch
@@ -0,0 +1,24 @@
+Defaults for xfig. Idea from Roland Rosenfeld <roland@debian.org>
+
+diff -urNad xfig~/Fig.ad xfig/Fig.ad
+--- a/Fig.ad
++++ b/Fig.ad
+@@ -10,13 +10,17 @@
+ 
+ ! 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
+ 
+ Fig*AllowShellResize: false
+ 
+ ! Image editor - can edit imported image
+-Fig.image_editor:		xv
++Fig.image_editor:		gimp
+ 
+ ! name of ghostscript (not ghostview)
+ Fig.ghostscript:		gs
diff --git a/media-gfx/xfig/files/xfig-3.2.5b-mkstemp.patch b/media-gfx/xfig/files/xfig-3.2.5b-mkstemp.patch
new file mode 100644
index 000000000000..931ac94e58a4
--- /dev/null
+++ b/media-gfx/xfig/files/xfig-3.2.5b-mkstemp.patch
@@ -0,0 +1,32 @@
+Missed hunk noticed https://bugzilla.redhat.com/show_bug.cgi?id=505257#c1 is recreated.
+
+http://bugs.gentoo.org/show_bug.cgi?id=264575
+
+=== modified file 'u_print.c'
+--- a/u_print.c	2010-01-14 19:50:08 +0000
++++ b/u_print.c	2010-01-14 19:54:14 +0000
+@@ -202,14 +202,22 @@
+     char	    tmp_fig_file[PATH_MAX];
+     char	   *outfile, *name, *real_lang;
+     char	   *suf;
++    int     fd;
+ 
+     /* if file exists, ask if ok */
+     if (!ok_to_write(file, "EXPORT"))
+ 	return (1);
+ 
+-    sprintf(tmp_fig_file, "%s/%s%06d", TMPDIR, "xfig-fig", getpid());
++    snprintf(tmp_fig_file, sizeof(tmp_fig_file), "%s/xfig-fig.XXXXXX", TMPDIR);
+     /* write the fig objects to a temporary file */
+     warnexist = False;
++
++    if ((fd = mkstemp(tmp_fig_file)) == -1) {
++       file_msg("Can't open temp file %s: %s\n", tmp_fig_file, strerror(errno));
++       return;
++    }
++    close(fd);
++
+     init_write_tmpfile();
+     if (write_file(tmp_fig_file, False)) {
+       end_write_tmpfile();
+
diff --git a/media-gfx/xfig/files/xfig-3.2.5b-network_images.patch b/media-gfx/xfig/files/xfig-3.2.5b-network_images.patch
new file mode 100644
index 000000000000..1f7be5ff99a9
--- /dev/null
+++ b/media-gfx/xfig/files/xfig-3.2.5b-network_images.patch
@@ -0,0 +1,371 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 12_network_images.dpatch by Roland Rosenfeld <roland@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Some network icons colored and/or combined by Roland Rosenfeld.
+
+@DPATCH@
+diff -urNad xfig~/Libraries/Networks/Devices/firewall-pair.fig xfig/Libraries/Networks/Devices/firewall-pair.fig
+--- Libraries/Networks/Devices/firewall-pair.fig
++++ Libraries/Networks/Devices/firewall-pair.fig
+@@ -0,0 +1,75 @@
++#FIG 3.2  Produced by xfig version 3.2.5-alpha5
++Portrait
++Center
++Inches
++A4      
++100.00
++Single
++-2
++# A pair of firewalls
++# Combined by Roland Rosenfeld
++1200 2
++0 32 #aeaaae
++# A pair of firewalls
++6 3375 2175 4050 3075
++6 3600 2250 4050 3075
++# Firewall
++# (from TomiOllila <Tomi.Ollila@tfi.net> )
++6 3600 2250 4050 3075
++2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2
++	 3825 3075 3825 2475
++2 1 0 1 0 20 2 0 20 0.000 0 0 -1 0 0 5
++	 3675 2475 3675 3075 3825 3075 3975 2925 3975 2400
++2 1 0 1 0 32 1 0 20 0.000 0 0 -1 0 0 7
++	 3600 2400 3600 2475 3900 2475 4050 2325 4050 2250 3750 2250
++	 3600 2400
++2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 3
++	 3900 2475 3900 2400 3600 2400
++2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2
++	 3900 2400 4050 2250
++2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 3
++	 3675 2625 3825 2625 3975 2475
++2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 3
++	 3675 2775 3825 2775 3975 2625
++2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 3
++	 3675 2925 3825 2925 3975 2775
++2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2
++	 3900 3000 3900 2850
++2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2
++	 3900 2700 3900 2550
++2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2
++	 3750 2475 3750 2625
++2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2
++	 3750 2775 3750 2925
++-6
++-6
++6 3375 2175 3825 3000
++6 3450 2175 3825 3000
++2 1 0 1 0 7 20 0 -1 0.000 0 0 7 0 0 2
++	 3600 3000 3600 2400
++2 1 0 1 0 7 20 0 -1 0.000 0 0 7 0 0 2
++	 3675 2325 3825 2175
++2 1 0 1 0 7 20 0 -1 0.000 0 0 7 0 0 3
++	 3450 2550 3600 2550 3750 2400
++2 1 0 1 0 7 20 0 -1 0.000 0 0 7 0 0 3
++	 3450 2700 3600 2700 3750 2550
++2 1 0 1 0 7 20 0 -1 0.000 0 0 7 0 0 3
++	 3450 2850 3600 2850 3750 2700
++2 1 0 1 0 7 20 0 -1 0.000 0 0 7 0 0 2
++	 3675 2925 3675 2775
++2 1 0 1 0 7 20 0 -1 0.000 0 0 7 0 0 2
++	 3675 2625 3675 2475
++2 1 0 1 0 7 20 0 -1 0.000 0 0 7 0 0 2
++	 3525 2400 3525 2550
++2 1 0 1 0 7 20 0 -1 0.000 0 0 7 0 0 2
++	 3525 2700 3525 2850
++-6
++2 1 0 1 0 20 22 0 20 0.000 0 0 -1 0 0 5
++	 3450 2400 3450 3000 3600 3000 3750 2850 3750 2325
++2 1 0 1 0 32 21 0 20 0.000 0 0 -1 0 0 7
++	 3375 2325 3375 2400 3675 2400 3825 2250 3825 2175 3525 2175
++	 3375 2325
++2 1 0 1 0 7 20 0 -1 0.000 0 0 -1 0 0 3
++	 3675 2400 3675 2325 3375 2325
++-6
++-6
+diff -urNad xfig~/Libraries/Networks/Devices/internet.fig xfig/Libraries/Networks/Devices/internet.fig
+--- Libraries/Networks/Devices/internet.fig
++++ Libraries/Networks/Devices/internet.fig
+@@ -0,0 +1,39 @@
++#FIG 3.2  Produced by xfig version 3.2.5-alpha5
++Portrait
++Center
++Inches
++A4      
++100.00
++Single
++-2
++# Internet cloud
++# By Roland Rosenfeld
++1200 2
++# An Internet cloud
++6 4275 5700 7200 7650
++2 1 0 0 7 7 970 0 20 4.000 0 0 0 0 0 65
++	 4719 7111 4633 7121 4548 7105 4469 7057 4394 6983 4346 6888
++	 4309 6776 4298 6654 4309 6526 4346 6415 4394 6325 4469 6244
++	 4548 6197 4633 6181 4719 6197 4798 6048 4893 5915 4994 5825
++	 5122 5746 5244 5719 5377 5719 5505 5746 5627 5825 5733 5915
++	 5850 5825 5961 5746 6094 5719 6222 5719 6355 5746 6472 5825
++	 6583 5915 6668 6048 6748 6197 6833 6181 6918 6197 7003 6244
++	 7072 6325 7130 6415 7157 6526 7168 6654 7157 6776 7130 6888
++	 7072 6983 7003 7057 6918 7105 6833 7121 6748 7111 6668 7265
++	 6583 7387 6472 7488 6355 7557 6222 7594 6094 7594 5961 7557
++	 5850 7488 5733 7387 5627 7488 5505 7557 5377 7594 5244 7594
++	 5122 7557 4994 7488 4893 7387 4798 7265 4719 7111
++2 1 0 2 1 0 969 0 -1 0.000 0 0 0 0 0 65
++	 4719 7111 4633 7121 4548 7105 4469 7057 4394 6983 4346 6888
++	 4309 6776 4298 6654 4309 6526 4346 6415 4394 6325 4469 6244
++	 4548 6197 4633 6181 4719 6197 4798 6048 4893 5915 4994 5825
++	 5122 5746 5244 5719 5377 5719 5505 5746 5627 5825 5733 5915
++	 5850 5825 5961 5746 6094 5719 6222 5719 6355 5746 6472 5825
++	 6583 5915 6668 6048 6748 6197 6833 6181 6918 6197 7003 6244
++	 7072 6325 7130 6415 7157 6526 7168 6654 7157 6776 7130 6888
++	 7072 6983 7003 7057 6918 7105 6833 7121 6748 7111 6668 7265
++	 6583 7387 6472 7488 6355 7557 6222 7594 6094 7594 5961 7557
++	 5850 7488 5733 7387 5627 7488 5505 7557 5377 7594 5244 7594
++	 5122 7557 4994 7488 4893 7387 4798 7265 4719 7111
++4 0 0 100 0 18 33 0.0000 4 405 2040 4744 6853 Internet\001
++-6
+diff -urNad xfig~/Libraries/Networks/Routers/router-pair.fig xfig/Libraries/Networks/Routers/router-pair.fig
+--- Libraries/Networks/Routers/router-pair.fig
++++ Libraries/Networks/Routers/router-pair.fig
+@@ -0,0 +1,78 @@
++#FIG 3.2  Produced by xfig version 3.2.5-alpha5
++Portrait
++Center
++Inches
++A4      
++100.00
++Single
++-2
++# A pair of routers
++# Colored and combined by Roland Rosenfeld
++1200 2
++# A pair of routers
++6 3150 3300 4275 3975
++6 3346 3450 4269 3975
++6 3844 3615 4173 3718
++# polyline

++2 1 0 1 0 7 50 0 20 0.000 0 0 0 0 0 8
++	 3879 3701 3854 3647 3976 3624 3955 3642 4159 3676 4111 3713
++	 3908 3676 3879 3701
++-6
++6 3617 3636 3803 3759
++# polyline

++2 1 0 1 0 7 50 0 20 0.000 0 0 0 0 0 8
++	 3764 3731 3638 3754 3634 3694 3671 3703 3738 3646 3800 3657
++	 3727 3719 3764 3731
++-6
++6 3803 3470 3988 3594
++# polyline

++2 1 0 1 0 7 50 0 20 0.000 0 0 7 0 0 8
++	 3837 3518 3982 3481 3983 3541 3947 3535 3876 3591 3809 3581
++	 3882 3526 3837 3518
++-6
++1 2 0 1 0 15 51 0 20 0.000 1 0.0000 3807 3619 457 169 3349 3619 4264 3619
++1 2 0 1 0 15 53 0 20 0.000 1 0.0000 3803 3806 457 169 3346 3806 4261 3806
++# polyline

++2 1 0 1 0 7 50 0 20 0.000 0 0 0 0 0 8
++	 3705 3557 3738 3608 3609 3637 3638 3615 3439 3581 3488 3545
++	 3681 3576 3705 3557
++2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
++	 3350 3613 3347 3812
++2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
++	 4263 3626 4263 3815
++2 2 0 0 0 15 52 -1 20 0.000 0 0 -1 0 0 5
++	 3349 3626 4269 3626 4269 3800 3349 3800 3349 3626
++-6
++6 3150 3300 4125 3825
++6 3600 3450 3975 3600
++# polyline

++2 1 0 1 0 7 60 0 20 0.000 0 0 0 0 0 8
++	 3683 3551 3658 3497 3780 3474 3759 3492 3963 3526 3915 3563
++	 3712 3526 3683 3551
++-6
++6 3600 3300 3825 3450
++# polyline

++2 1 0 1 0 7 60 0 20 0.000 0 0 7 0 0 8
++	 3641 3368 3786 3331 3787 3391 3751 3385 3680 3441 3613 3431
++	 3686 3376 3641 3368
++-6
++6 3375 3450 3675 3675
++# polyline

++2 1 0 1 0 7 60 0 20 0.000 0 0 0 0 0 8
++	 3568 3581 3442 3604 3438 3544 3475 3553 3542 3496 3604 3507
++	 3531 3569 3568 3581
++-6
++1 2 0 1 0 15 61 0 20 0.000 1 0.0000 3611 3469 457 169 3153 3469 4068 3469
++1 2 0 1 0 15 63 0 20 0.000 1 0.0000 3607 3656 457 169 3150 3656 4065 3656
++2 1 0 1 0 7 60 -1 -1 0.000 0 0 -1 0 0 2
++	 4067 3476 4067 3665
++# polyline

++2 1 0 1 0 7 60 0 20 0.000 0 0 0 0 0 8
++	 3509 3407 3542 3458 3413 3487 3442 3465 3243 3431 3292 3395
++	 3485 3426 3509 3407
++2 1 0 1 0 7 60 -1 -1 0.000 0 0 -1 0 0 2
++	 3154 3463 3151 3662
++2 2 0 0 0 15 62 -1 20 0.000 0 0 -1 0 0 5
++	 3153 3476 4073 3476 4073 3650 3153 3650 3153 3476
++-6
++-6
+diff -urNad xfig~/Libraries/Networks/Routers/router4.fig xfig/Libraries/Networks/Routers/router4.fig
+--- Libraries/Networks/Routers/router4.fig
++++ Libraries/Networks/Routers/router4.fig
+@@ -0,0 +1,44 @@
++#FIG 3.2  Produced by xfig version 3.2.5-alpha5
++Portrait
++Center
++Metric
++A4      
++100.00
++Single
++-2
++# Router
++# Colored by Roland Rosenfeld
++1200 2
++# Router
++6 3870 4455 5940 5625
++6 4995 4815 5715 5040
++# polyline

++2 1 0 1 0 7 50 0 20 0.000 0 0 0 0 0 8
++	 5072 5002 5018 4886 5284 4834 5238 4873 5683 4948 5578 5030
++	 5136 4948 5072 5002
++-6
++6 4500 4860 4905 5130
++# polyline

++2 1 0 1 0 7 50 0 20 0.000 0 0 0 0 0 8
++	 4822 5067 4545 5117 4537 4989 4618 5007 4766 4883 4900 4905
++	 4741 5041 4822 5067
++-6
++6 4905 4500 5310 4770
++# polyline

++2 1 0 1 0 7 50 0 20 0.000 0 0 7 0 0 8
++	 4981 4603 5296 4523 5300 4653 5222 4640 5066 4762 4919 4741
++	 5079 4622 4981 4603
++-6
++1 2 0 1 0 15 51 0 20 0.000 1 0.0000 4914 4824 999 369 3915 4824 5913 4824
++1 2 0 1 0 15 53 0 20 0.000 1 0.0000 4908 5231 999 369 3909 5231 5907 5231
++# polyline

++2 1 0 1 0 7 50 0 20 0.000 0 0 0 0 0 8
++	 4693 4690 4766 4800 4483 4863 4545 4814 4111 4740 4219 4661
++	 4640 4731 4693 4690
++2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
++	 3917 4811 3910 5244
++2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
++	 5910 4838 5910 5251
++2 2 0 0 0 15 52 -1 20 0.000 0 0 -1 0 0 5
++	 3915 4838 5924 4838 5924 5218 3915 5218 3915 4838
++-6
+diff -urNad xfig~/Libraries/Networks/Switches/switch-pair.fig xfig/Libraries/Networks/Switches/switch-pair.fig
+--- Libraries/Networks/Switches/switch-pair.fig
++++ Libraries/Networks/Switches/switch-pair.fig
+@@ -0,0 +1,66 @@
++#FIG 3.2  Produced by xfig version 3.2.5-alpha5
++Portrait
++Center
++Inches
++A4      
++100.00
++Single
++-2
++# A pair of switches
++# Colored and combined by Roland Rosenfeld
++1200 2
++# A pair of switches
++6 2550 2625 4725 3750
++6 2625 2850 4725 3750
++6 3000 2850 4425 3300
++# polyline

++2 1 0 1 0 7 50 0 20 0.000 0 0 0 0 0 8
++	 3603 3180 3581 3210 3194 3210 3161 3240 3028 3195 3268 3126
++	 3214 3184 3608 3184
++# polyline

++2 1 0 1 0 7 50 0 20 0.000 0 0 0 0 0 8
++	 3651 3128 3673 3098 4060 3098 4093 3068 4226 3113 3986 3182
++	 4040 3124 3646 3124
++# polyline

++2 1 0 1 0 7 50 0 20 0.000 0 0 0 0 0 8
++	 3760 3008 3738 3038 3351 3038 3318 3068 3185 3023 3425 2954
++	 3371 3012 3765 3012
++# polyline

++2 1 0 1 0 7 50 0 20 0.000 0 0 0 0 0 8
++	 3827 2963 3849 2933 4236 2933 4269 2903 4402 2948 4162 3017
++	 4216 2959 3822 2959
++-6
++2 1 0 1 0 15 51 0 20 0.000 0 0 -1 0 0 4
++	 4125 3300 4725 2850 4725 3300 4125 3750
++2 2 0 1 0 15 51 0 20 0.000 0 0 -1 0 0 5
++	 2625 3300 4125 3300 4125 3750 2625 3750 2625 3300
++2 3 0 1 0 15 51 -1 20 0.000 0 0 -1 0 0 5
++	 2625 3300 3225 2850 4725 2850 4125 3300 2625 3300
++-6
++6 2550 2625 4650 3525
++6 2925 2625 4350 3075
++# polyline

++2 1 0 1 0 7 61 0 20 0.000 0 0 0 0 0 8
++	 3528 2955 3506 2985 3119 2985 3086 3015 2953 2970 3193 2901
++	 3139 2959 3533 2959
++# polyline

++2 1 0 1 0 7 61 0 20 0.000 0 0 0 0 0 8
++	 3576 2903 3598 2873 3985 2873 4018 2843 4151 2888 3911 2957
++	 3965 2899 3571 2899
++# polyline

++2 1 0 1 0 7 61 0 20 0.000 0 0 0 0 0 8
++	 3685 2783 3663 2813 3276 2813 3243 2843 3110 2798 3350 2729
++	 3296 2787 3690 2787
++# polyline

++2 1 0 1 0 7 61 0 20 0.000 0 0 0 0 0 8
++	 3752 2738 3774 2708 4161 2708 4194 2678 4327 2723 4087 2792
++	 4141 2734 3747 2734
++-6
++2 1 0 1 0 15 62 0 20 0.000 0 0 -1 0 0 4
++	 4050 3075 4650 2625 4650 3075 4050 3525
++2 2 0 1 0 15 62 0 20 0.000 0 0 -1 0 0 5
++	 2550 3075 4050 3075 4050 3525 2550 3525 2550 3075
++2 3 0 1 0 15 62 -1 20 0.000 0 0 -1 0 0 5
++	 2550 3075 3150 2625 4650 2625 4050 3075 2550 3075
++-6
++-6
+diff -urNad xfig~/Libraries/Networks/Switches/switch2.fig xfig/Libraries/Networks/Switches/switch2.fig
+--- Libraries/Networks/Switches/switch2.fig
++++ Libraries/Networks/Switches/switch2.fig
+@@ -0,0 +1,38 @@
++#FIG 3.2  Produced by xfig version 3.2.5-alpha5
++Portrait
++Center
++Inches
++A4      
++100.00
++Single
++-2
++# Switch
++# colored by Roland Rosenfeld
++1200 2
++# Switch
++6 2625 2850 4725 3750
++6 3000 2850 4425 3300
++# polyline

++2 1 0 1 0 7 50 0 20 0.000 0 0 0 0 0 8
++	 3603 3180 3581 3210 3194 3210 3161 3240 3028 3195 3268 3126
++	 3214 3184 3608 3184
++# polyline

++2 1 0 1 0 7 50 0 20 0.000 0 0 0 0 0 8
++	 3651 3128 3673 3098 4060 3098 4093 3068 4226 3113 3986 3182
++	 4040 3124 3646 3124
++# polyline

++2 1 0 1 0 7 50 0 20 0.000 0 0 0 0 0 8
++	 3760 3008 3738 3038 3351 3038 3318 3068 3185 3023 3425 2954
++	 3371 3012 3765 3012
++# polyline

++2 1 0 1 0 7 50 0 20 0.000 0 0 0 0 0 8
++	 3827 2963 3849 2933 4236 2933 4269 2903 4402 2948 4162 3017
++	 4216 2959 3822 2959
++-6
++2 1 0 1 0 15 51 0 20 0.000 0 0 -1 0 0 4
++	 4125 3300 4725 2850 4725 3300 4125 3750
++2 2 0 1 0 15 51 0 20 0.000 0 0 -1 0 0 5
++	 2625 3300 4125 3300 4125 3750 2625 3750 2625 3300
++2 3 0 1 0 15 51 -1 20 0.000 0 0 -1 0 0 5
++	 2625 3300 3225 2850 4725 2850 4125 3300 2625 3300
++-6
diff --git a/media-gfx/xfig/files/xfig-3.2.5b-papersize_b1.patch b/media-gfx/xfig/files/xfig-3.2.5b-papersize_b1.patch
new file mode 100644
index 000000000000..fa0bdf0a3c0e
--- /dev/null
+++ b/media-gfx/xfig/files/xfig-3.2.5b-papersize_b1.patch
@@ -0,0 +1,27 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 32_papersize_b1.dpatch by Roland Rosenfeld <roland@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: xfig -papersize b1 now really uses B1 instead of B10
+## DP: Closes: #535181
+
+@DPATCH@
+diff -urNad xfig~/resources.c xfig/resources.c
+--- xfig~/resources.c
++++ xfig/resources.c
+@@ -228,7 +228,6 @@
+     {"A2      ", "ISO A2  ( 420mm x  594mm)", 19843, 28063}, 
+     {"A1      ", "ISO A1  ( 594mm x  841mm)", 28063, 39732}, 
+     {"A0      ", "ISO A0  ( 841mm x 1189mm)", 39732, 56173}, 
+-    {"B10     ", "JIS B10 (  32mm x   45mm)",  1516,  2117},
+     {"B9      ", "JIS B9  (  45mm x   64mm)",  2117,  3017},
+     {"B8      ", "JIS B8  (  64mm x   91mm)",  3017,  4300},
+     {"B7      ", "JIS B7  (  91mm x  128mm)",  4300,  6050},
+@@ -239,6 +238,7 @@
+     {"B2      ", "JIS B2  ( 515mm x  728mm)", 24333, 34400},
+     {"B1      ", "JIS B1  ( 728mm x 1030mm)", 34400, 48666},
+     {"B0      ", "JIS B0  (1030mm x 1456mm)", 48666, 68783},
++    {"B10     ", "JIS B10 (  32mm x   45mm)",  1516,  2117},
+     };
+ 
+ char    *multiple_pages[] = {
diff --git a/media-gfx/xfig/files/xfig-3.2.5b-pdfimport_mediabox.patch b/media-gfx/xfig/files/xfig-3.2.5b-pdfimport_mediabox.patch
new file mode 100644
index 000000000000..23de740f157d
--- /dev/null
+++ b/media-gfx/xfig/files/xfig-3.2.5b-pdfimport_mediabox.patch
@@ -0,0 +1,37 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 33_pdfimport_mediabox.dpatch by jsoula@univ-lille2.fr
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix reading "/MediaBox" when importing PDF (Closes: #530898).
+
+@DPATCH@
+diff -urNad xfig~/f_readeps.c xfig/f_readeps.c
+--- xfig~/f_readeps.c
++++ xfig/f_readeps.c
+@@ -77,11 +77,13 @@
+ 
+ 	/* look for /MediaBox for pdf file */
+ 	if (pdf_flag) {
+-	    if (!strncmp(buf, "/MediaBox", 8)) {	/* look for the MediaBox spec */
++	  char *s;
++	  for(s=buf; (s=strchr(s,'/')); s++) {
++	    if (!strncmp(s, "/MediaBox", 8)) {	/* look for the MediaBox spec */
+ 		char       *c;
+ 
+-		c = strchr(buf, '[') + 1;
+-		if (c && sscanf(c, "%d %d %d %d", &llx, &lly, &urx, &ury) < 4) {
++		c = strchr(s, '[');
++		if (c && sscanf(c+1, "%d %d %d %d", &llx, &lly, &urx, &ury) < 4) {
+ 		    llx = lly = 0;
+ 		    urx = paper_sizes[0].width * 72 / PIX_PER_INCH;
+ 		    ury = paper_sizes[0].height * 72 / PIX_PER_INCH;
+@@ -89,7 +91,9 @@
+ 			     appres.INCHES ? "Letter" : "A4");
+ 		    app_flush();
+ 		}
++		break;
+ 	    }
++	  }
+ 	    /* look for bounding box */
+ 	} else if (!nested && !strncmp(buf, "%%BoundingBox:", 14)) {
+ 	    if (!strstr(buf, "(atend)")) {	/* make sure doesn't say (atend) */
diff --git a/media-gfx/xfig/files/xfig-3.2.5b-solaris.patch b/media-gfx/xfig/files/xfig-3.2.5b-solaris.patch
new file mode 100644
index 000000000000..2e93a7faac26
--- /dev/null
+++ b/media-gfx/xfig/files/xfig-3.2.5b-solaris.patch
@@ -0,0 +1,26 @@
+* workaround some missing things on Solaris
+
+--- a/u_quartic.c
++++ b/u_quartic.c
+@@ -21,4 +21,7 @@
+  #include <math.h>
+  
++ #ifndef M_PI
++ # define M_PI 3.14159265358979323846
++ #endif
+  
+  static int
+--- a/w_intersect.c
++++ b/w_intersect.c
+@@ -31,6 +31,11 @@
+ #define ISET_P1 (1 << 0)
+ #define ISET_P2 (1 << 1)
+ 
++#if defined (__SVR4) && defined (__sun)
++#undef _Complex_I
++#define _Complex_I (__extension__ 1.0fi)
++#endif
++
+ intersect_state_e intersect_state = INTERSECT_INITIAL;
+ 
+ static INLINE Boolean
diff --git a/media-gfx/xfig/files/xfig-3.2.5b-urwfonts.patch b/media-gfx/xfig/files/xfig-3.2.5b-urwfonts.patch
new file mode 100644
index 000000000000..87ac63f838f8
--- /dev/null
+++ b/media-gfx/xfig/files/xfig-3.2.5b-urwfonts.patch
@@ -0,0 +1,79 @@
+--- a/u_fonts.c	2002-09-09 13:36:58.000000000 -0400
++++ b/u_fonts.c	2006-10-11 00:29:07.000000000 -0400
+@@ -22,41 +22,41 @@
+ /* X11 font names */
+ 
+ struct _xfstruct x_fontinfo[NUM_FONTS] = {
+-    {"-*-times-medium-r-normal--", (struct xfont*) NULL},
+-    {"-*-times-medium-i-normal--", (struct xfont*) NULL},
+-    {"-*-times-bold-r-normal--", (struct xfont*) NULL},
+-    {"-*-times-bold-i-normal--", (struct xfont*) NULL},
+-    {"-*-avantgarde-book-r-normal--", (struct xfont*) NULL},
+-    {"-*-avantgarde-book-o-normal--", (struct xfont*) NULL},
+-    {"-*-avantgarde-demi-r-normal--", (struct xfont*) NULL},
+-    {"-*-avantgarde-demi-o-normal--", (struct xfont*) NULL},
+-    {"-*-bookman-light-r-normal--", (struct xfont*) NULL},
+-    {"-*-bookman-light-i-normal--", (struct xfont*) NULL},
+-    {"-*-bookman-demi-r-normal--", (struct xfont*) NULL},
+-    {"-*-bookman-demi-i-normal--", (struct xfont*) NULL},
+-    {"-*-courier-medium-r-normal--", (struct xfont*) NULL},
+-    {"-*-courier-medium-o-normal--", (struct xfont*) NULL},
+-    {"-*-courier-bold-r-normal--", (struct xfont*) NULL},
+-    {"-*-courier-bold-o-normal--", (struct xfont*) NULL},
+-    {"-*-helvetica-medium-r-normal--", (struct xfont*) NULL},
+-    {"-*-helvetica-medium-o-normal--", (struct xfont*) NULL},
+-    {"-*-helvetica-bold-r-normal--", (struct xfont*) NULL},
+-    {"-*-helvetica-bold-o-normal--", (struct xfont*) NULL},
+-    {"-*-helvetica-medium-r-narrow--", (struct xfont*) NULL},
+-    {"-*-helvetica-medium-o-narrow--", (struct xfont*) NULL},
+-    {"-*-helvetica-bold-r-narrow--", (struct xfont*) NULL},
+-    {"-*-helvetica-bold-o-narrow--", (struct xfont*) NULL},
+-    {"-*-new century schoolbook-medium-r-normal--", (struct xfont*) NULL},
+-    {"-*-new century schoolbook-medium-i-normal--", (struct xfont*) NULL},
+-    {"-*-new century schoolbook-bold-r-normal--", (struct xfont*) NULL},
+-    {"-*-new century schoolbook-bold-i-normal--", (struct xfont*) NULL},
+-    {"-*-palatino-medium-r-normal--", (struct xfont*) NULL},
+-    {"-*-palatino-medium-i-normal--", (struct xfont*) NULL},
+-    {"-*-palatino-bold-r-normal--", (struct xfont*) NULL},
+-    {"-*-palatino-bold-i-normal--", (struct xfont*) NULL},
+-    {"-*-symbol-medium-r-normal--", (struct xfont*) NULL},
+-    {"-*-itc zapf chancery-medium-i-normal--", (struct xfont*) NULL},
+-    {"-*-itc zapf dingbats-*-*-*--", (struct xfont*) NULL},
++    {"-urw-nimbus roman no9 l-medium-r-normal--", (struct xfont*) NULL},
++    {"-urw-nimbus roman no9 l-medium-i-normal--", (struct xfont*) NULL},
++    {"-urw-nimbus roman no9 l-bold-r-normal--", (struct xfont*) NULL},
++    {"-urw-nimbus roman no9 l-bold-i-normal--", (struct xfont*) NULL},
++    {"-urw-urw gothic l-medium-r-normal--", (struct xfont*) NULL},
++    {"-urw-urw gothic l-medium-o-normal--", (struct xfont*) NULL},
++    {"-urw-urw gothic l-semibold-r-normal--", (struct xfont*) NULL},
++    {"-urw-urw gothic l-semibold-o-normal--", (struct xfont*) NULL},
++    {"-urw-urw bookman l-medium-r-normal--", (struct xfont*) NULL},
++    {"-urw-urw bookman l-medium-i-normal--", (struct xfont*) NULL},
++    {"-urw-urw bookman l-bold-r-normal--", (struct xfont*) NULL},
++    {"-urw-urw bookman l-bold-i-normal--", (struct xfont*) NULL},
++    {"-urw-nimbus mono l-medium-r-normal--", (struct xfont*) NULL},
++    {"-urw-nimbus mono l-medium-o-normal--", (struct xfont*) NULL},
++    {"-urw-nimbus mono l-bold-r-normal--", (struct xfont*) NULL},
++    {"-urw-nimbus mono l-bold-o-normal--", (struct xfont*) NULL},
++    {"-urw-nimbus sans l-medium-r-normal--", (struct xfont*) NULL},
++    {"-urw-nimbus sans l-medium-i-normal--", (struct xfont*) NULL},
++    {"-urw-nimbus sans l-bold-r-normal--", (struct xfont*) NULL},
++    {"-urw-nimbus sans l-bold-i-normal--", (struct xfont*) NULL},
++    {"-urw-nimbus sans l-medium-r-condensed--", (struct xfont*) NULL},
++    {"-urw-nimbus sans l-medium-i-condensed--", (struct xfont*) NULL},
++    {"-urw-nimbus sans l-bold-r-condensed--", (struct xfont*) NULL},
++    {"-urw-nimbus sans l-bold-i-condensed--", (struct xfont*) NULL},
++    {"-urw-century schoolbook l-medium-r-normal--", (struct xfont*) NULL},
++    {"-urw-century schoolbook l-medium-i-normal--", (struct xfont*) NULL},
++    {"-urw-century schoolbook l-bold-r-normal--", (struct xfont*) NULL},
++    {"-urw-century schoolbook l-bold-i-normal--", (struct xfont*) NULL},
++    {"-urw-urw palladio l-medium-r-normal--", (struct xfont*) NULL},
++    {"-urw-urw palladio l-medium-i-normal--", (struct xfont*) NULL},
++    {"-urw-urw palladio l-bold-r-normal--", (struct xfont*) NULL},
++    {"-urw-urw palladio l-bold-i-normal--", (struct xfont*) NULL},
++    {"-urw-standard symbols l-medium-r-normal--", (struct xfont*) NULL},
++    {"-urw-urw chancery l-medium-i-normal--", (struct xfont*) NULL},
++    {"-urw-dingbats-medium-r-normal--", (struct xfont*) NULL},
+ };
+ 
+ /* Use the following font names for any font that doesn't exist in the table above.
diff --git a/media-gfx/xfig/files/xfig-3.2.5c-XAW3D1_5E_notlocal.patch b/media-gfx/xfig/files/xfig-3.2.5c-XAW3D1_5E_notlocal.patch
new file mode 100644
index 000000000000..8998b406467a
--- /dev/null
+++ b/media-gfx/xfig/files/xfig-3.2.5c-XAW3D1_5E_notlocal.patch
@@ -0,0 +1,70 @@
+From be8cf541743060921f629d5bfe990d985ecf1813 Mon Sep 17 00:00:00 2001
+From: Vladislav Zavjalov <slazav@altlinux.org>
+Origin: http://git.altlinux.org/people/slazav/packages/?p=xfig.git;a=patch;h=be8cf541743060921f629d5bfe990d985ecf1813
+Date: Wed, 29 May 2013 02:18:13 +0400
+Subject: [PATCH] Don't use local SimpleMenu.c with XAW3D1_5E
+Bug-Debian: http://bugs.debian.org/296703
+
+---
+ xfig/SmeCascade.h  |    5 +++++
+ xfig/SmeCascadeP.h |    5 +++++
+ xfig/w_menuentry.h |    4 ++++
+ xfig/w_util.c      |    2 ++
+ 4 files changed, 16 insertions(+), 0 deletions(-)
+
+--- a/SmeCascade.h
++++ b/SmeCascade.h
+@@ -27,7 +27,12 @@
+ #else

+ #include <X11/Xaw/Sme.h>

+ #endif

++

++#ifdef XAW3D1_5E

++#include <X11/Xaw3d/SmeBSB.h>

++#else

+ #include "SmeBSB.h"

++#endif

+ 

+ /****************************************************************

+  *

+--- a/SmeCascadeP.h
++++ b/SmeCascadeP.h
+@@ -32,8 +32,12 @@
+ #include <X11/Xaw/SmeP.h>

+ #endif

+ 

++#ifdef XAW3D1_5E

++#include <X11/Xaw3d/SmeBSBP.h>

++#else

+ #include "SmeBSBP.h"

+ #include "SmeCascade.h"

++#endif

+ 

+ /************************************************************

+  *

+--- a/w_menuentry.h
++++ b/w_menuentry.h
+@@ -30,7 +30,11 @@
+ #include <X11/Xaw/Sme.h>

+ #endif

+ 

++#ifdef XAW3D1_5E

++#include <X11/Xaw3d/SmeBSB.h>

++#else

+ #include "SmeBSB.h"

++#endif

+ 

+ /****************************************************************

+  *

+--- a/w_util.c
++++ b/w_util.c
+@@ -351,7 +351,9 @@
+  * (use -1 if no line desired)
+  */
+ 
++#ifndef XAW3D1_5E
+ #include "SmeCascade.h"
++#endif /* XAW3D1_5E */
+ 
+ #include "d_text.h"
+ #include "e_placelib.h"
diff --git a/media-gfx/xfig/files/xfig-3.2.5c-crash-on-exit.patch b/media-gfx/xfig/files/xfig-3.2.5c-crash-on-exit.patch
new file mode 100644
index 000000000000..80d20281ae93
--- /dev/null
+++ b/media-gfx/xfig/files/xfig-3.2.5c-crash-on-exit.patch
@@ -0,0 +1,19 @@
+commit 56f0caaae3cc3fdbf6eaa21fc419c951c53a156d
+Author: Peter Volkov <peter.volkov@gmail.com>
+Date:   Mon Jun 9 12:36:12 2014 +0400
+
+    Fix crash on exit (regression of xfig.3.2.5c)
+
+diff --git a/u_free.c b/u_free.c
+index 18d517a..4a5080f 100755
+--- a/u_free.c
++++ b/u_free.c
+@@ -270,8 +270,6 @@ void free_Fonts(void)
+       XUnloadFont(tool_d, nf->fid);
+       if (nf->fstruct != NULL)
+ 	  XFreeFont(tool_d, nf->fstruct); 
+-      if (nf->fset != NULL)
+-	  XFreeFontSet(tool_d, nf->fset); 
+       nf = nf->next;
+     } 
+   }
diff --git a/media-gfx/xfig/files/xfig-3.2.5c-darwin.patch b/media-gfx/xfig/files/xfig-3.2.5c-darwin.patch
new file mode 100644
index 000000000000..5d64c2a4deb5
--- /dev/null
+++ b/media-gfx/xfig/files/xfig-3.2.5c-darwin.patch
@@ -0,0 +1,26 @@
+diff --git a/fig.h b/fig.h
+index ca00aef..a3605b0 100644
+--- a/fig.h
++++ b/fig.h
+@@ -375,7 +375,7 @@ extern	double		drand48();
+ extern	long		random();

+ extern	void		srandom(unsigned int);

+ 

+-#elif !defined(__osf__) && !defined(__CYGWIN__) && !defined(linux) && !defined(__FreeBSD__) && !defined(__GLIBC__)

++#elif !defined(__osf__) && !defined(__CYGWIN__) && !defined(linux) && !defined(__FreeBSD__) && !defined(__DARWIN__) && !defined(__GLIBC__)

+ extern	void		srandom(int);

+ 

+ #endif

+diff --git a/w_keyboard.c b/w_keyboard.c
+index 427d60c..03a3f76 100644
+--- a/w_keyboard.c
++++ b/w_keyboard.c
+@@ -41,7 +41,7 @@
+ #define REG_NOERROR 0
+ #endif
+ 
+-#if defined(__FreeBSD__) && !defined(REG_NOERROR)
++#if (defined(__FreeBSD__) || defined(__DARWIN__)) && !defined(REG_NOERROR)
+ #define REG_NOERROR 0
+ #endif
+ 
diff --git a/media-gfx/xfig/files/xfig-3.2.5c-png16.patch b/media-gfx/xfig/files/xfig-3.2.5c-png16.patch
new file mode 100644
index 000000000000..f7a426295d3c
--- /dev/null
+++ b/media-gfx/xfig/files/xfig-3.2.5c-png16.patch
@@ -0,0 +1,18 @@
+Source: https://bugzilla.redhat.com/show_bug.cgi?id=1150330
+
+From: David Kaufmann <astra@ionic.at>
+Subject: Fix PNG reading
+
+--- a/f_readpng.c	2014-09-15 13:25:26.290813563 +0200
++++ a/f_readpng.c	2014-09-15 14:04:10.241297027 +0200
+@@ -90,8 +90,8 @@
+     png_get_IHDR(png_ptr, info_ptr, &w, &h, &bit_depth, &color_type,
+ 	&interlace_type, &compression_type, &filter_type);
+ 
+-    png_fixed_point gamma = 0.45;
+-    png_get_gAMA_fixed(png_ptr,info_ptr,&gamma);
++    double gamma = 0.45455;
++    png_get_gAMA(png_ptr,info_ptr,&gamma);
+     png_set_gamma(png_ptr, 2.2, gamma);
+ 
+     if (png_get_valid(png_ptr,info_ptr,PNG_INFO_bKGD)) {
diff --git a/media-gfx/xfig/files/xfig-3.2.5c-spelling.patch b/media-gfx/xfig/files/xfig-3.2.5c-spelling.patch
new file mode 100644
index 000000000000..4af77e0e9b06
--- /dev/null
+++ b/media-gfx/xfig/files/xfig-3.2.5c-spelling.patch
@@ -0,0 +1,17 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 31_spelling.dpatch by Roland Rosenfeld <roland@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix spelling errors in binary.
+
+@DPATCH@
+diff -urNad xfig~/f_load.c xfig/f_load.c
+--- xfig~/f_load.c
++++ xfig/f_load.c
+@@ -373,5 +373,5 @@
+ 	/* Format error; relevant error message is already delivered */
+ 	;
+     else
+-	file_msg("File \"%s\" is not accessable; %s.", file, strerror(err));
++	file_msg("File \"%s\" is not accessible; %s.", file, strerror(err));
+ }
diff --git a/media-gfx/xfig/files/xfig-3.2.6a-app-defaults.patch b/media-gfx/xfig/files/xfig-3.2.6a-app-defaults.patch
new file mode 100644
index 000000000000..7d11b571df39
--- /dev/null
+++ b/media-gfx/xfig/files/xfig-3.2.6a-app-defaults.patch
@@ -0,0 +1,14 @@
+diff -ruN xfig-3.2.6a.orig/app-defaults/Fig xfig-3.2.6a/app-defaults/Fig
+--- xfig-3.2.6a.orig/app-defaults/Fig	2017-01-10 00:27:39.000000000 +0100
++++ xfig-3.2.6a/app-defaults/Fig	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
+ 
diff --git a/media-gfx/xfig/files/xfig-3.2.6a-solaris.patch b/media-gfx/xfig/files/xfig-3.2.6a-solaris.patch
new file mode 100644
index 000000000000..5c6cd023fe6f
--- /dev/null
+++ b/media-gfx/xfig/files/xfig-3.2.6a-solaris.patch
@@ -0,0 +1,26 @@
+* workaround some missing things on Solaris
+
+--- a/src/u_quartic.c
++++ b/src/u_quartic.c
+@@ -21,4 +21,7 @@
+  #include <math.h>
+  
++ #ifndef M_PI
++ # define M_PI 3.14159265358979323846
++ #endif
+  
+  static int
+--- a/src/w_intersect.c
++++ b/src/w_intersect.c
+@@ -31,6 +31,11 @@
+ #define ISET_P1 (1 << 0)
+ #define ISET_P2 (1 << 1)
+ 
++#if defined (__SVR4) && defined (__sun)
++#undef _Complex_I
++#define _Complex_I (__extension__ 1.0fi)
++#endif
++
+ intersect_state_e intersect_state = INTERSECT_INITIAL;
+ 
+ static INLINE Boolean
diff --git a/media-gfx/xfig/files/xfig-3.2.6a-urwfonts.patch b/media-gfx/xfig/files/xfig-3.2.6a-urwfonts.patch
new file mode 100644
index 000000000000..89957590af6d
--- /dev/null
+++ b/media-gfx/xfig/files/xfig-3.2.6a-urwfonts.patch
@@ -0,0 +1,79 @@
+--- a/src/u_fonts.c	2002-09-09 13:36:58.000000000 -0400
++++ b/src/u_fonts.c	2006-10-11 00:29:07.000000000 -0400
+@@ -22,41 +22,41 @@
+ /* X11 font names */
+ 
+ struct _xfstruct x_fontinfo[NUM_FONTS] = {
+-    {"-*-times-medium-r-normal--", (struct xfont*) NULL},
+-    {"-*-times-medium-i-normal--", (struct xfont*) NULL},
+-    {"-*-times-bold-r-normal--", (struct xfont*) NULL},
+-    {"-*-times-bold-i-normal--", (struct xfont*) NULL},
+-    {"-*-avantgarde-book-r-normal--", (struct xfont*) NULL},
+-    {"-*-avantgarde-book-o-normal--", (struct xfont*) NULL},
+-    {"-*-avantgarde-demi-r-normal--", (struct xfont*) NULL},
+-    {"-*-avantgarde-demi-o-normal--", (struct xfont*) NULL},
+-    {"-*-bookman-light-r-normal--", (struct xfont*) NULL},
+-    {"-*-bookman-light-i-normal--", (struct xfont*) NULL},
+-    {"-*-bookman-demi-r-normal--", (struct xfont*) NULL},
+-    {"-*-bookman-demi-i-normal--", (struct xfont*) NULL},
+-    {"-*-courier-medium-r-normal--", (struct xfont*) NULL},
+-    {"-*-courier-medium-o-normal--", (struct xfont*) NULL},
+-    {"-*-courier-bold-r-normal--", (struct xfont*) NULL},
+-    {"-*-courier-bold-o-normal--", (struct xfont*) NULL},
+-    {"-*-helvetica-medium-r-normal--", (struct xfont*) NULL},
+-    {"-*-helvetica-medium-o-normal--", (struct xfont*) NULL},
+-    {"-*-helvetica-bold-r-normal--", (struct xfont*) NULL},
+-    {"-*-helvetica-bold-o-normal--", (struct xfont*) NULL},
+-    {"-*-helvetica-medium-r-narrow--", (struct xfont*) NULL},
+-    {"-*-helvetica-medium-o-narrow--", (struct xfont*) NULL},
+-    {"-*-helvetica-bold-r-narrow--", (struct xfont*) NULL},
+-    {"-*-helvetica-bold-o-narrow--", (struct xfont*) NULL},
+-    {"-*-new century schoolbook-medium-r-normal--", (struct xfont*) NULL},
+-    {"-*-new century schoolbook-medium-i-normal--", (struct xfont*) NULL},
+-    {"-*-new century schoolbook-bold-r-normal--", (struct xfont*) NULL},
+-    {"-*-new century schoolbook-bold-i-normal--", (struct xfont*) NULL},
+-    {"-*-palatino-medium-r-normal--", (struct xfont*) NULL},
+-    {"-*-palatino-medium-i-normal--", (struct xfont*) NULL},
+-    {"-*-palatino-bold-r-normal--", (struct xfont*) NULL},
+-    {"-*-palatino-bold-i-normal--", (struct xfont*) NULL},
+-    {"-*-symbol-medium-r-normal--", (struct xfont*) NULL},
+-    {"-*-itc zapf chancery-medium-i-normal--", (struct xfont*) NULL},
+-    {"-*-itc zapf dingbats-*-*-*--", (struct xfont*) NULL},
++    {"-urw-nimbus roman no9 l-medium-r-normal--", (struct xfont*) NULL},
++    {"-urw-nimbus roman no9 l-medium-i-normal--", (struct xfont*) NULL},
++    {"-urw-nimbus roman no9 l-bold-r-normal--", (struct xfont*) NULL},
++    {"-urw-nimbus roman no9 l-bold-i-normal--", (struct xfont*) NULL},
++    {"-urw-urw gothic l-medium-r-normal--", (struct xfont*) NULL},
++    {"-urw-urw gothic l-medium-o-normal--", (struct xfont*) NULL},
++    {"-urw-urw gothic l-semibold-r-normal--", (struct xfont*) NULL},
++    {"-urw-urw gothic l-semibold-o-normal--", (struct xfont*) NULL},
++    {"-urw-urw bookman l-medium-r-normal--", (struct xfont*) NULL},
++    {"-urw-urw bookman l-medium-i-normal--", (struct xfont*) NULL},
++    {"-urw-urw bookman l-bold-r-normal--", (struct xfont*) NULL},
++    {"-urw-urw bookman l-bold-i-normal--", (struct xfont*) NULL},
++    {"-urw-nimbus mono l-medium-r-normal--", (struct xfont*) NULL},
++    {"-urw-nimbus mono l-medium-o-normal--", (struct xfont*) NULL},
++    {"-urw-nimbus mono l-bold-r-normal--", (struct xfont*) NULL},
++    {"-urw-nimbus mono l-bold-o-normal--", (struct xfont*) NULL},
++    {"-urw-nimbus sans l-medium-r-normal--", (struct xfont*) NULL},
++    {"-urw-nimbus sans l-medium-i-normal--", (struct xfont*) NULL},
++    {"-urw-nimbus sans l-bold-r-normal--", (struct xfont*) NULL},
++    {"-urw-nimbus sans l-bold-i-normal--", (struct xfont*) NULL},
++    {"-urw-nimbus sans l-medium-r-condensed--", (struct xfont*) NULL},
++    {"-urw-nimbus sans l-medium-i-condensed--", (struct xfont*) NULL},
++    {"-urw-nimbus sans l-bold-r-condensed--", (struct xfont*) NULL},
++    {"-urw-nimbus sans l-bold-i-condensed--", (struct xfont*) NULL},
++    {"-urw-century schoolbook l-medium-r-normal--", (struct xfont*) NULL},
++    {"-urw-century schoolbook l-medium-i-normal--", (struct xfont*) NULL},
++    {"-urw-century schoolbook l-bold-r-normal--", (struct xfont*) NULL},
++    {"-urw-century schoolbook l-bold-i-normal--", (struct xfont*) NULL},
++    {"-urw-urw palladio l-medium-r-normal--", (struct xfont*) NULL},
++    {"-urw-urw palladio l-medium-i-normal--", (struct xfont*) NULL},
++    {"-urw-urw palladio l-bold-r-normal--", (struct xfont*) NULL},
++    {"-urw-urw palladio l-bold-i-normal--", (struct xfont*) NULL},
++    {"-urw-standard symbols l-medium-r-normal--", (struct xfont*) NULL},
++    {"-urw-urw chancery l-medium-i-normal--", (struct xfont*) NULL},
++    {"-urw-dingbats-medium-r-normal--", (struct xfont*) NULL},
+ };
+ 
+ /* Use the following font names for any font that doesn't exist in the table above.
diff --git a/media-gfx/xfig/metadata.xml b/media-gfx/xfig/metadata.xml
new file mode 100644
index 000000000000..327363b300a4
--- /dev/null
+++ b/media-gfx/xfig/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<upstream>
+		<remote-id type="sourceforge">mcj</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-gfx/xfig/xfig-3.2.5c-r1.ebuild b/media-gfx/xfig/xfig-3.2.5c-r1.ebuild
new file mode 100644
index 000000000000..bbe838eccc23
--- /dev/null
+++ b/media-gfx/xfig/xfig-3.2.5c-r1.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils multilib
+
+MY_P=${PN}.${PV}
+
+DESCRIPTION="A menu-driven tool to draw and manipulate objects interactively in an X window"
+HOMEPAGE="http://www.xfig.org"
+SRC_URI="mirror://sourceforge/mcj/${MY_P}.full.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="nls"
+
+RDEPEND="x11-libs/libXaw
+		x11-libs/libXp
+		x11-libs/libXaw3d
+		nls? ( x11-libs/libXaw3d[unicode] )
+		x11-libs/libXi
+		x11-libs/libXt
+		virtual/jpeg:0=
+		media-libs/libpng:0=
+		media-fonts/font-misc-misc
+		media-fonts/urw-fonts
+		>=media-gfx/transfig-3.2.5-r1
+		media-libs/netpbm"
+DEPEND="${RDEPEND}
+		x11-misc/imake
+		x11-proto/xproto
+		x11-proto/inputproto"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.2.5c-spelling.patch"
+	"${FILESDIR}/${PN}-3.2.5b-papersize_b1.patch"
+	"${FILESDIR}/${PN}-3.2.5b-pdfimport_mediabox.patch"
+	"${FILESDIR}/${PN}-3.2.5b-network_images.patch"
+	"${FILESDIR}/${PN}-3.2.5b-app-defaults.patch"
+	"${FILESDIR}/${PN}-3.2.5b-urwfonts.patch"
+	"${FILESDIR}/${PN}-3.2.5b-mkstemp.patch" #264575
+	"${FILESDIR}/${PN}-3.2.5c-darwin.patch"
+	"${FILESDIR}/${PN}-3.2.5b-solaris.patch"
+	"${FILESDIR}/${PN}-3.2.5c-XAW3D1_5E_notlocal.patch"
+	"${FILESDIR}/${PN}-3.2.5c-crash-on-exit.patch"
+	"${FILESDIR}/${PN}-3.2.5c-png16.patch"
+)
+
+sed_Imakefile() {
+	# see Imakefile for details
+	vars2subs=( BINDIR="${EPREFIX}"/usr/bin
+		PNGINC=-I"${EPREFIX}"/usr/include
+		JPEGLIBDIR="${EPREFIX}"/usr/$(get_libdir)
+		JPEGINC=-I"${EPREFIX}"/usr/include
+		XPMLIBDIR="${EPREFIX}"/usr/$(get_libdir)
+		XPMINC=-I"${EPREFIX}"/usr/include/X11
+		USEINLINE=-DUSE_INLINE
+		XFIGLIBDIR="${EPREFIX}"/usr/share/xfig
+		XFIGDOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+		MANDIR="${EPREFIX}/usr/share/man/man\$\(MANSUFFIX\)"
+		"CC=$(tc-getCC)" )
+
+	for variable in "${vars2subs[@]}" ; do
+		varname=${variable%%=*}
+		varval=${variable##*=}
+		sed -i \
+			-e "s:^\(XCOMM\)*[[:space:]]*${varname}[[:space:]]*=.*$:${varname} = ${varval}:" \
+			"$@" || die
+	done
+	if use nls; then
+		# XAW_INTERNATIONALIZATION fixes #405475 (comment 17) and #426780 by Markus Peloquin
+		sed -i \
+			-e "s:^\(XCOMM\)*[[:space:]]*\(#define I18N\).*$:\2:" \
+			-e "s:^\(XCOMM\)*[[:space:]]*\(XAW_INTERN = -DXAW_INTERNATIONALIZATION\).*$:\2:" \
+			"$@" || die
+	fi
+	sed -i -e "s:^\(XCOMM\)*[[:space:]]*\(#define XAW3D1_5E\).*$:\2:" "$@" || die
+}
+
+src_prepare() {
+	# Permissions are really crazy here
+	chmod -R go+rX . || die
+	find . -type f -exec chmod a-x '{}' \; || die
+
+	default
+
+	sed_Imakefile Imakefile
+	sed -e "s:/usr/lib/X11/xfig:${EPREFIX}/usr/share/doc/${PF}:" \
+		-i Doc/xfig.man || die
+}
+
+src_compile() {
+	local EXTCFLAGS=${CFLAGS}
+	xmkmf || die
+	[[ ${CHOST} == *-solaris* ]] && EXTCFLAGS="${EXTCFLAGS} -D_POSIX_SOURCE"
+	emake CC="$(tc-getCC)" LOCAL_LDFLAGS="${LDFLAGS}" CDEBUGFLAGS="${EXTCFLAGS}" \
+		USRLIBDIR="${EPREFIX}"/usr/$(get_libdir)
+}
+
+src_install() {
+	emake -j1 DESTDIR="${D}" install install.libs install.man
+
+	dodoc README FIGAPPS CHANGES LATEX.AND.XFIG
+
+	doicon xfig.png
+	make_desktop_entry xfig Xfig xfig
+}
diff --git a/media-gfx/xfig/xfig-3.2.5c.ebuild b/media-gfx/xfig/xfig-3.2.5c.ebuild
new file mode 100644
index 000000000000..98f535d1daf8
--- /dev/null
+++ b/media-gfx/xfig/xfig-3.2.5c.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils multilib
+
+MY_P=${PN}.${PV}
+
+DESCRIPTION="A menu-driven tool to draw and manipulate objects interactively in an X window"
+HOMEPAGE="http://www.xfig.org"
+SRC_URI="mirror://sourceforge/mcj/${MY_P}.full.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="nls"
+
+RDEPEND="x11-libs/libXaw
+		x11-libs/libXp
+		x11-libs/libXaw3d
+		nls? ( x11-libs/libXaw3d[unicode] )
+		x11-libs/libXi
+		x11-libs/libXt
+		virtual/jpeg
+		media-libs/libpng
+		media-fonts/font-misc-misc
+		media-fonts/urw-fonts
+		>=media-gfx/transfig-3.2.5-r1
+		media-libs/netpbm"
+DEPEND="${RDEPEND}
+		x11-misc/imake
+		x11-proto/xproto
+		x11-proto/inputproto"
+
+S=${WORKDIR}/${MY_P}
+
+sed_Imakefile() {
+	# see Imakefile for details
+	vars2subs=( BINDIR="${EPREFIX}"/usr/bin
+		PNGINC=-I"${EPREFIX}"/usr/include
+		JPEGLIBDIR="${EPREFIX}"/usr/$(get_libdir)
+		JPEGINC=-I"${EPREFIX}"/usr/include
+		XPMLIBDIR="${EPREFIX}"/usr/$(get_libdir)
+		XPMINC=-I"${EPREFIX}"/usr/include/X11
+		USEINLINE=-DUSE_INLINE
+		XFIGLIBDIR="${EPREFIX}"/usr/share/xfig
+		XFIGDOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+		MANDIR="${EPREFIX}/usr/share/man/man\$\(MANSUFFIX\)"
+		"CC=$(tc-getCC)" )
+
+	for variable in "${vars2subs[@]}" ; do
+		varname=${variable%%=*}
+		varval=${variable##*=}
+		sed -i \
+			-e "s:^\(XCOMM\)*[[:space:]]*${varname}[[:space:]]*=.*$:${varname} = ${varval}:" \
+			"$@" || die
+	done
+	if use nls; then
+		# XAW_INTERNATIONALIZATION fixes #405475 (comment 17) and #426780 by Markus Peloquin
+		sed -i \
+			-e "s:^\(XCOMM\)*[[:space:]]*\(#define I18N\).*$:\2:" \
+			-e "s:^\(XCOMM\)*[[:space:]]*\(XAW_INTERN = -DXAW_INTERNATIONALIZATION\).*$:\2:" \
+			"$@" || die
+	fi
+	sed -i -e "s:^\(XCOMM\)*[[:space:]]*\(#define XAW3D1_5E\).*$:\2:" "$@" || die
+}
+
+src_prepare() {
+	# Permissions are really crazy here
+	chmod -R go+rX . || die
+	find . -type f -exec chmod a-x '{}' \; || die
+	epatch "${FILESDIR}/${PN}-3.2.5c-spelling.patch"
+	epatch "${FILESDIR}/${PN}-3.2.5b-papersize_b1.patch"
+	epatch "${FILESDIR}/${PN}-3.2.5b-pdfimport_mediabox.patch"
+	epatch "${FILESDIR}/${PN}-3.2.5b-network_images.patch"
+	epatch "${FILESDIR}/${PN}-3.2.5b-app-defaults.patch"
+	epatch "${FILESDIR}/${PN}-3.2.5b-urwfonts.patch"
+	epatch "${FILESDIR}/${PN}-3.2.5b-mkstemp.patch" #264575
+	epatch "${FILESDIR}/${PN}-3.2.5c-darwin.patch"
+	epatch "${FILESDIR}/${PN}-3.2.5b-solaris.patch"
+	epatch "${FILESDIR}/${PN}-3.2.5c-XAW3D1_5E_notlocal.patch"
+	epatch "${FILESDIR}/${PN}-3.2.5c-crash-on-exit.patch"
+
+	sed_Imakefile Imakefile
+	sed -e "s:/usr/lib/X11/xfig:${EPREFIX}/usr/share/doc/${PF}:" \
+		-i Doc/xfig.man || die
+}
+
+src_compile() {
+	local EXTCFLAGS=${CFLAGS}
+	xmkmf || die
+	[[ ${CHOST} == *-solaris* ]] && EXTCFLAGS="${EXTCFLAGS} -D_POSIX_SOURCE"
+	emake CC="$(tc-getCC)" LOCAL_LDFLAGS="${LDFLAGS}" CDEBUGFLAGS="${EXTCFLAGS}" \
+		USRLIBDIR="${EPREFIX}"/usr/$(get_libdir)
+}
+
+src_install() {
+	emake -j1 DESTDIR="${D}" install install.libs install.man
+
+	dodoc README FIGAPPS CHANGES LATEX.AND.XFIG
+
+	doicon xfig.png
+	make_desktop_entry xfig Xfig xfig
+}
+
+pkg_postinst() {
+	einfo "Don't forget to update xserver's font path for media-fonts/urw-fonts."
+}
diff --git a/media-gfx/xfig/xfig-3.2.6a.ebuild b/media-gfx/xfig/xfig-3.2.6a.ebuild
new file mode 100644
index 000000000000..3ae5e4b55305
--- /dev/null
+++ b/media-gfx/xfig/xfig-3.2.6a.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A menu-driven tool to draw and manipulate objects interactively in an X window"
+HOMEPAGE="http://mcj.sourceforge.net/"
+SRC_URI="mirror://sourceforge/mcj/${PN}-full-${PV}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="jpeg nls postscript"
+
+RDEPEND="
+	x11-libs/libXaw
+	x11-libs/libXp
+	x11-libs/libXaw3d
+	x11-libs/libXi
+	x11-libs/libXt
+	media-libs/libpng:0=
+	media-fonts/font-misc-misc
+	media-fonts/urw-fonts
+	>=media-gfx/transfig-3.2.5-r1
+	media-libs/netpbm
+	jpeg? ( virtual/jpeg:0= )
+	nls? ( x11-libs/libXaw3d[unicode] )
+	postscript? ( app-text/ghostscript-gpl )
+"
+DEPEND="${RDEPEND}
+	x11-proto/xproto
+	x11-proto/inputproto
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.2.6a-urwfonts.patch"
+	"${FILESDIR}/${PN}-3.2.6a-solaris.patch"
+	"${FILESDIR}/${PN}-3.2.6a-app-defaults.patch"
+)
+
+src_configure() {
+	econf \
+		$(use_enable nls i18n) \
+		$(use_enable jpeg) \
+		$(use_with postscript gs) \
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}" # it expects docdir...
+}