Version bump, bug #286483, thank Sebastian Schubert for report. Fixes crash during zoom, bug #289396, thank Martin Mokrejš for report and a.peyser@umiami.edu for digging patch (which is fortunately upstream now). Fix documenation location, bug #295209, thank Diego E. 'Flameeyes' Pettenò for report. Added font-misc-misc into depend since xfig need it, bug #282410, thank Daniel Gulotta for report and and Thomas Kahle for digging fix. Upstream added pspdflatex export, thus bug #260951 is fixed, thank Per Öberg for report. Partially fixes CVE-2009-4227 reported in bug #297379 by Stefan Behte (another part should be handled by stack protection which is enabled in gcc-4.3 and higher). Fixes CVE-2009-1962 reported in bug #264575 Robert Buchholz. Added urw-fonts into dep as it's the same as gsfonts in Debian.

Package-Manager: portage-2.1.7.16/cvs/Linux x86_64

14 files changed, 814 insertions, 156 deletions

diff --git a/media-gfx/xfig/ChangeLog b/media-gfx/xfig/ChangeLog
index 6f61d70d9db6..18010344db73 100644
--- a/media-gfx/xfig/ChangeLog
+++ b/media-gfx/xfig/ChangeLog
@@ -1,6 +1,30 @@
 # ChangeLog for media-gfx/xfig
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xfig/ChangeLog,v 1.57 2008/12/02 22:59:18 ranger Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xfig/ChangeLog,v 1.58 2010/01/14 20:26:25 pva Exp $
+
+*xfig-3.2.5b (14 Jan 2010)
+
+  14 Jan 2010; Peter Volkov <pva@gentoo.org> -xfig-3.2.5-r1.ebuild,
+  -xfig-3.2.5-r2.ebuild, +xfig-3.2.5b.ebuild,
+  +files/xfig-3.2.5b-app-defaults.patch,
+  +files/xfig-3.2.5b-figparserstack.patch, +files/xfig-3.2.5b-mkstemp.patch,
+  +files/xfig-3.2.5b-network_images.patch,
+  +files/xfig-3.2.5b-papersize_b1.patch,
+  +files/xfig-3.2.5b-pdfimport_mediabox.patch,
+  +files/xfig-3.2.5b-spelling.patch, +files/xfig-3.2.5b-urwfonts.patch,
+  +files/xfig-3.2.5b-zoom-during-edit.patch:
+  Version bump, bug #286483, thank Sebastian Schubert for report. Fixes
+  crash during zoom, bug #289396, thank Martin Mokrejš for report and
+  a.peyser@umiami.edu for digging patch (which is fortunately upstream now).
+  Fix documenation location, bug #295209, thank Diego E. 'Flameeyes'
+  Pettenò for report. Added font-misc-misc into depend since xfig need it,
+  bug #282410, thank Daniel Gulotta for report and and Thomas Kahle for
+  digging fix. Upstream added pspdflatex export, thus bug #260951 is fixed,
+  thank Per Öberg for report. Partially fixes CVE-2009-4227 reported in bug
+  #297379 by Stefan Behte (another part should be handled by stack
+  protection which is enabled in gcc-4.3 and higher). Fixes CVE-2009-1962
+  reported in bug #264575 Robert Buchholz. Added urw-fonts into dep as it's
+  the same as gsfonts in Debian.
 
   02 Dec 2008; Brent Baude <ranger@gentoo.org> xfig-3.2.5-r3.ebuild:
   Marking xfig-3.2.5-r3 ppc64 for bug 244957
