[gentoo-commits] repo/gentoo:master commit in: app-text/mpage/files/, app-text/mpage/

[Michał Górny]

commit:     66c934dd2f5753d0d3b1fe61764f0925a24a7060
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 15 12:31:25 2017 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Oct 15 12:36:03 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66c934dd

app-text/mpage: Move patches to a dist tarball

Closes: https://bugs.gentoo.org/620550

 app-text/mpage/Manifest                            |   1 +
 app-text/mpage/files/01_previous_changes.patch     | 740 ---------------------
 .../mpage/files/10_bts354935_fix_fontdefs.patch    |  39 --
 .../mpage/files/20_bts416573_manpage_fixes.patch   | 628 -----------------
 .../mpage/files/30_bts443280_libdir_manpage.patch  |  22 -
 app-text/mpage/mpage-2.5.6-r1.ebuild               |   7 +-
 6 files changed, 5 insertions(+), 1432 deletions(-)

diff --git a/app-text/mpage/Manifest b/app-text/mpage/Manifest
index fd4f30a93ba..b9fbff03c55 100644
--- a/app-text/mpage/Manifest
+++ b/app-text/mpage/Manifest
@@ -1 +1,2 @@
+DIST mpage-2.5.6-gentoo-patchset.tar.bz2 12853 SHA256 87757a0a0b385b053b4c5a29e907bbe6687e347d5fcf920bc168d3b2ddf46422 SHA512 2bfbe4689e02fb76af58a6db3415227df38e71b45fcc3d563a12f505fab8ea78de0415c9ac6d7c9b873f23a9f65e1c8f708f902965ab10e18b2a217b67cc5f0d WHIRLPOOL f921a780c0abe5f38a7a3773de6167c23e0359a50a5da458a0c826491b47c6990ee3866369b82a59b293ad292ba0306def05618985f376751f34924cacd93813
 DIST mpage-2.5.6.tgz 86748 SHA256 4fe66dfc27f7c4bfbca60ef617f968aa2e6ee877e8921aa968c16a03aa4edc04 SHA512 79a51d0fa08848b22f758e8bc3f57680d33492d261a0061c6cce002c3cb5f129a78221d2af1749c79d4e46385136d9996294499531e60e8fc501f9fd61f8077d WHIRLPOOL 9d7abfd66ba0faf53a18f9dc59d1566d22364f9a7b0593a149cae1d2e781f4c104dfcd984da63081b9276811f9832829d8feab1ad41040070ca8c7378e96f7cf