diff --git a/media-gfx/xfig/Manifest b/media-gfx/xfig/Manifest
index a857ec459c9c..b10ca56af971 100644
--- a/media-gfx/xfig/Manifest
+++ b/media-gfx/xfig/Manifest
@@ -1,6 +1,15 @@
+AUX xfig-3.2.5b-app-defaults.patch 601 RMD160 1f7b5998decfe729a266ac0e6a1219708cd9cc28 SHA1 ddb1afddb568aa8df602b55387fcf12080b67420 SHA256 e475edf793fb74ccf07c52d864c7d8e1f89fcc5c8204b69b60b1e7431d13311b
+AUX xfig-3.2.5b-figparserstack.patch 1787 RMD160 1885fdc4f9955a8658c8895f8df37beb7cc86d17 SHA1 55e9d2b4ee43965b9469015adbf213d8239f0064 SHA256 334ccd66978934defed3e060b324db1fd729fb2fc02e6606149a3ec28f12c71d
+AUX xfig-3.2.5b-mkstemp.patch 979 RMD160 1c49878335af15a0d40db55ac38112ddf9923f78 SHA1 8ac04a8ae496dceb988c8dff582a03036baa76d4 SHA256 0881185381976aaad5b62d54baf7df96981b41a54a74c24710971b175e9e520c
+AUX xfig-3.2.5b-network_images.patch 11918 RMD160 586d778f3de077bc5cc4c8a4ea174869078ab157 SHA1 331641aec1151f99995d4441204f77711aa140ee SHA256 08d983eea753008d3a2a9c7bebf0f9035e795ad3038dbbb05c2a512d86163695
+AUX xfig-3.2.5b-papersize_b1.patch 1127 RMD160 36b12cf4cd5cfc52dc6756befea2fd9fb9b4b97c SHA1 43e5f9cae86bbe2bad1ccff3aad05b85962002a3 SHA256 36bed2e9bfe46868d5b750a12b892a7e20dbf7189d9fbbe4b0066411946d6f01
+AUX xfig-3.2.5b-pdfimport_mediabox.patch 1245 RMD160 2ad6e3bf0092a0e3025d797cb494c4b7b91f0e5d SHA1 5e27cfc9522084632d70928a59128c10597125dd SHA256 40ecce3a59500c66879d4b5738ce80d6a6d105b1827b97a14c4e841cf596a5a9
+AUX xfig-3.2.5b-spelling.patch 898 RMD160 e34cf50c1cc0bf8c3395999366fb990713a46505 SHA1 8279fb927062f772a2dae1d2db23b65807d53d3f SHA256 792f6dd9dc785e2deadf8691bd667612953b8ba6b0b4f6177984226b7590ddb2
+AUX xfig-3.2.5b-urwfonts.patch 4921 RMD160 0f706460c4bbdfa3ad9c766423f72d74d1ca491c SHA1 4630587f030e05eb5a4a384fb593bb006dc630c5 SHA256 84d4d179088b5384c848acbf34e3b040e9648e838b080df8af54d73161a13f19
+AUX xfig-3.2.5b-zoom-during-edit.patch 691 RMD160 8f12f1b632a57c74ab6d05a159dbcfe30f434f9e SHA1 6881b529345b655d5cf8b8087c3f7ae2de36e082 SHA256 922c8dd8d3949caca71be28043889db6359eb7ecd4509ce339f216df11b41e5b
 DIST xfig.3.2.5.full.tar.gz 5794801 RMD160 0d5ada9e4b7f1dbd8dab8a09fd5946ec0211904c SHA1 ce09d1a74dbddf0bc6b20fe9c558db584fbfed17 SHA256 62e43d5ef483acdb74d0b6dcdf5f8a12e545201048db33ffb5d573d74ae72c9a
-EBUILD xfig-3.2.5-r1.ebuild 1824 RMD160 99cb3f85e7a11d91152519cf77bb9128c874303d SHA1 e123b855a20aefd3adc97aea55c2a7401a955142 SHA256 1213c789c16fdd8389e75d4367a0a80d260d1c287ac4e860481921fade6bfa5c
-EBUILD xfig-3.2.5-r2.ebuild 1870 RMD160 419884ee07dadf5afa21044f56652a941f60c80c SHA1 3e3368d9dcf510a2cf79457748bbf98f1d3507d7 SHA256 4995f09178341f7776663ac9e3141e93830f8aeb81bba66a8dc56c7529d43e27
+DIST xfig.3.2.5b.full.tar.gz 5821049 RMD160 aad4cfd808c116d34218e9890a898652e4f52ab6 SHA1 0730d7e6bc217c0de02682efb0078821512bb542 SHA256 5c01cf6d79f4de04e3d9efc9f3e4ea046e880d6610f210c8551bb0a713e985c2
 EBUILD xfig-3.2.5-r3.ebuild 1919 RMD160 6b179759e2b4ac10af5d04f58a2382f90de57a83 SHA1 ffa32bb4e87a5591c5bfb4ac6d378d704624e316 SHA256 97baeaf545af8c8762659f87c1a678d6b3bb5b3db061aab2f4d477d5ced956db