diff --git a/app-text/mpage/files/01_previous_changes.patch b/app-text/mpage/files/01_previous_changes.patch
deleted file mode 100644
index 9b3682547e8..00000000000
--- a/app-text/mpage/files/01_previous_changes.patch
+++ /dev/null
@@ -1,740 +0,0 @@
-Index: mpage-2.5.6/file.c
-===================================================================
---- mpage-2.5.6.orig/file.c	2008-08-11 23:14:20.500638502 +0200
-+++ mpage-2.5.6/file.c	2008-08-11 23:28:25.560795737 +0200
-@@ -363,7 +363,7 @@
-         Debug(DB_STDIN, "%%iswanted: opt_first[i]: %d\n", opt_first[i]);
-         Debug(DB_STDIN, "%%iswanted: opt_alt[i]: %d\n", opt_alt[i]);
-         Debug(DB_STDIN, "%%iswanted: opt_last[i]: %d\n", opt_last[i]);
--        if ((sn >= opt_first[i] && (opt_alt[i] <= 1 || (sn - opt_first[i]) % opt_alt[i] == 0) ) &&
-+        if ((sn >= opt_first[i]) && ((sn - opt_first[i]) % opt_alt[i] == 0) &&
-             (sn <= opt_last[i])) {
-             Debug(DB_STDIN, "%%iswanted: wanted page %d\n", sn);
-             ps_outpages++;
-Index: mpage-2.5.6/mpage.1.in
-===================================================================
---- mpage-2.5.6.orig/mpage.1.in	2008-08-11 23:17:10.154306512 +0200
-+++ mpage-2.5.6/mpage.1.in	2008-08-11 23:27:23.605265090 +0200
-@@ -1,4 +1,4 @@
--.TH MPAGE Local 2008/01/14
-+.TH MPAGE 1 2008/01/14
- 
- .SH NAME
- mpage \- print multiple pages per sheet on PostScript printer
-@@ -417,17 +417,33 @@
- .TP
- .B -t
- Toggle printing on both sides of the paper.
--This will toggle duplex mode of the printer.
-++This option has 3 states: nop, yes, no, which mean:
-+.BR  NOP :
-+ dont do anything on PostScript, so printer default will be used;
-+.BR  YES :
-+ force printer to do duplex;
-+.BR  NO  :
-+force printer not to do it.
-+If there is no -t, then the duplex is NOP. If you put some -t on
-+the command line, the state toggles as "yes,no,yes,no...".
-+So, if your printer is set to print, by default, in duplex mode,
-+you will use "-t -t" on command line to force it to print in non-duplex mode.
- Use this option only if your printer is capable of printing in duplex mode. 
- .RI ( default
--off).
-+NOP).
- 
- .TP
- .B -T
--Toggle tumble of every second pages when printing in duplex mode.
--Use this option only if your printer is capable of printing in duplex mode
--and together with
--.BR -t . 
-+Toggle tumble of every second pages.
-+This option has 3 states: nop, yes, no (with behaviour similar to -t).
-+So, if your printer is set to print, by default, in duplex mode,
-+with tumble on,
-+you will use "-T -T" on command line to print in nontumble mode.
-+Use this option only if your printer is capable of printing in duplex mode.
-+With this version of mpage,
-+you may use this option even if you do not use -t.
-+.RI ( default
-+NOP.)
- 
- .TP
- .B -u
-@@ -546,7 +562,7 @@
- environment variables.
- 
- .SH FILES
--/usr/tmp/mpageXXXXXX
-+/tmp/mpageXXXXXX
- .br
- PREFIX/share/mpage
- 
-Index: mpage-2.5.6/mpage.c
-===================================================================
---- mpage-2.5.6.orig/mpage.c	2008-08-11 23:31:51.044505584 +0200
-+++ mpage-2.5.6/mpage.c	2008-08-11 23:39:12.205645922 +0200
-@@ -44,9 +44,21 @@
-     struct sheet *thesheet;
-     char outcommand[LINESIZE]; /* the command which is the output filter */
- 
-+    char * paper;
-+
-     current_locale = setlocale(LC_ALL,"");
- 
--   
-+#ifdef LIBPAPER
-+    paperinit();
-+    paper = systempapername();
-+    if (!paper)
-+    {
-+      fprintf(stderr,"systempapername() returned NULL! exiting\n");
-+      exit(1);
-+    }
-+    strncpy(opt_page,paper,31);
-+#endif
-+
- #ifdef __EMX__
-     /*
-      * wildcard expansion from emx package (used by OS/2)
-@@ -235,10 +247,10 @@
-     fprintf(outfd, "/mp_stm usertime def\n");
-     fprintf(outfd, "/mp_pgc statusdict begin pagecount end def\n");
-     fprintf(outfd, "statusdict begin /jobname (%s) def end\n", name);
--    if (opt_duplex) {
-+    if (opt_duplex && opt_duplex != 4 ) {
-        fprintf(outfd, "statusdict /setduplexmode known");
-        fprintf(outfd, " { statusdict begin true setduplexmode end } if\n");
--       if (opt_tumble) {
-+       if (opt_tumble && opt_tumble != 4 ) {
-            fprintf(outfd, "statusdict /settumble known ");
-            fprintf(outfd, "{ statusdict begin true settumble end } if\n"); 
-        }
-Index: mpage-2.5.6/mpage.h
-===================================================================
---- mpage-2.5.6.orig/mpage.h	2008-08-11 23:39:40.279245746 +0200
-+++ mpage-2.5.6/mpage.h	2008-08-11 23:45:02.565611800 +0200
-@@ -31,6 +31,10 @@
- #include <limits.h>
- #include <string.h>
- 
-+#ifdef LIBPAPER
-+#include <paper.h>
-+#endif
-+
- #define	VERSION		"2.5.6 Januari 2008"
- 
- #define	TRUE		1
-@@ -125,10 +129,11 @@
- /*
-  * set default page size
-  */
-+#ifndef LIBPAPER
- #if !defined(PAGE_DEF)
- # define PAGE_DEF	"A4"
- #endif
--
-+#endif
- /*
-  * define print spooler types
-  */
-@@ -221,9 +226,6 @@
- extern int ps_height;	/* number of points in the Y direction (11 inches) */
- extern char * media;	/* name of output page media */
- 
--
--extern struct page_desc paper[];
--
- /* array of sheets where pages are ordered for coli ??? */
- extern struct sheet coli[];
- 
-@@ -280,7 +282,11 @@
- extern int opt_width;		/* number of columns to fit on reduced page */
- extern int opt_mp_header;	/* let mpage create a header */
- extern int opt_sheetheader;     /* let mpage create sheetheaders */
-+#ifndef LIBPAPER
- extern char * opt_page;		/* sheets size: a4 or us letter */
-+#else
-+extern char opt_page[];                /* sheets size: a4 or us letter */
-+#endif
- extern int opt_fold;		/* fold long lines */
- extern int opt_outline;		/* print a nice outline around pages */
- extern int opt_verbose;		/* print a count of pages sent to printer */
-Index: mpage-2.5.6/page.c
-===================================================================
---- mpage-2.5.6.orig/page.c	2008-08-11 23:48:28.317336922 +0200
-+++ mpage-2.5.6/page.c	2008-08-11 23:55:46.090284181 +0200
-@@ -21,6 +21,8 @@
- #include "mpage.h"
- #include "string.h"
- 
-+extern struct page_desc paper[];
-+
- #define PAPERSIZE_FILE  "/etc/papersize"
- void
- check_papersize()
-@@ -59,12 +61,24 @@
- void
- set_page()
- {
-+#ifndef LIBPAPER
-     int i = select_pagetype(opt_page);
-  
-     media = paper[i].media;
-     ps_width = paper[i].width;
-     ps_height = paper[i].height;
--
-+#else
-+    struct paper * ps;
-+    ps=paperinfo(opt_page);
-+    if (!ps) {
-+      fprintf(stderr,"%s: unknown page format: %s\n",
-+              MPAGE, opt_page);
-+      exit(1);
-+    }
-+    media = papername(ps);
-+    ps_width = paperpswidth(ps);
-+    ps_height = paperpsheight(ps);
-+#endif
-     return;
- 
- } /* set_page */
-@@ -76,11 +90,21 @@
- {
-     int i = 0;
- 
-+#ifndef LIBPAPER
-     while (paper[i].media && strcasecmp(pt, paper[i].media))
-         i++;
-     if (paper[i].media)
-         opt_page = paper[i].media;
-     else
-+#else
-+    struct paper * ps;
-+
-+    strncpy(opt_page,pt,31);
-+    opt_page[31]='\0';
-+
-+    ps=paperinfo(opt_page);
-+    if (!ps)
-+#endif
-         fprintf(stderr, "%s: ignoring unknown paper type: %s\n",
-                                 MPAGE, pt);
-     return i;
-Index: mpage-2.5.6/FAQ
-===================================================================
---- mpage-2.5.6.orig/FAQ	2008-08-11 23:54:21.317453255 +0200
-+++ mpage-2.5.6/FAQ	2008-08-11 23:55:38.833870662 +0200
-@@ -27,3 +27,14 @@
- 
-     This information is buried in the dvips manual somewhere, but is not easy
-     to find!
-+
-+Using mpage with magicfilter
-+============================
-+Andreas Jellinghaus <aj@××××××.org> writes:
-+
-+I'm using mpage with lprng and magicfilter. My local magic filter setup
-+is /usr/sbin/ljet4l-filter, and this line passes all ASCII files to mpage :
-+default                 pipe    /usr/bin/mpage -A -2
-+
-+I don't want to waste paper with ASCII texts. MPage also works for
-+postscript files.
-Index: mpage-2.5.6/README
-===================================================================
---- mpage-2.5.6.orig/README	2008-08-11 23:56:29.352749569 +0200
-+++ mpage-2.5.6/README	2008-08-11 23:07:25.849008850 +0200
-@@ -1,28 +1,3 @@
--
--COPYRIGHT:
--
--Mpage and all the files distributed with mpage are covered by copyright:
--
-- Copyright (c) 1994-2004 Marcel J.E. Mol, The Netherlands
-- Copyright (c) 1988 Mark P. Hahn, Herndon, Virginia
--  
--     Permission is granted to anyone to make or distribute verbatim
--     copies of this document as received, in any medium, provided
--     that this copyright notice is preserved, and that the
--     distributor grants the recipient permission for further
--     redistribution as permitted by this notice.
--
--   marcel@××××.nl
--   MESA Consulting  B.V.
--   Nootdorp
--   The Netherlands
--   Phone: [phone]
--   Mobile:[phone]
--   Fax:   [phone]
--   email: info@××××.nl		http://www.mesa.nl   ftp://ftp.mesa.nl
--   
--
--=================================================================
- DESCRIPTION:
- 
- Mpage is a program to reduce and print multiple pages of text per
-@@ -30,54 +5,21 @@
- It also has limited functionality to do the same directly with postscript
- files.
- 
--The following are the files you should have for mpage.
--
--     README                 Notes and descriptions, this file
--     README.OS2             OS/2 port description
--     Copyright              Copyright notice
--     CHANGES                Change history
--     Makefile               The Makefile
--     TODO                   Wish List for changes
--     FAQ                    Useful tips and hints
--     NEWS                   Global changes, User visible changes
--     Mpage.lsm              LSM file for mpage
--     args.c                 Command line and options processing
--     encoding.h             Definition of internal default character encoding
--     encoding.h.CP850       Popular for renaming to encoding.h
--     file.c                 Generic file handling
--     glob.c                 Global variable setup
--     mpage.h                Definitions
--     mpage.c                Main Control
--     page.c                 Page layout routines
--     post.c                 PostScript file processing
--     sample.c               Prints sample page layout pages 
--     text.c                 Text file processing
--     util.c                 Misc utility functions
--     mpage.1                Manual page
-+The following are some of the files you should receive in the Debian
-+package:
- 
-      All.chars              Test file containing all ASCII characters
-      Encodings              Directory with character encoding library files
-      Characters             List of Postscript character encoding names
-      Encoding.format        Description on how to create character encoding
-                             library files
--     gencodes.c             Util program to build All.chars file
--     Test                   Directory with test pages
--
--     OS2                    Directory with simulated lpr for OS/2
-      Contrib                Directory with contributions by others
-      Contrib/mfix           Fix to mpage that makes it work with ArborText
- 
--
--INSTRUCTIONS:
--
--All you should need to do is run make. Actually it is probably better
--to have a look at the Makefile and to check settings like for example PAGESIZE
--to set the default page size (e.g A4 or Letter ...).
--This will create the programs mpage and msample.  Mpage is
--the program to print n-up pages.  Msample prints a sample outline.  I
--used it for debugging the placement of the layout.  It is also handy
--for other layout purposes.  It accepts all the arguments that mpage
--does, but does not print files.
-+Msample prints a sample outline.  I used it for debugging the
-+placement of the layout.  It is also handy for other layout purposes.
-+It accepts all the arguments that mpage does, but does not print
-+files.
- 
- As a quick sample try:
- 
-@@ -87,9 +29,16 @@
- or
- 	"groff  -man mpage.1 | mpage -2"
- 
-+USING ENCODINGS:
- 
--The manual page, mpage.1, formats with UCB or ATT manual macros.
-+Example supplied by Vassilis Virvilis.  To print Greek characters, use
-+the Greek fonts from http://www.csd.uch.gr/~lourakis/genscript/.  Both
-+enscript and a2ps embed the fonts in the generated postscript
-+document. mpage utilizes the printer fonts. Therefore you will have to
-+actually install the font for ghostscript.  To print the Greek
-+characters, use the following command:
- 
-+   mpage -FCourier-ISOLatinGreek -CISO-8859.7 test.txt  > test.ps
- 
- 
- USING MPAGE:
-Index: mpage-2.5.6/args.c
-===================================================================
---- mpage-2.5.6.orig/args.c	2008-08-11 23:57:11.963177801 +0200
-+++ mpage-2.5.6/args.c	2008-08-11 23:07:25.817007026 +0200
-@@ -91,7 +91,11 @@
-                                      UPDOWN : LEFTRIGHT;
-                         break;
-                 case 'A':    /* A4 sized, european paper */
-+#ifndef LIBPAPER
-                         opt_page = "A4"; /* deprecated */
-+#else
-+	       		strcpy(opt_page,"a4");
-+#endif
-                         break;
-                 case 'b':     /* base paper type */
-                         OPTARG();
-@@ -386,17 +390,25 @@
-                 case 'S':
-                         opt_square = 0;
-                         break;
-+// opt_duplex and opt_tumble have 3 possible values:
-+// 4 : do not do anything
-+// 0 : force printer to do it
-+// !0 : force printer not to do it
-                 case 't':
--                        opt_duplex = 1 - opt_duplex;
-+                        opt_duplex = ! opt_duplex;
-                         break;
-                 case 'T':
--                        opt_tumble = 1 - opt_tumble;
-+                        opt_tumble = ! opt_tumble;
-                         break;
-                 case 'u':
-                         check_utf8 = 1 - check_utf8;
-                         break;
-                 case 'U':    /* Letter sized, US paper */
-+#ifndef LIBPAPER
-                         opt_page = "Letter"; /* deprecated */
-+#else
-+	       		strcpy(opt_page,"letter");
-+#endif
-                         break;
-                 case 'v':    /* verbose (print page count) */
-                         opt_verbose = 1 - opt_verbose;
-Index: mpage-2.5.6/glob.c
-===================================================================
---- mpage-2.5.6.orig/glob.c	2008-08-11 23:58:11.934595375 +0200
-+++ mpage-2.5.6/glob.c	2008-08-11 23:07:25.829007710 +0200
-@@ -327,7 +327,11 @@
- int opt_lines         = 0;		/* lines to fit on reduced page */
- int opt_killtrail     = 1;		/* Quit reading input on %%TRailer */
- int opt_width         = 0;	        /* columns to fit on reduced page */
-+#ifndef LIBPAPER
- char * opt_page       = PAGE_DEF;       /* default paper size */
-+#else
-+char opt_page [32]; /* default paper size */
-+#endif
- /* boolean's: set default to 0 or 1 */
- int opt_pr            = 0;		/* if true use pr(1) to format output */
- int opt_mp_header     = 0;              /* let mpage create headers */
-@@ -342,8 +346,12 @@
- int opt_last[MAXJARG];         	  /* print as many as supplied per -j */
- int opt_alt[MAXJARG];             /* by default print all sheets, odd+even per -j*/
- int opt_file          = 1;        /* should each file appera on a new sheet */
--int opt_duplex        = DEFAULT_DUPLEX;  /* duplex mode flag */
--int opt_tumble        = 0;        /* tumble overy second pages */
-+// opt_duplex and opt_tumble have 3 possible values:
-+// 4 , aka NOP : dont do anything on PostScript,so printer default will be used
-+// 0 , aka yes : force printer to do it
-+// !0, aka no  : force printer not to do it
-+int opt_duplex        = 4;        /* duplex mode flag */
-+int opt_tumble        = 4;        /* tumble overy second pages */
- int opt_textbox       = 0;        /* don't normally draw box around text */
- int opt_input         = IN_AUTO;  /* select input file format */
- int opt_encoding      = DEFAULT_ENCODING; /* use default encoding or not */
-@@ -420,10 +428,15 @@
-  -j Print specified sheets: first[-last][%%interval]\n\
-     -j 1-10 does first 10 sheets, -j 1%%2 prints odd ones, -j 2%%2 even ones.\n\
-  -J Set the start of the sheet page count\n\
-- -t Toggle printing both sides of the paper (Duplex mode, %s)\n\
-- -T Toggle tumble of every second pages when printing in duplex mode (off)\n",
--    fontname, opt_tabstop, PAGE_DEF, printprog, printarg,
--    opt_duplex ? "on" : "off"
-++ -t Toggle printing both sides of the paper (NOP,on,off,on...)\n\
-++ -T Toggle tumble of every second pages  (NOP,on,off,on...)\n",
-+    fontname, opt_tabstop,
-+#ifndef LIBPAPER
-+    PAGE_DEF,
-+#else
-+    opt_page,
-+#endif
-+    PAGE_DEF, printprog, printarg
-     );
-     fprintf(stderr, "\n(c) 1993-2005 Marcel Mol, marcel@××××.nl (MESA Consulting)\n");
- 
-Index: mpage-2.5.6/Contrib/psprint
-===================================================================
---- mpage-2.5.6.orig/Contrib/psprint	2008-08-12 00:01:13.312931539 +0200
-+++ mpage-2.5.6/Contrib/psprint	2008-08-11 23:07:25.825007484 +0200
-@@ -1,10 +1,9 @@
--#!/bin/ksh -
-+#!/bin/sh -
- 
- STDIN_TMP_FILE=/tmp/psprint.$$
- 
- GS=/usr/local/bin/gs
- GSLIB=/usr/local/lib/ghostscript/3.53
--RM=/bin/rm
- #
- # define print command (SYSV or BSD ish)
- # PRINT="lp -or -s"
-@@ -20,7 +19,7 @@
-     ${GSLIB}/quit.ps
- done
- 
--${RM} -f "${STDIN_TMP_FILE}"
-+rm -f "${STDIN_TMP_FILE}"
- 
- exit 0
- 
-Index: mpage-2.5.6/Encodings/ISO-8859.7
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ mpage-2.5.6/Encodings/ISO-8859.7	2008-08-11 23:07:25.853009079 +0200
-@@ -0,0 +1,231 @@
-+%%%% ISO-8859.7 character encoding (I think...)
-+27 255  % first and last encoding
-+027 /florin
-+028 /dagger
-+029 /daggerdbl
-+030 /perthousand
-+031 /trademark
-+032 /space
-+033 /exclam
-+034 /quotedbl
-+035 /numbersign
-+036 /dollar
-+037 /percent
-+038 /ampersand
-+039 /quoteright
-+040 /parenleft
-+041 /parenright
-+042 /asterisk
-+043 /plus
-+044 /comma
-+045 /hyphen
-+046 /period
-+047 /slash
-+048 /zero
-+049 /one
-+050 /two
-+051 /three
-+052 /four
-+053 /five
-+054 /six
-+055 /seven
-+056 /eight
-+057 /nine
-+058 /colon
-+059 /semicolon
-+060 /less
-+061 /equal
-+062 /greater
-+063 /question
-+064 /at
-+065 /A
-+066 /B
-+067 /C
-+068 /D
-+069 /E
-+070 /F
-+071 /G
-+072 /H
-+073 /I
-+074 /J
-+075 /K
-+076 /L
-+077 /M
-+078 /N
-+079 /O
-+080 /P
-+081 /Q
-+082 /R
-+083 /S
-+084 /T
-+085 /U
-+086 /V
-+087 /W
-+088 /X
-+089 /Y
-+090 /Z
-+091 /bracketleft
-+092 /backslash
-+093 /bracketright
-+094 /asciicircum
-+095 /underscore
-+096 /quoteleft
-+097 /a
-+098 /b
-+099 /c
-+100 /d
-+101 /e
-+102 /f
-+103 /g
-+104 /h
-+105 /i
-+106 /j
-+107 /k
-+108 /l
-+109 /m
-+110 /n
-+111 /o
-+112 /p
-+113 /q
-+114 /r
-+115 /s
-+116 /t
-+117 /u
-+118 /v
-+119 /w
-+120 /x
-+121 /y
-+122 /z
-+123 /braceleft
-+124 /bar
-+125 /braceright
-+126 /asciitilde
-+127 /.notdef
-+128 /.notdef
-+129 /.notdef
-+130 /.notdef
-+131 /.notdef
-+132 /.notdef
-+133 /.notdef
-+134 /.notdef
-+135 /.notdef
-+136 /.notdef
-+137 /.notdef
-+138 /.notdef
-+139 /.notdef
-+140 /.notdef
-+141 /.notdef
-+142 /.notdef
-+143 /.notdef
-+144 /.notdef
-+145 /.notdef
-+146 /.notdef
-+147 /.notdef
-+148 /.notdef
-+149 /.notdef
-+150 /.notdef
-+151 /.notdef
-+152 /.notdef
-+153 /.notdef
-+154 /.notdef
-+155 /.notdef      	
-+156 /.notdef
-+157 /.notdef
-+158 /.notdef
-+159 /.notdef      	
-+160 /space
-+161 /quoteleft
-+162 /quoteright
-+163 /sterling     	
-+164 /.notdef
-+165 /.notdef
-+166 /brokenbar
-+167 /section      	
-+168 /dieresis
-+169 /copyright
-+170 /.notdef
-+171 /guillemotleft	
-+172 /logicalnot
-+173 /hyphen
-+174 /.notdef
-+175 /endash       	
-+176 /degree
-+177 /plusminus
-+178 /twosuperior
-+179 /threesuperior	
-+180 /acute
-+181 /dieresisacute
-+182 /afii9936
-+183 /periodcentered	
-+184 /afii9937
-+185 /afii9938
-+186 /afii9939
-+187 /guillemotright	
-+188 /afii9940
-+189 /onehalf
-+190 /afii9941
-+191 /afii9942     	
-+192 /afii9977
-+193 /afii9793
-+194 /afii9794
-+195 /afii9796     	
-+196 /afii9797
-+197 /afii9798
-+198 /afii9801
-+199 /afii9802     	
-+200 /afii9803
-+201 /afii9804
-+202 /afii9805
-+203 /afii9806     	
-+204 /afii9807
-+205 /afii9808
-+206 /afii9809
-+207 /afii9810     	
-+208 /afii9811
-+209 /afii9813
-+210 /.notdef
-+211 /afii9814     	
-+212 /afii9816
-+213 /afii9817
-+214 /afii9818
-+215 /afii9819     	
-+216 /afii9820
-+217 /afii9821
-+218 /afii9943
-+219 /afii9944     	
-+220 /afii9968
-+221 /afii9969
-+222 /afii9970
-+223 /afii9971     	
-+224 /afii9978
-+225 /afii9825
-+226 /afii9826
-+227 /afii9828
-+228 /afii9829
-+229 /afii9830
-+230 /afii9833
-+231 /afii9834
-+232 /afii9835
-+233 /afii9836
-+234 /afii9837
-+235 /afii9838
-+236 /afii9839
-+237 /afii9840
-+238 /afii9841
-+239 /afii9842
-+240 /afii9843
-+241 /afii9845
-+242 /afii9847
-+243 /afii9846
-+244 /afii9848
-+245 /afii9849
-+246 /afii9850
-+247 /afii9851
-+248 /afii9852
-+249 /afii9853
-+250 /afii9975
-+251 /afii9976
-+252 /afii9972
-+253 /afii9973
-+254 /afii9974
-+255 /.notdef
-Index: mpage-2.5.6/Contrib/mfix/mfix.c
-===================================================================
---- mpage-2.5.6.orig/Contrib/mfix/mfix.c	2008-08-12 00:02:40.797917022 +0200
-+++ mpage-2.5.6/Contrib/mfix/mfix.c	2008-08-11 23:07:25.829007710 +0200
-@@ -1,7 +1,7 @@
- #include <stdio.h>
- 
--FILE *in=stdin,*out=stdout;
--char line[200]; line2[200];
-+FILE *in,*out;
-+char line[200], line2[200];
- 
- int
- strcp(st1,st2)
-@@ -15,6 +15,8 @@
- main()
- {
-   int i;
-+  in = stdin;
-+  out = stdout;
-   for(i=0; i<10; i=1)
-   {
-     if (fgets(line,200,in)==NULL) { close(in); close(out); exit(1); }
-@@ -41,4 +43,4 @@
-     fprintf(out,"%s",line);
-   }
- }
--    
-\ No newline at end of file
-+    

diff --git a/app-text/mpage/files/10_bts354935_fix_fontdefs.patch b/app-text/mpage/files/10_bts354935_fix_fontdefs.patch
deleted file mode 100644
index 3749ec5984c..00000000000
--- a/app-text/mpage/files/10_bts354935_fix_fontdefs.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Index: mpage-2.5.6/mpage.c
-===================================================================
---- mpage-2.5.6.orig/mpage.c	2008-08-12 00:26:43.344123046 +0200
-+++ mpage-2.5.6/mpage.c	2008-08-12 00:29:55.663082680 +0200
-@@ -345,25 +345,25 @@
-       if (!strncmp (current_locale, "ja_JP", 5)){
- #ifdef KANJI
- #ifdef GOTHIC
--	fprintf(outfd, "/kanj /GothicBBB-Medium-H findfont %d scalefont def\n", fsize - 1);
--	fprintf(outfd, "/han /GothicBBB-Medium.Hankaku findfont %d scalefont def\n", fsize - 1);
-+        fprintf(outfd, "/kanj { /GothicBBB-Medium-H findfont %d scalefont } def\n", fsize - 1);
-+        fprintf(outfd, "/han { /GothicBBB-Medium.Hankaku findfont %d scalefont } def\n", fsize - 1);
- #else
--	fprintf(outfd, "/kanj /Ryumin-Light-H findfont %d scalefont def\n", fsize - 1);
--	fprintf(outfd, "/han /Ryumin-Light.Hankaku findfont %d scalefont def\n", fsize - 1);
-+        fprintf(outfd, "/kanj { /Ryumin-Light-H findfont %d scalefont } def\n", fsize - 1);
-+        fprintf(outfd, "/han { /Ryumin-Light.Hankaku findfont %d scalefont } def\n", fsize - 1);
- #endif
- #endif
- #ifdef GOTHIC
--	fprintf(outfd, "/unijis /GothicBBB-Medium-UniJIS-UTF8-H findfont %d scalefont def\n", fsize - 1);
-+        fprintf(outfd, "/unijis { /GothicBBB-Medium-UniJIS-UTF8-H findfont %d scalefont } def\n", fsize - 1);
- #else
--	fprintf(outfd, "/unijis /Ryumin-Light-UniJIS-UTF8-H findfont %d scalefont def\n", fsize - 1);
-+        fprintf(outfd, "/unijis { /Ryumin-Light-UniJIS-UTF8-H findfont %d scalefont } def\n", fsize - 1);
- #endif
-       }
-       else if (!strncmp (current_locale, "ko_KR", 5))
--	fprintf(outfd, "/uniks /Baekmuk-Batang-UniKS-UTF8-H findfont %d scalefont def\n", fsize - 1);
-+        fprintf(outfd, "/uniks { /Baekmuk-Batang-UniKS-UTF8-H findfont %d scalefont } def\n", fsize - 1);
-       else if (!strncmp (current_locale, "zh_CN", 5))
--	fprintf(outfd, "/unigb /BousungEG-Light-GB-UniGB-UTF8-H findfont %d scalefont def\n", fsize - 1);
-+        fprintf(outfd, "/unigb { /BousungEG-Light-GB-UniGB-UTF8-H findfont %d scalefont } def\n", fsize - 1);
-       else if (!strncmp (current_locale, "zh_TW", 5))
--	fprintf(outfd, "/unicns /ShanHeiSun-Light-UniCNS-UTF8-H findfont %d scalefont def\n", fsize - 1);
-+        fprintf(outfd, "/unicns { /ShanHeiSun-Light-UniCNS-UTF8-H findfont %d scalefont } def\n", fsize - 1);
-     }
- 
- # ifdef DEBUG