-MISC ChangeLog 7746 RMD160 aed81ded20d0b3e7f2546229369871de1d82c942 SHA1 997486de4d349d0a7f6d80caff379b6a4c996425 SHA256 f426f1e1fc4b818d7cddd874412f2246e83a1070d752a9a61dc265250275e9e8
+EBUILD xfig-3.2.5b.ebuild 2673 RMD160 74088f2a3b1d23b076a1c0a2410d1a0e639cf245 SHA1 131a75c2b84c8d14d7c6089e4b46189dcc06a87c SHA256 2f38f6f890ec7ba7af2c601fee7412d1c6548868a38b35bbf7a3b9736ad93a40
+MISC ChangeLog 9092 RMD160 70dd3abbfeb1b1036e05d033b192faf4a71aac8a SHA1 3a649be8ec2fca5f0ad22b1a1a2964710d565a43 SHA256 588b759706703515825b1741809bb9e6e7f312d3fccff98b59db38eeccd7cc01
 MISC metadata.xml 250 RMD160 f27bc8272125f15d03c2bfc87e961842bdb303ae SHA1 c4991bbfca89085d81f56ed53f8b0c827a35a4f1 SHA256 68999dde540491efec63a8f47366dbc2d5f2c9f2c1211709d92366a56b6cd27d
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..d773da51b180
--- /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
+--- Fig.ad
++++ 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-figparserstack.patch b/media-gfx/xfig/files/xfig-3.2.5b-figparserstack.patch
new file mode 100644
index 000000000000..7f4668214acc
--- /dev/null
+++ b/media-gfx/xfig/files/xfig-3.2.5b-figparserstack.patch
@@ -0,0 +1,61 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 30_figparserstack.dpatch by Hans de Goede <j.w.r.degoede@hhs.nl>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix Stack-based buffer overflow by loading malformed .FIG files
+## DP: https://bugzilla.redhat.com/show_bug.cgi?id=543905
+## DP: Closes: #559274
+
+@DPATCH@
+diff -urNad xfig~/f_readold.c xfig/f_readold.c
+--- xfig~/f_readold.c
++++ xfig/f_readold.c
+@@ -471,7 +471,7 @@
+     F_text	   *t;
+     int		    n;
+     int		    dum;
+-    char	    buf[128];
++    char	    buf[512];
+     PR_SIZE	    tx_dim;
+ 
+     if ((t = create_text()) == NULL)
+@@ -485,22 +485,34 @@
+     t->pen_style = -1;
+     t->angle = 0.0;
+     t->next = NULL;
++    if (!fgets(buf, sizeof(buf), fp)) {
++	file_msg("Incomplete text data");
++	free((char *) t);
++	return (NULL);
++    }
++
++    /* Note using strlen(buf) here will waste a few bytes, as the
++       various text attributes are counted into this length too. */
++    if ((t->cstring = new_string(strlen(buf))) == NULL)
++        return (NULL);
++
+     /* ascent and length will be recalculated later */
+-    n = fscanf(fp, " %d %d %d %d %d %d %d %[^\n]",
++    n = sscanf(buf, " %d %d %d %d %d %d %d %[^\n]",
+ 		&t->font, &dum, &dum, &t->ascent, &t->length,
+-		&t->base_x, &t->base_y, buf);
++		&t->base_x, &t->base_y, t->cstring);
+     if (n != 8) {
+ 	file_msg("Incomplete text data");
++	free(t->cstring);
+ 	free((char *) t);
+ 	return (NULL);
+     }
+-    if ((t->cstring = new_string(strlen(buf))) == NULL) {
++
++    if (!strlen(t->cstring)) {
++	free(t->cstring);
+ 	free((char *) t);
+ 	file_msg("Empty text string at line %d.", line_no);
+ 	return (NULL);
+     }
+-    /* put string in structure */
+-    strcpy(t->cstring, buf);
+ 
+     /* get the font struct */
+     t->zoom = zoomscale;
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..c672a27554da
--- /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'
+--- u_print.c	2010-01-14 19:50:08 +0000
++++ 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-spelling.patch b/media-gfx/xfig/files/xfig-3.2.5b-spelling.patch
new file mode 100644
index 000000000000..942276ca75e9
--- /dev/null
+++ b/media-gfx/xfig/files/xfig-3.2.5b-spelling.patch
@@ -0,0 +1,29 @@
+#! /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 -urNad xfig~/f_readgif.c xfig/f_readgif.c
+--- xfig~/f_readgif.c
++++ xfig/f_readgif.c
+@@ -137,7 +137,7 @@
+ 
+ 		if (c == '!') { 		/* Extension */
+ 			if (! ReadOK(file,&c,1))
+-				file_msg("GIF read error on extention function code");
++				file_msg("GIF read error on extension function code");
+ 			(void) DoGIFextension(file, c);
+ 			continue;
+ 		}
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..6a5c3dff949e
--- /dev/null
+++ b/media-gfx/xfig/files/xfig-3.2.5b-urwfonts.patch
@@ -0,0 +1,79 @@
+--- u_fonts.c	2002-09-09 13:36:58.000000000 -0400
++++ 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.5b-zoom-during-edit.patch b/media-gfx/xfig/files/xfig-3.2.5b-zoom-during-edit.patch
new file mode 100644
index 000000000000..11e5ceb932a8
--- /dev/null
+++ b/media-gfx/xfig/files/xfig-3.2.5b-zoom-during-edit.patch
@@ -0,0 +1,22 @@
+commit fc4381d7c3e8d7440a3e33430d24ebf217a99142
+Author: Vladislav Zavjalov <slazav@altlinux.org>
+Date:   Thu Oct 2 12:24:04 2008 +0400
+
+    fix calling null function (todo: problem with initialize_char_handler after resize?)
+
+Fixes crash. To reproduce create some object, zoom in so that it does not fit
+the screen, start another edit and press Ctrl+Z.
+
+diff --git a/xfig/u_redraw.c b/xfig/u_redraw.c
+index 146abfa..fd53a8e 100644
+--- a/xfig/u_redraw.c
++++ b/xfig/u_redraw.c
+@@ -434,7 +434,7 @@ redisplay_curobj()
+       }
+     } else {
+ 	/* editing an object, just refresh it as is */
+-	(*canvas_ref_proc)(cur_x, cur_y);
++	if (canvas_ref_proc) (*canvas_ref_proc)(cur_x, cur_y);
+     }
+ }
+ 
diff --git a/media-gfx/xfig/xfig-3.2.5-r1.ebuild b/media-gfx/xfig/xfig-3.2.5-r1.ebuild
deleted file mode 100644
index 8cd4d2ef638a..000000000000
--- a/media-gfx/xfig/xfig-3.2.5-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xfig/xfig-3.2.5-r1.ebuild,v 1.9 2007/07/22 07:28:32 pva Exp $
-
-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="http://www.xfig.org/software/xfig/3.2.5/${MY_P}.full.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND="x11-libs/libXaw
-		x11-libs/libXp
-		x11-libs/Xaw3d
-		media-libs/jpeg
-		media-libs/libpng
-		>=media-gfx/transfig-3.2.5
-		media-libs/netpbm"
-DEPEND="${RDEPEND}
-		x11-misc/imake
-		app-text/rman
-		x11-proto/xproto
-		x11-proto/inputproto
-		x11-libs/libXi"
-
-S="${WORKDIR}"/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# We do not have nescape. Let's use firefox instead...
-	sed -i "s+netscape+firefox+g" Fig.ad
-}
-
-sed_Imakefile() {
-	# see Imakefile for details
-	vars2subs="BINDIR=/usr/bin
-		PNGINC=-I/usr/include
-		JPEGLIBDIR=/usr/$(get_libdir)
-		JPEGINC=-I/usr/include
-		XPMLIBDIR=/usr/$(get_libdir)
-		XPMINC=-I/usr/include/X11
-		USEINLINE=-DUSE_INLINE
-		XFIGLIBDIR=/usr/$(get_libdir)/xfig
-		XFIGDOCDIR=/usr/share/doc/${P}
-		MANDIR=/usr/share/man/man\$\(MANSUFFIX\)
-		CC=$(tc-getCC)"
-
-	for variable in ${vars2subs} ; do
-		varname=${variable%%=*}
-		varval=${variable##*=}
-		sed -i "s:^\(XCOMM\)*[[:space:]]*${varname}[[:space:]]*=.*$:${varname} = ${varval}:" "$@"
-	done
-}
-
-src_compile() {
-	sed_Imakefile Imakefile
-
-	xmkmf || die
-	emake CC="$(tc-getCC)" LOCAL_LDFLAGS="${LDFLAGS}" CDEBUGFLAGS="${CFLAGS}" \
-	USRLIBDIR=/usr/$(get_libdir) || die
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install.all || die
-
-	insinto /usr/share/doc/${P}
-	doins README FIGAPPS CHANGES LATEX.AND.XFIG
-}
diff --git a/media-gfx/xfig/xfig-3.2.5-r2.ebuild b/media-gfx/xfig/xfig-3.2.5-r2.ebuild
deleted file mode 100644
index 7cb028800aaa..000000000000
--- a/media-gfx/xfig/xfig-3.2.5-r2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xfig/xfig-3.2.5-r2.ebuild,v 1.1 2008/05/11 12:09:54 pva Exp $
-
-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="http://www.xfig.org/software/xfig/3.2.5/${MY_P}.full.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND="x11-libs/libXaw
-		x11-libs/libXp
-		x11-libs/Xaw3d
-		media-libs/jpeg
-		media-libs/libpng
-		>=media-gfx/transfig-3.2.5-r1
-		media-libs/netpbm"
-DEPEND="${RDEPEND}
-		x11-misc/imake
-		app-text/rman
-		x11-proto/xproto
-		x11-proto/inputproto
-		x11-libs/libXi"
-
-S="${WORKDIR}"/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# We do not have nescape. Let's use firefox instead...
-	sed -i "s+netscape+firefox+g" Fig.ad
-	find "${S}" -type f -exec chmod -x \{\} \;
-}
-
-sed_Imakefile() {
-	# see Imakefile for details
-	vars2subs="BINDIR=/usr/bin
-		PNGINC=-I/usr/include
-		JPEGLIBDIR=/usr/$(get_libdir)
-		JPEGINC=-I/usr/include
-		XPMLIBDIR=/usr/$(get_libdir)
-		XPMINC=-I/usr/include/X11
-		USEINLINE=-DUSE_INLINE
-		XFIGLIBDIR=/usr/share/xfig
-		XFIGDOCDIR=/usr/share/doc/${P}
-		MANDIR=/usr/share/man/man\$\(MANSUFFIX\)
-		CC=$(tc-getCC)"
-
-	for variable in ${vars2subs} ; do
-		varname=${variable%%=*}
-		varval=${variable##*=}
-		sed -i "s:^\(XCOMM\)*[[:space:]]*${varname}[[:space:]]*=.*$:${varname} = ${varval}:" "$@"
-	done
-}
-
-src_compile() {
-	sed_Imakefile Imakefile
-
-	xmkmf || die
-	emake CC="$(tc-getCC)" LOCAL_LDFLAGS="${LDFLAGS}" CDEBUGFLAGS="${CFLAGS}" \
-	USRLIBDIR=/usr/$(get_libdir) || die
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install.all || die
-
-	insinto /usr/share/doc/${P}
-	doins README FIGAPPS CHANGES LATEX.AND.XFIG
-}
diff --git a/media-gfx/xfig/xfig-3.2.5b.ebuild b/media-gfx/xfig/xfig-3.2.5b.ebuild
new file mode 100644
index 000000000000..ceeba80f8767
--- /dev/null
+++ b/media-gfx/xfig/xfig-3.2.5b.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xfig/xfig-3.2.5b.ebuild,v 1.1 2010/01/14 20:26:25 pva Exp $
+
+EAPI="2"
+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 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/libXaw
+		x11-libs/libXp
+		x11-libs/Xaw3d
+		x11-libs/libXi
+		media-libs/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=/usr/bin
+		PNGINC=-I/usr/include
+		JPEGLIBDIR="/usr/$(get_libdir)"
+		JPEGINC=-I/usr/include
+		XPMLIBDIR="/usr/$(get_libdir)"
+		XPMINC=-I/usr/include/X11
+		"USEINLINE = -DUSE_INLINE"
+		XFIGLIBDIR=/usr/share/xfig
+		XFIGDOCDIR="/usr/share/doc/${PF}"
+		MANDIR="/usr/share/man/man\$\(MANSUFFIX\)"
+		"CC=$(tc-getCC)" )
+
+	for variable in "${vars2subs[@]}" ; do
+		varname=${variable%%=*}
+		varval=${variable##*=}
+		sed -i "s:^\(XCOMM\)*[[:space:]]*${varname}[[:space:]]*=.*$:${varname} = ${varval}:" "$@"
+	done
+	sed -i "s:^\(XCOMM\)*[[:space:]]*\(#define I18N\).*$:\2:" "$@"
+	if has_version '>=x11-libs/Xaw3d-1.5e'; then
+		einfo "x11-libs/Xaw3d 1.5e and abover installed"
+		sed -i "s:^\(XCOMM\)*[[:space:]]*\(#define XAW3D1_5E\).*$:\2:" "$@"
+	fi
+}
+
+src_prepare() {
+	# Permissions are really crazy here
+	chmod -R go+rX .
+	find . -type f -exec chmod a-x '{}' \;
+	epatch "${FILESDIR}/${P}-figparserstack.patch" #297379
+	epatch "${FILESDIR}/${P}-spelling.patch"
+	epatch "${FILESDIR}/${P}-papersize_b1.patch"
+	epatch "${FILESDIR}/${P}-pdfimport_mediabox.patch"
+	epatch "${FILESDIR}/${P}-network_images.patch"
+	epatch "${FILESDIR}/${P}-app-defaults.patch"
+	epatch "${FILESDIR}/${P}-zoom-during-edit.patch"
+	epatch "${FILESDIR}/${P}-urwfonts.patch"
+	epatch "${FILESDIR}/${P}-mkstemp.patch" #264575
+	sed_Imakefile Imakefile
+	sed -e "s:/usr/lib/X11/xfig:/usr/share/doc/${PF}:" \
+		-i Doc/xfig.man -i Doc/xfig_man.html || die
+}
+
+src_compile() {
+	xmkmf || die
+	emake CC="$(tc-getCC)" LOCAL_LDFLAGS="${LDFLAGS}" CDEBUGFLAGS="${CFLAGS}" \
+		USRLIBDIR=/usr/$(get_libdir) || die
+}
+
+src_install() {
+	emake -j1 DESTDIR="${D}" install.all || die
+
+	insinto /usr/share/doc/${PF}
+	doins README FIGAPPS CHANGES LATEX.AND.XFIG
+
+	doicon xfig.png
+	make_desktop_entry xfig Xfig xfig
+}