diff --git a/app-text/mpage/files/20_bts416573_manpage_fixes.patch b/app-text/mpage/files/20_bts416573_manpage_fixes.patch
deleted file mode 100644
index 3a4df84e4ee..00000000000
--- a/app-text/mpage/files/20_bts416573_manpage_fixes.patch
+++ /dev/null
@@ -1,628 +0,0 @@
-Index: mpage-2.5.6/mpage.1.in
-===================================================================
---- mpage-2.5.6.orig/mpage.1.in	2008-08-12 19:12:42.274087056 +0200
-+++ mpage-2.5.6/mpage.1.in	2008-08-12 19:14:15.003371396 +0200
-@@ -54,7 +54,7 @@
- 
- 
- .SH DESCRIPTION
--.I mpage
-+.B mpage
- reads plain text files or PostScript documents and prints them on a
- PostScript printer with the text reduced in size so that several
- pages appear on one sheet of paper.
-@@ -63,14 +63,18 @@
- 
- .PP
- The following options are recognized (note that arguments to options may be
--separated from the option by spaces, except for 
-+separated from the option by spaces, except for
- .BR -B ,
- .BR -m ,
- .BR -M ,
- .B -p
- and
- .BR -P ):
--Also when mpage encounters -- as option it will stop parsing arguments
-+Also when
-+.B mpage
-+encounters
-+.B --
-+as option it will stop parsing arguments
- and the remaining arguments are interpreted as filenames.
- 
- .TP
-@@ -84,7 +88,7 @@
- .TP
- .B -4
- Print 4 normal pages per sheet
--.IR (default) .
-+.RI ( default ).
- 
- .TP
- .B -8
-@@ -95,25 +99,29 @@
- Toggle layout of the pages on the sheet so that successively numbered
- pages run down the sheet, as opposed to left to right.
- .RI ( default
--updown) .
-+updown).
- 
- .TP
- .B -A
--This option is deprecated, see \fB-b\fP.
--Prepare output for A4 sized paper.
--For default see 'mpage -x'.
-+This option is deprecated, use
-+.B -bA4
-+instead.
- 
- .TP
--.BI -b papertype
--Prepare output for selected paper type.
-+.BI -b papersize
-+Prepare output for the selected paper type.
- .I Papersize
--can be \fIA3\fP for European A3,
--\fIA4\fP for European A4,
--\fILetter\fP for US Letter or \fILegal\fP for Legal
--sized paper.
--For default see 'mpage -x'.
--To see the list of currently available types, just give the 'mpage -bl'
--or 'mpage -b?' command (Note: mpage exits after finding such option use.)
-+can be \fBA3\fP for European A3,
-+\fBA4\fP for European A4,
-+\fBLetter\fP for US Letter, or \fBLegal\fP for Legal
-+sized paper.  For available types, see option \fB-bl\fP.
-+For the default, see 'mpage \-x'.  This default is taken from the
-+system; see \fBpapersize\fP(5).  If it isn't found, mpage exits
-+with an error.
-+
-+.TP
-+.BR -bl ,\  -b?
-+List the currently available paper types, then exit.
- 
- .TP
- .BR -B [\fI<num>\fR[\fBlrtb\fR]*]
-@@ -121,19 +129,19 @@
- Specify text box margins and line thickness.
- The default is 0 columns (lines) for both left and right (top and bottom)
- margins and 0 line thickness.
--Specifying 
--.B -B 
--solely toggles printing of the box. 
-+Specifying
-+.B -B
-+solely toggles printing of the box.
- .IR l ,
- .IR r ,
- .I t
- or
- .I b
--set the left, right, top or bottom margin respectively to 
-+set the left, right, top or bottom margin respectively to
- .I <num>
- columns (lines).
--Not specifying any of the sides, will set the line thickness when 
--.I <num> 
-+Not specifying any of the sides, will set the line thickness when
-+.I <num>
- is given.
- For example
- .BI -B 1
-@@ -142,7 +150,7 @@
- 
- .TP
- .B -c
--Toggle concatenation off pages from different files on single sheets
-+Toggle concatenation of pages from different files on single sheets
- .RI ( default
- off).
- 
-@@ -166,27 +174,26 @@
- 
- .TP
- .BI -D dateformat
--Set the date format as in 
-+Set the date format as in
- .IR strftime (3)
- to be used in date/time representations (e.g. in headers).
--(Note: to be useful you probably need the \fB-H\fP option.)
-+(Note: to make this useful you probably need the \fB-H\fP option.)
- 
- .TP
- .B -e
--Print 2 normal pages per sheet in duplex mode. Every first 
--and fourth page or on one side and every second and third
-+Print 2 normal pages per sheet in duplex mode: every first
-+and fourth page on one side and every second and third
- on the other side. This is more or less a combination of
--the \fR-O\fP and \fR-E\fP option but then in one pass.
-+the \fR-O\fP and \fR-E\fP options but in one pass.
- 
- .TP
- .B -E
--Print 2 normal pages per sheet. However, this option will print
--every second and third page of every set of four pages.
--This option will ignore
-+Print 2 normal pages per sheet, namely: print only the second and
-+third page of every set of four pages. See also \fB-O\fP. These
-+options override
- .B -a
- and
- .BR -l .
--See also the \fR-O\fP option.
- Using these options double sided prints can be created without
- a duplex printer.
- 
-@@ -194,11 +201,11 @@
- .B -f
- Toggles folding lines longer than page width
- .RI ( default
--off) .
-+off).
- 
- .TP
- .BI -F fontname
--Specify font. 
-+Specify font.
- .RI ( default
- Courier). Check your printer for supported fonts. Note: this has
- almost nothing to do with the fonts used for your X-windows/KDE/Gnome
-@@ -206,13 +213,13 @@
- 
- .TP
- .BI -h header
--This is used only when the 
-+This is used only when the
- .B -p
- or
- .B -H
- switch is used and is passed as the "\fB-h\fI\ header\fR" option to
--.BR pr ( 1 )
--or as the header for 
-+.BR pr (1)
-+or as the header for
- .BR -H .
- 
- .TP
-@@ -220,26 +227,26 @@
- Create header line for each logical page separated from page text by a
- horizontal line. Unless
- .B -h
--is given, the header consist of last file modification time,
-+is given, the header consists of last file modification time,
- filename and page number, all in bold and slightly larger font.
- This option only applies to non-postscript files.
- 
- .TP
- .BI -I indent
--Indent text by 
-+Indent text by
- .I indent
- characters.
- 
- .TP
--.BI -j first\fR[\fI-last\fR][\fI%interval\fR]
-+.BI -j first\fR[ - last\fR][ % interval\fR]
- Print just the selected sheets, specified by a number, starting at 1.
--Here 
-+Here
- .I last
- defaults to the end of data, \fIinterval\fP to 1.
--Several \fB-j\fR options can be given (upto MAXJARGS, default 100)
-+Several \fB-j\fR options can be given (up to MAXJARGS, default 100)
- to create a complex selection of pages.
--Thus \fB-j\fI1\-10\fR selects the first 10 sheets, while
--\fB-j\fI 1%2\fR prints just the odd-numbered sheets and \fB-j\fI 2%2\fR
-+Thus \fB-j1\-10\fR selects the first 10 sheets, while
-+\fB-j\ 1%2\fR prints just the odd-numbered sheets and \fB-j\ 2%2\fR
- prints just the even ones.
- .sp
- You can do double-sided printing, in two passes, as follows.
-@@ -249,7 +256,7 @@
- Print the odd-numbered sheets with
- .IP
- .ti +5
--mpage ... -j 1%2 ...
-+mpage ... \-j 1%2 ...
- .IP
- Note the number of pages it reports.  (Only half this many will really
- be printed).  When printing finishes, if mpage reported an
-@@ -262,7 +269,7 @@
- Now print the even-numbered sheets in reverse order with
- .IP
- .ti +5
--mpage ... -r -j 2%2 ...
-+mpage ... \-r \-j 2%2 ...
- .IP
- hoping no one else reaches the printer before you do.
- 
-@@ -274,70 +281,71 @@
- 
- .TP
- .B -k
--When mpage finds a %%TRailer or %%PSTrailer in the postscript input file
-+When mpage finds a %%Trailer or %%PSTrailer in the postscript input file
- it normally assumes this is the end of the postscript file and stops reading
- the input file. But when the PS file includes EPS files, %%Trailers might
--be anywhere. Using this option ignores the %%TRailer and %%PSTRailer lines.
-+be anywhere. Using this option ignores the %%Trailer and %%PSTrailer lines.
-+
- .TP
- .B -l
--Toggle printing landscape or portrait mode.
--Landscape pages are 55 lines long by 132 characters wide by default. 
--Portrait pages are 66 lines long by 80 characters wide by default.
-+Toggle printing landscape or portrait mode
- .RI ( default
--portrait.) 
-+portrait).
-+Landscape pages are 55 lines long by 132 characters wide by default.
-+Portrait pages are 66 lines long by 80 characters wide by default.
- 
- .TP
- .BI -L lines
- Adjust the page reduction parameters so that
- .I lines
- lines will fit in the space of one page.
--This overrides the default values normally supplied.  (See 
-+This overrides the default values normally supplied.  (See
- .BR -l .)
--If used in conjunction with 
-+If used in conjunction with
- .B -p
- then this value is passed to the
- .BR pr (1)
- as well.
- As a side effect this changes the font size as well (as will the \fB-W\fR
--option.) So while there is an option to change font family, there is no 
-+option.) So while there is an option to change font family, there is no
- explicit option to change font size!
- 
- .TP
- .BR -m [\fI<num>\fR[\fBlrtb\fR]*]
- Specify sheet margin. The default margin is 20 points.
--Only specifying 
--.B -m 
--sets left margin to 40 points. 
-+Only specifying
-+.B -m
-+sets left margin to 40 points.
- .IR l ,
- .IR r ,
- .I t
- or
- .I b
--set left, right, top or bottom margin respectively to 
-+set left, right, top or bottom margin respectively to
- .I <num>
- points.
--Not specifying any of the sides will set all sides when 
--.I <num> 
-+Not specifying any of the sides will set all sides when
-+.I <num>
- is given.
- .I <num>
- defaults to 40 points. For example
- .BI -m 10
- sets all margins to 10 points.
- .BI -m l50tb
--sets left margin to default 40 and top and bottom margin to 50 points.
-+sets left margin to default 40 and top and bottom margins to 50 points.
- .BI -m 50l25bt30r
--set bottom and top margin to 25, left margin to 50 and
-+sets bottom and top margin to 25, left margin to 50 and
- right margin to 30 points.
- Margins can have negative numbers.
- 
- .TP
- .BR -M [\fI<num>\fR[\fBlrtb\fR]*]
--Specify logical page margins. For syntax, see 
-+Specify logical page margins. For syntax, see
- .B -m
- option.
--Defaults are 4 for 
--.B -M 
--solely, and 8 for 
-+Defaults are 4 for
-+.B -M
-+solely, and 8 for
- .IR <num> .
- Margins can be negative.
- This way large white borders
-@@ -351,20 +359,18 @@
- 
- .TP
- .B -O
--Print 2 normal pages per sheet.
--However, this option will print every first and fourth page of every
--set of four pages.
--This option will ignore 
-+Print 2 normal pages per sheet, namely: print only the first and
-+fourth page of every set of four pages. See also \fB-E\fP. These
-+options override
- .B -a
- and
- .BR -l .
--See also the \fR-E\fP option.
- Using these options double sided prints can be created without
- a duplex printer.
- 
- .TP
- .BR -p [\fIprprog\fR]
--Pipe input through 
-+Pipe input through
- .I prprog
- command (including specified options) before printing
- (assumes the input is a text file).
-@@ -373,14 +379,16 @@
- 
- .TP
- .BR -P [\fIprinter\fR]
--Specify the printer to which the PostScript output will be sent
--(e.g.lpr -P\fIprinter\fP). Using
-+Specify the printer to which the PostScript output is sent
-+(e.g. lpr \-P\fIprinter\fP). Using
- .B -P
--with no printer specified will send the PostScript to the default printer
--queue (e.g. lpr). Using -P- will return output to stdout, useful in
--combination with MPAGE environment variable. Without
-+with no printer specified sends the PostScript to the default printer
-+queue (e.g. lpr). Using \fB-P-\fP returns output to stdout, useful in
-+combination with the
-+.B MPAGE
-+environment variable. Without
- .B -P
--output will be send to standard output.
-+output is sent to standard output.
- 
- .TP
- .B -r
-@@ -392,58 +400,65 @@
- .B -R
- Switch to left to right mode, starting first page on left bottom corner.
- This might be useful for landscape postscript files.
--(Note: using 
-+(Note: using
- .B -l
- after
- .B -R
- undoes
- .BR -R ,
--and switches to normal landscape mode.
-+and switches to normal landscape mode.)
- 
- .TP
- .BI -s tabstop
- Set tabstop width (\fIdefault\fP 8 characters).
--Should by >= 2.
-+Should be >= 2.
- 
- .TP
- .B -S
- Accept non-square page reduction.
- By default, pages are shrunk equally in X and Y, even if this wastes some
- space on the sheet.
--With \fB\-S\fP, 
--reduced pages are larger but slightly distorted. (only used when printing
-+With \fB\-S\fP,
-+reduced pages are larger but slightly distorted. (Only used when printing
- postscript files.)
- 
- .TP
- .B -t
- Toggle printing on both sides of the paper.
--+This option has 3 states: nop, yes, no, which mean:
--.BR  NOP :
-- dont do anything on PostScript, so printer default will be used;
--.BR  YES :
-- force printer to do duplex;
--.BR  NO  :
-+This option has 3 states: nop, yes, no, which mean:
-+.RS
-+.TP
-+.BR NOP :
-+don't do anything in PostScript, use the printer default;
-+.TP
-+.BR YES :
-+force printer to do duplex;
-+.TP
-+.BR NO :
- force printer not to do it.
--If there is no -t, then the duplex is NOP. If you put some -t on
-+.HP 0
-+If there is no \fB\-t\fP, then the duplex is NOP. If you put some \-t on
- the command line, the state toggles as "yes,no,yes,no...".
- So, if your printer is set to print, by default, in duplex mode,
--you will use "-t -t" on command line to force it to print in non-duplex mode.
--Use this option only if your printer is capable of printing in duplex mode. 
-+you will use "\-t \-t" on the command line to force it to print in
-+non-duplex mode. Use this option only if your printer is capable of
-+printing in duplex mode.
- .RI ( default
- NOP).
-+.RE
- 
- .TP
- .B -T
- Toggle tumble of every second pages.
--This option has 3 states: nop, yes, no (with behaviour similar to -t).
-+This option has 3 states: nop, yes, no (with behaviour similar to \-t).
- So, if your printer is set to print, by default, in duplex mode,
- with tumble on,
--you will use "-T -T" on command line to print in nontumble mode.
-+you will use "\-T \-T" on command line to print in nontumble mode.
- Use this option only if your printer is capable of printing in duplex mode.
- With this version of mpage,
--you may use this option even if you do not use -t.
-+you may use this option even if you do not use \-t.
- .RI ( default
--NOP.)
-+NOP).
- 
- .TP
- .B -u
-@@ -451,15 +466,15 @@
- 
- .TP
- .B -U
--This option is deprecated, see \fB-b\fP.
--Prepare output for US Letter sized paper.
--For default see 'mpage -x'.
-+This option is deprecated, use
-+.B -bLetter
-+instead.
- 
- .TP
- .B -v
- Toggle printing a count of the number of sheets produced for printing
- .RI ( default
--off.)
-+off).
- 
- .TP
- .B -V
-@@ -467,27 +482,27 @@
- 
- .TP
- .BI -W width
--Adjust the page reduction parameters so that a line with
-+Adjust the page reduction parameters so that a line
- .I width
- characters long will fit in the space of one page.
--This overrides the default values normally supplied.  (See 
-+This overrides the default values normally supplied.  (See
- .BR -l .)
- If used in conjunction with
- .B -p
--then this value is passed to the s
-+then this value is passed to the
- .BR pr (1)
- program as well.
- See also the \fB-L\fP\ option on font sizes.
- 
- .TP
- .B -x
--Force usage display, which also shows current defaults.
-+Print usage information (including current defaults), then exit.
- 
- .TP
--.B -X [header]
-+.BR -X [\fIheader\fR]
- Print header on the left and the page number on the right
- of each physical page (sheet).
--If no header is given, the default is the current filename (note 
-+If no header is given, the default is the current filename (note
- influence of
- .BR -c ),
- the filename of the first file on the page is used.
-@@ -495,12 +510,12 @@
- .TP
- .BI -z printcommand
- Specify command to use to send output to.
--Default is 
--.B lpr 
--(1) for BSD style spooler,
--.B lp
--(1) for SYSV style spooler.
--You can specify command line options, but note 
-+Default is
-+.BR lpr (1)
-+for BSD style spooler,
-+.BR lp (1)
-+for SYSV style spooler.
-+You can specify command line options, but note
- .BR -Z .
- For example \fB-zlp\fR for system V Unix.
- 
-@@ -508,7 +523,7 @@
- .BI -Z printprog_queuename_arg
- Specify what option to use for the "\fB-z\fI\ printcommand\fR" to specify
- a printqueue.
--For example \fB-zlp -Z-d\fR for system V Unix.
-+For example \fB\-zlp \-Z\-d\fR for system V Unix.
- Default is
- .B -P
- for BSD style spooler,
-@@ -518,10 +533,10 @@
- .PP
- 
- .SH ENVIRONMENT
--.I mpage
-+.B mpage
- examines the
- .B PRINTER
--(or 
-+(or
- .B LPDEST
- for SYSV style spooler)
- environment variable to override its default printer.
-@@ -529,18 +544,20 @@
- .PP
- The
- .B MPAGE_LIB
--environment variable can be used to control where the character 
-+environment variable can be used to control where the character
- encoding files (\fB-C\fR) can be found.
- 
- .PP
--.I mpage
-+.B mpage
- also examines the
- .B MPAGE
- environment variable for default option settings.
- Any option or combination of options can be specified in the
- .B MPAGE
- environment variable.
--For example, if MPAGE is set to the string:
-+For example, if
-+.B MPAGE
-+is set to the string:
- .IP
- .B -2oPqms -L60
- .PP
-@@ -550,14 +567,14 @@
- .B "qms"
- (overriding the
- .B PRINTER\fR/\fBLPDEST
--environment variable, if it exists.)
-+environment variable, if it exists).
- In the environment variable, white space is used as an option delimiter,
- and no quoting is recognized.
- 
- .PP
- Any command line options will override both the
- .B PRINTER
--and 
-+and
- .B MPAGE
- environment variables.
- 
-@@ -571,7 +588,7 @@
- Suffers under the burden of far too many switches.
- (But
- .B you
--wanted the choices!) 
-+wanted the choices!)
- .PP
- NULL characters in a postscript input file will cause mpage to crash!
- .PP
-@@ -580,7 +597,7 @@
- Mpage is year 2000 compliant, as long as the underlying operating system is!!!
- 
- .SH VERSION
--Version 2.5.6, Released Januari 2008.
-+Version 2.5.6, Released January 2008.
- .br
- Location:
- .IP
-@@ -588,6 +605,6 @@
- .br
- ftp://ftp.mesa.nl/pub/mpage
- .SH AUTHORS
--Marcel Mol <marcel@××××.nl> (current maintainer). 
-+Marcel Mol <marcel@××××.nl> (current maintainer).
- .PP
--Mark P. Hahn (Original author) 
-+Mark P. Hahn (Original author)

diff --git a/app-text/mpage/files/30_bts443280_libdir_manpage.patch b/app-text/mpage/files/30_bts443280_libdir_manpage.patch
deleted file mode 100644
index 9e2e630500e..00000000000
--- a/app-text/mpage/files/30_bts443280_libdir_manpage.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: mpage-2.5.6/mpage.1.in
-===================================================================
---- mpage-2.5.6.orig/mpage.1.in	2008-08-12 19:40:49.390230323 +0200
-+++ mpage-2.5.6/mpage.1.in	2008-08-12 19:41:08.143299000 +0200
-@@ -157,7 +157,7 @@
- .TP
- .BR -C [\fIencodingfile\fR]
- Specify the character encoding file.
--The file should be in the mpage library directory (\fIPREFIX/share/mpage\fR).
-+The file should be in the mpage library directory (\fIPREFIX/lib/mpage\fR).
- .I Mpage
- has an internal default encoding based on Latin-1 or IBM codepage 850.
- Depending on compile time option this encoding definition is on or not.
-@@ -581,7 +581,7 @@
- .SH FILES
- /tmp/mpageXXXXXX
- .br
--PREFIX/share/mpage
-+PREFIX/lib/mpage
- 
- .SH BUGS
- .PP

diff --git a/app-text/mpage/mpage-2.5.6-r1.ebuild b/app-text/mpage/mpage-2.5.6-r1.ebuild
index 612cf81ab70..0b6a0146109 100644
--- a/app-text/mpage/mpage-2.5.6-r1.ebuild
+++ b/app-text/mpage/mpage-2.5.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -6,7 +6,8 @@ inherit eutils toolchain-funcs
 
 DESCRIPTION="Many to one page printing utility"
 HOMEPAGE="http://www.mesa.nl/"
-SRC_URI="http://www.mesa.nl/pub/${PN}/${P}.tgz"
+SRC_URI="http://www.mesa.nl/pub/${PN}/${P}.tgz
+	https://dev.gentoo.org/~mgorny/dist/${P}-gentoo-patchset.tar.bz2"
 
 KEYWORDS="amd64 ppc x86"
 LICENSE="freedist"
@@ -18,7 +19,7 @@ src_prepare() {
 		-e '/^CFLAGS/s|=.*| += $(DEFS)|g' \
 		-e 's|$(CFLAGS) -o|$(LDFLAGS) &|g' \
 		|| die "sed Makefile"
-	EPATCH_SOURCE="${FILESDIR}" epatch \
+	EPATCH_SOURCE="${WORKDIR}/${P}-gentoo-patchset" epatch \
 		01_previous_changes.patch 10_bts354935_fix_fontdefs.patch \
 		20_bts416573_manpage_fixes.patch 30_bts443280_libdir_manpage.patch
 }