Remove obsolete version.

Remove bindnow flags.
Use better ways to circumvent sandbox violation when building the documentation (#223077).
Package-Manager: portage-2.1.4.4

10 files changed, 19 insertions, 473 deletions

diff --git a/net-dialup/mgetty/ChangeLog b/net-dialup/mgetty/ChangeLog
index 9fb4df3392bf..443733f15d3a 100644
--- a/net-dialup/mgetty/ChangeLog
+++ b/net-dialup/mgetty/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-dialup/mgetty
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/mgetty/ChangeLog,v 1.84 2008/05/19 20:37:44 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/mgetty/ChangeLog,v 1.85 2008/06/07 22:53:23 mrness Exp $
+
+  07 Jun 2008; Alin Năstac <mrness@gentoo.org>
+  -files/mgetty-1.1.35-callback.patch, -files/mgetty-1.1.35-faxrunq.patch,
+  -files/mgetty-1.1.35-gentoo.patch,
+  -files/mgetty-1.1.35-implicit-decl.patch,
+  -files/mgetty-1.1.35-netpbm-collision.patch,
+  -files/mgetty-1.1.35-strerror.patch, -mgetty-1.1.35-r2.ebuild,
+  mgetty-1.1.36-r1.ebuild:
+  Remove obsolete version. Remove bindnow flags. Use better ways to circumvent
+  sandbox violation when building the documentation (#223077).
 
   19 May 2008; Alin Năstac <mrness@gentoo.org> mgetty-1.1.35-r2.ebuild,
   mgetty-1.1.36-r1.ebuild:
diff --git a/net-dialup/mgetty/Manifest b/net-dialup/mgetty/Manifest
index c86303022d17..dfae60a57574 100644
--- a/net-dialup/mgetty/Manifest
+++ b/net-dialup/mgetty/Manifest
@@ -2,26 +2,18 @@
 Hash: SHA1
 
 AUX Lucent.c.patch 814 RMD160 686381b3ff22415c3d6a158501ffd1001fd87173 SHA1 c8b62a51af629ad0128a886ae3a78915618113ac SHA256 67770841c024a135efe7fffe24028829366b6da74195ccf43c71d7162738b2e2
-AUX mgetty-1.1.35-callback.patch 991 RMD160 c2be7ea49ef999799bf6ec3329ca89cec6e52804 SHA1 4ff9bf24fe8a54f51f42564932a01d9732a827c4 SHA256 8a97ecce6b4ee4f471a29eeeba5ed61d01893573d901724397583ffa42ac2299
-AUX mgetty-1.1.35-faxrunq.patch 1428 RMD160 7e1937d2b062d31f1506724674cb974be5a122ff SHA1 fef944d269ae92d6068c283391f24cf2f3571f59 SHA256 d4acd08a404393f54a996e032e9afce5cf925643c1a8433313e9b0281e7dd7da
-AUX mgetty-1.1.35-gentoo.patch 3187 RMD160 54a6734ad15a4494790fdee9409e73ec1fb38f8c SHA1 94fba4ecbc8f62de03fc20d0ea6907d4091c7be9 SHA256 7c902c486c27d7f45159806a38767938df67828eb4ed7a0a6a3312ea28cd1c42
-AUX mgetty-1.1.35-implicit-decl.patch 710 RMD160 4c254bb5d1ab0a7c403dc8c56fb5be35c09c8198 SHA1 7b12243abb463fa7dcd2c14683a43e30fe297e8e SHA256 a6cef9ce12bed51a0c581ecac5735496f47d0d3a75d4a3c74557c61a7e8c4826
-AUX mgetty-1.1.35-netpbm-collision.patch 3192 RMD160 6aa96f41f97f436af2d38ea8a9b18ab67a375a78 SHA1 e945e2ab9a09defd46f491e377058f7081aeb1cf SHA256 6dfa157007628638c229611821223a3a450b34185fa41d18033ff046054d0ec1
-AUX mgetty-1.1.35-strerror.patch 1573 RMD160 b3b973247539545f90adee99efb50cc53ab0828a SHA1 8465b265daa556b4ca98f23dd8e4f6b7c26f2ddd SHA256 fa3d890c6aee0291db1faf4f1622919b099f42d697a8fcd5079b96eb3c057a40
 AUX mgetty-1.1.36-callback.patch 991 RMD160 fd6b6198865a7cdafe66031014b55a07d217e011 SHA1 28f50f9ad16f5fc928be180ec77db913283b59be SHA256 881df3df8299deea291b1d823ccb0c61430c2f1a2b8f0af4b8ae334d9f6ffb44
 AUX mgetty-1.1.36-gentoo.patch 5746 RMD160 59810be601f24213aa4cfcd7f73e0efafa8b33c9 SHA1 959bcd2da70cf8ed6d04573acdc86eee80292573 SHA256 f8124ea78ef813233aa050d25deb45c3c2c667bb8ab8a1f0ce35ef3ed74ef952
 AUX mgetty-1.1.36-nofax.patch 3577 RMD160 1b6cab9f23eb3751fda601e40fe041696836d3a0 SHA1 6d797fd76b636cf950c925615fa7a2c2e99f06a9 SHA256 1b5f270d3589084bda15ef38dcb138113cbe5700287b9b7d89384f1d82867f22
 AUX mgetty-1.1.36-qa-fixes.patch 3369 RMD160 0394431b71f5fbe68a7614decabf7e002dda0d00 SHA1 7c54a40b7f9cebc88d20e30d13d2ac2b37393ce9 SHA256 53a0c38440b7f0e15ca032672a3f26913f7736d9d0ddcac7919771cf816a7570
-DIST mgetty1.1.35-Feb22.tar.gz 1023412 RMD160 835fc090835e3838e7d4c77a7f06a4c59869b3ab SHA1 27f46d22cbcfeac8c434d1784462a05f7425a57e SHA256 0846bfdc49f535842be033a3080b2b08499fabeec8de644c34470243d799f928
 DIST mgetty1.1.36-Jun15.tar.gz 1046324 RMD160 421c72b8534c6665c46033d5fe1018ba1300fd50 SHA1 a9627e241502c505465a9c8ffadc09dd7d90fc02 SHA256 8b8642aa318604ad057ed161cacff5c600296cbfbc9b4d562134ee5c130c80ce
-EBUILD mgetty-1.1.35-r2.ebuild 4980 RMD160 c6d6635fda4a1d76aff95e980e4f62e38efc1284 SHA1 4fb311efa6ce8dae5de3b76d6f71c0b185f34fe9 SHA256 22bf3c072b561c832a3266be6fa0164ff5b4d69ee1ce89b3c1f34cab34fa67d8
-EBUILD mgetty-1.1.36-r1.ebuild 4529 RMD160 2e36d5c87c425e12cedcd32a0dd62fc146d64022 SHA1 88ed4ac68810b61a58c6f1bffd52d860b0386e9c SHA256 e88f6778a2daee4104d56fe58f3028078a8d936a398095eadc99862792657398
-MISC ChangeLog 12957 RMD160 9d0b3a6c4257311ac6908a1d06415d2ee51c6ccc SHA1 029cd1f9bb629c9b2dbc9fa2191a025ecfc5c583 SHA256 a0d4cb882affde56f7be488a5a4c9af0a5ea701a33edf0e5eb20388118678e47
+EBUILD mgetty-1.1.36-r1.ebuild 4391 RMD160 866380c3d534f80563b76442024d60a76a29691b SHA1 7feddb78265ede1a83f24ce5f634f1c2ad49eea9 SHA256 0ca2efe3674a587e23db8c74ef1382529ea43c6cdeb78db35ba75911b57cd4bf
+MISC ChangeLog 13443 RMD160 a0f0155755b40e62764c54a96c2d8484dd212f34 SHA1 118f58a2eb82520c564935e6b7ef2c318bc38d92 SHA256 e1fb31e5134c4002f7799681c7e4b3d7c58fc456c120ab83b58418cd27de2fcb
 MISC metadata.xml 377 RMD160 1f17a6dbb9efe9992b812c253e63d02e93e37223 SHA1 0bde55896c3d1b16d71d1b33fc4b267b35817d5d SHA256 b6756d3fd813f8ff00f96cb472d15c9402e18001d9308dfdef1201369a4f6a6e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEUEARECAAYFAkgx5SQACgkQ+fWpoTWIA9G95gCWIPWpF0+I9T53KM2kUw2LLjlb
-7gCeK7LJ2mJUTiNZ9BZvaKANtgYeD70=
-=u/a/
+iEYEARECAAYFAkhLEYAACgkQ+fWpoTWIA9GiJwCdG8pNrtutK+xUGL48WnWw30BD
+5uYAnRih0y5eJycsJC1s2oEmBmW3AZMI
+=Y6o6
 -----END PGP SIGNATURE-----
diff --git a/net-dialup/mgetty/files/mgetty-1.1.35-callback.patch b/net-dialup/mgetty/files/mgetty-1.1.35-callback.patch
deleted file mode 100644
index c1d1f9d9b13a..000000000000
--- a/net-dialup/mgetty/files/mgetty-1.1.35-callback.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -Nru mgetty-1.1.35.orig/Makefile mgetty-1.1.35/Makefile
---- mgetty-1.1.35.orig/Makefile	2006-02-22 15:58:33.000000000 +0200
-+++ mgetty-1.1.35/Makefile	2006-03-12 19:29:07.362329250 +0200
-@@ -164,7 +164,7 @@
- #
- # if your systems doesn't have one, use the shell script that I provide
- # in "inst.sh" (taken from X11R5). Needed on IRIX5.2
--INSTALL=install -c -o bin -g bin
-+INSTALL=install -c
- #INSTALL=install -c -o root -g wheel		# NeXT/BSD
- #INSTALL=/usr/ucb/install -c -o bin -g bin	# AIX, Solaris 2.x
- #INSTALL=installbsd -c -o bin -g bin		# OSF/1, AIX 4.1, 4.2
-@@ -698,6 +698,13 @@
- 
- install-vgetty: vgetty-install
- 
-+install-callback:
-+	cd callback; $(MAKE) CFLAGS="$(CFLAGS)" CC="$(CC)" LDFLAGS="$(LDFLAGS)" \
-+	BINDIR="$(BINDIR)" SBINDIR="$(SBINDIR)" LIBDIR="$(LIBDIR)" \
-+	CONFDIR="$(CONFDIR)" MAN1DIR="$(MAN1DIR)" MAN8DIR="$(MAN8DIR)" INSTALL="$(INSTALL)" \
-+	LN="$(LN)" MV="$(MV)" RM="$(RM)" \
-+	LIBS="$(LIBS)" install
-+	
- ## test suite
- test: bin-all
- 	for D in g3 t ; do \
diff --git a/net-dialup/mgetty/files/mgetty-1.1.35-faxrunq.patch b/net-dialup/mgetty/files/mgetty-1.1.35-faxrunq.patch
deleted file mode 100644
index 0526a2c0fc45..000000000000
--- a/net-dialup/mgetty/files/mgetty-1.1.35-faxrunq.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -Nru mgetty-1.1.35.orig/fax/faxrunq.in mgetty-1.1.35/fax/faxrunq.in
---- mgetty-1.1.35.orig/fax/faxrunq.in	2006-02-09 16:46:18.000000000 +0200
-+++ mgetty-1.1.35/fax/faxrunq.in	2006-05-18 15:36:04.000000000 +0300
-@@ -243,7 +243,7 @@
- 	$echo "Status "`date`" successfully sent" >>JOB
- 
- 	# update accounting log
--	$echo `dirname $job`"|$MAIL_TO|| $PHONE |0|"`date '+%Y%m%d %H:%M:%S`"|$AH|success" >>$FAX_ACCT
-+	$echo `dirname $job`"|$MAIL_TO|| $PHONE |0|"`date '+%Y%m%d %H:%M:%S'`"|$AH|success" >>$FAX_ACCT
- 
- 	# send mail, if requested
- 	if [ -n "$do_mail_s" ] ; then
-@@ -314,7 +314,7 @@
- 	if [ -n "$suspend" ]
- 	then
- 	    # update accounting log (final)
--	    $echo `dirname $job`"|$MAIL_TO|| $PHONE |$status|"`date '+%Y%m%d %H:%M:%S`"|$AH|fail $status: $why" >>$FAX_ACCT
-+	    $echo `dirname $job`"|$MAIL_TO|| $PHONE |$status|"`date '+%Y%m%d %H:%M:%S'`"|$AH|fail $status: $why" >>$FAX_ACCT
- 
- 	    # send mail, if requested
- 	    if [ -n "$do_mail_f" ] ; then
-@@ -347,7 +347,7 @@
- 	    mv JOB JOB.suspended 2>/dev/null
- 	else					# do not delete job yet...
- 	    # update accounting log (intermediate)
--	    $echo `dirname $job`"|$MAIL_TO|| $PHONE |-$status|"`date '+%Y%m%d %H:%M:%S`"|$AH|fail $status: $why" >>$FAX_ACCT
-+	    $echo `dirname $job`"|$MAIL_TO|| $PHONE |-$status|"`date '+%Y%m%d %H:%M:%S'`"|$AH|fail $status: $why" >>$FAX_ACCT
- 
- 	    # call update handler, if requested
- 	    if [ -n "$exec_pgm_u" ] ; then
diff --git a/net-dialup/mgetty/files/mgetty-1.1.35-gentoo.patch b/net-dialup/mgetty/files/mgetty-1.1.35-gentoo.patch
deleted file mode 100644
index 32fc2134d2cb..000000000000
--- a/net-dialup/mgetty/files/mgetty-1.1.35-gentoo.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-diff -Nru mgetty-1.1.35.orig/callback/Makefile mgetty-1.1.35/callback/Makefile
---- mgetty-1.1.35.orig/callback/Makefile	2000-08-14 22:33:08.000000000 +0300
-+++ mgetty-1.1.35/callback/Makefile	2007-04-15 12:08:09.000000000 +0300
-@@ -40,7 +40,7 @@
- # install programs
- #
- install: all
--	$(INSTALL) -s -m 700 -o root callback $(SBINDIR)
--	$(INSTALL) -s -m 4711 -o root ct $(BINDIR)
-+	$(INSTALL) -m 700 -o root callback $(SBINDIR)
-+	$(INSTALL) -m 4711 -o root ct $(BINDIR)
- 
- # source modules
-diff -Nru mgetty-1.1.35.orig/doc/mgetty.texi-in mgetty-1.1.35/doc/mgetty.texi-in
---- mgetty-1.1.35.orig/doc/mgetty.texi-in	2005-12-30 23:43:49.000000000 +0200
-+++ mgetty-1.1.35/doc/mgetty.texi-in	2007-04-15 12:07:02.000000000 +0300
-@@ -19,6 +19,11 @@
- Copyright @copyright{} 1993-2005 Gert Doering
- @end ifinfo
- 
-+@dircategory User
-+@direntry
-+* MGETTY: (mgetty).    Modem+Voice+Fax utilities
-+@end direntry
-+
- @titlepage
- @sp 6
- @center @titlefont{mgetty+sendfax}
-diff -Nru mgetty-1.1.35.orig/frontends/X11/viewfax/Makefile mgetty-1.1.35/frontends/X11/viewfax/Makefile
---- mgetty-1.1.35.orig/frontends/X11/viewfax/Makefile	2004-11-14 22:38:24.000000000 +0200
-+++ mgetty-1.1.35/frontends/X11/viewfax/Makefile	2007-04-15 12:07:30.000000000 +0300
-@@ -61,7 +61,7 @@
- g3hack:		g3hack.c
- 
- install: viewfax
--	$(INSTALL) -s -m 755 viewfax $(BINDIR)
-+	$(INSTALL) -m 755 viewfax $(BINDIR)
- 	$(INSTALL) -m 644 viewfax.man $(MANDIR)/viewfax.1
- 	$(INSTALL) -m 644 viewfax.tif $(LIBDIR)
- 
-diff -Nru mgetty-1.1.35.orig/g3/Makefile mgetty-1.1.35/g3/Makefile
---- mgetty-1.1.35.orig/g3/Makefile	2005-02-27 21:02:16.000000000 +0200
-+++ mgetty-1.1.35/g3/Makefile	2007-04-15 12:07:25.000000000 +0300
-@@ -40,7 +40,7 @@
- # install programs
- #
- 	for f in $(G3_PROGRAMS) ; do \
--		$(INSTALL) -s -m 755 $$f $(BINDIR) ; \
-+		$(INSTALL) -m 755 $$f $(BINDIR) ; \
- 	done
- #
- # make symlink for "g3topbm" (so third-party fax viewers won't fail)
-diff -Nru mgetty-1.1.35.orig/Makefile mgetty-1.1.35/Makefile
---- mgetty-1.1.35.orig/Makefile	2006-02-22 15:58:33.000000000 +0200
-+++ mgetty-1.1.35/Makefile	2007-04-15 12:07:20.000000000 +0300
-@@ -591,8 +591,8 @@
- 	-test -d $(SBINDIR) || ( ./mkidirs $(SBINDIR) ; chmod 755 $(SBINDIR) )
- 	-mv -f $(SBINDIR)/mgetty $(SBINDIR)/mgetty.old
- 	-mv -f $(SBINDIR)/sendfax $(SBINDIR)/sendfax.old
--	$(INSTALL) -s -m 700 mgetty $(SBINDIR)
--	$(INSTALL) -s -m 755 sendfax $(SBINDIR)
-+	$(INSTALL) -m 700 mgetty $(SBINDIR)
-+	$(INSTALL) -m 755 sendfax $(SBINDIR)
- #
- # data files + directories
- #
-@@ -654,7 +654,7 @@
- 	if [ ! -z "$(INSTALL_MECHO)" ] ; then \
- 	    cd compat ; \
- 	    $(CC) $(CFLAGS) -o mg.echo mg.echo.c && \
--	    $(INSTALL) -s -m 755 mg.echo $(BINDIR) ; \
-+	    $(INSTALL) -m 755 mg.echo $(BINDIR) ; \
- 	fi
- 
- #
-diff -Nru mgetty-1.1.35.orig/voice/Makefile mgetty-1.1.35/voice/Makefile
---- mgetty-1.1.35.orig/voice/Makefile	2001-12-23 17:08:13.000000000 +0200
-+++ mgetty-1.1.35/voice/Makefile	2007-04-15 12:07:02.000000000 +0300
-@@ -85,6 +85,7 @@
- 	@echo ""
- 	$(INSTALL) -m 700 vgetty/vgetty $(SBINDIR)
- 	$(INSTALL) -m 755 vm/vm $(BINDIR)
-+	$(INSTALL) -m 644 voice.conf-dist $(CONFDIR)/voice.conf
- 	for i in $(PVFTOOLS); \
- 	do \
- 	     $(INSTALL) -m 755 pvftools/$$i $(BINDIR); \
diff --git a/net-dialup/mgetty/files/mgetty-1.1.35-implicit-decl.patch b/net-dialup/mgetty/files/mgetty-1.1.35-implicit-decl.patch
deleted file mode 100644
index 9cb62b8e5a1e..000000000000
--- a/net-dialup/mgetty/files/mgetty-1.1.35-implicit-decl.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -Nru mgetty-1.1.35.orig/t/t_ring.c mgetty-1.1.35/t/t_ring.c
---- mgetty-1.1.35.orig/t/t_ring.c	2005-03-23 11:56:21.000000000 +0200
-+++ mgetty-1.1.35/t/t_ring.c	2007-04-15 11:46:45.000000000 +0300
-@@ -24,6 +24,7 @@
- 
- #include "mgetty.h"
- #include <stdio.h>
-+#include <string.h>
- #include <signal.h>
- #include <errno.h>
- #ifdef T_LOG_VERBOSE
-diff -Nru mgetty-1.1.35.orig/tools/microcom.c mgetty-1.1.35/tools/microcom.c
---- mgetty-1.1.35.orig/tools/microcom.c	2005-02-27 14:10:52.000000000 +0200
-+++ mgetty-1.1.35/tools/microcom.c	2007-04-15 11:47:17.000000000 +0300
-@@ -6,6 +6,7 @@
-  *
-  * Calls routines in io.c, tio.c
-  */
-+#include <stdlib.h>
- #include <stdio.h>
- #include <fcntl.h>
- #include <unistd.h>
diff --git a/net-dialup/mgetty/files/mgetty-1.1.35-netpbm-collision.patch b/net-dialup/mgetty/files/mgetty-1.1.35-netpbm-collision.patch
deleted file mode 100644
index 6d72af95e65b..000000000000
--- a/net-dialup/mgetty/files/mgetty-1.1.35-netpbm-collision.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-diff -Nru mgetty-1.1.35.orig/frontends/tcl/faxview-0.2/faxview.man mgetty-1.1.35/frontends/tcl/faxview-0.2/faxview.man
---- mgetty-1.1.35.orig/frontends/tcl/faxview-0.2/faxview.man	1996-02-04 16:35:33.000000000 +0200
-+++ mgetty-1.1.35/frontends/tcl/faxview-0.2/faxview.man	2006-11-20 21:36:03.318452515 +0200
-@@ -99,7 +99,7 @@
- 
- and
- 
--     g3topbm $f | pbmtolps | lpr &
-+     g32pbm $f | pbmtolps | lpr &
- 
- The
- .I Return
-@@ -177,7 +177,7 @@
- .B mgetty(1)
- (it takes less than a second to display an average fax page).
- 
--.B g3topbm(1)
-+.B g32pbm(1)
- from the
- .BR pbmplus ,\  netpbm
- or
-diff -Nru mgetty-1.1.35.orig/frontends/tcl/faxview-0.2/faxview.tcl mgetty-1.1.35/frontends/tcl/faxview-0.2/faxview.tcl
---- mgetty-1.1.35.orig/frontends/tcl/faxview-0.2/faxview.tcl	1997-01-09 22:47:07.000000000 +0200
-+++ mgetty-1.1.35/frontends/tcl/faxview-0.2/faxview.tcl	2006-11-20 21:36:13.923115265 +0200
-@@ -42,7 +42,7 @@
- # variable `$f' will be replaced with the selected file name(s).
- #
- set view_command {viewfax $f &}
--set print_command {g3topbm $f | pbmtolps | lpr &}
-+set print_command {g32pbm $f | pbmtolps | lpr &}
- 
- # Shall `$f' be replaced with multiple file names or with a single
- # one?
-diff -Nru mgetty-1.1.35.orig/frontends/www/nph-vf-gif.in mgetty-1.1.35/frontends/www/nph-vf-gif.in
---- mgetty-1.1.35.orig/frontends/www/nph-vf-gif.in	2004-11-24 15:46:17.000000000 +0200
-+++ mgetty-1.1.35/frontends/www/nph-vf-gif.in	2006-11-20 21:35:42.225134263 +0200
-@@ -121,7 +121,7 @@
-     errormessage( "\$indexpage : not configured - please look at the configuration-Files and configure the URL for my main-index-page (\$indexpage)");
- }
- 
--checkprogram($g3topbm, "g3topbm");
-+checkprogram($g3topbm, "g32pbm");
- checkprogram($ppmquant, "ppmquant");
- checkprogram($pnmscale, "pnmscale");
- checkprogram($ppmtogif, "ppmtogif");
-diff -Nru mgetty-1.1.35.orig/frontends/www/wwwgui.cfg.in mgetty-1.1.35/frontends/www/wwwgui.cfg.in
---- mgetty-1.1.35.orig/frontends/www/wwwgui.cfg.in	2004-11-24 15:46:17.000000000 +0200
-+++ mgetty-1.1.35/frontends/www/wwwgui.cfg.in	2006-11-20 21:37:51.205195012 +0200
-@@ -52,7 +52,7 @@
- #
- 
- # convert G3 image to PBM
--$g3topbm='@BINDIR@/g32pbm';
-+$g3topbm='/usr/bin/g32pbm';
- 
- # convert PBM image to GIF (could be "ppmtogif" or "pnmtogif")
- $ppmtogif='@BINDIR@/ppmtogif';
-diff -Nru mgetty-1.1.35.orig/frontends/X11/viewfax/viewfax.man mgetty-1.1.35/frontends/X11/viewfax/viewfax.man
---- mgetty-1.1.35.orig/frontends/X11/viewfax/viewfax.man	2004-11-14 14:14:29.000000000 +0200
-+++ mgetty-1.1.35/frontends/X11/viewfax/viewfax.man	2006-11-20 21:36:23.399707512 +0200
-@@ -274,7 +274,7 @@
- .B hylafax
- (http://www.hylafax.org/) is a full-function fax client/server system.
- 
--.B g3topbm(1)
-+.B g32pbm(1)
- and
- .B xv(1)
- can be used in a pipeline to view faxes.  This will usually be slower
-diff -Nru mgetty-1.1.35.orig/g3/Makefile mgetty-1.1.35/g3/Makefile
---- mgetty-1.1.35.orig/g3/Makefile	2006-11-20 21:35:21.711852263 +0200
-+++ mgetty-1.1.35/g3/Makefile	2006-11-20 21:10:47.325515539 +0200
-@@ -45,8 +45,6 @@
- #
- # make symlink for "g3topbm" (so third-party fax viewers won't fail)
- #
--	-cd $(BINDIR) ; \
--	test -x g3topbm || ln -s g32pbm g3topbm
- 
- 
- # test suite
diff --git a/net-dialup/mgetty/files/mgetty-1.1.35-strerror.patch b/net-dialup/mgetty/files/mgetty-1.1.35-strerror.patch
deleted file mode 100644
index a2057d3f7b9b..000000000000
--- a/net-dialup/mgetty/files/mgetty-1.1.35-strerror.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff -Nru mgetty-1.1.35.orig/logfile.c mgetty-1.1.35/logfile.c
---- mgetty-1.1.35.orig/logfile.c	2005-11-26 15:48:16.000000000 +0200
-+++ mgetty-1.1.35/logfile.c	2006-03-12 19:30:46.556528500 +0200
-@@ -58,10 +58,10 @@
- /* Most systems have these variables but do not declare them. On many
-    of those systems that _do_ declare them, it won't hurt */
- 
--#if !defined(__NetBSD__) && !defined( __FreeBSD__ ) && !defined(__OpenBSD__) && !defined(__GLIBC__) && !defined(__MACH__)
-+/*#if !defined(__NetBSD__) && !defined( __FreeBSD__ ) && !defined(__OpenBSD__) && !defined(__GLIBC__) && !defined(__MACH__)
- extern int sys_nerr;
- extern char *sys_errlist[];
--#endif
-+#endif*/
- 
- /* Interactive Unix is a little bit braindead - does not have atexit(),
-  */
-@@ -211,6 +211,7 @@
- va_list pvar;
- int     errnr;
- char * p;
-+char *error_string;
- static int first_open = TRUE;
- 
-     if ( level > log_level )	/* log level high enough? */
-@@ -327,12 +328,20 @@
-     }
-     else		/* ERROR or FATAL */
-     {
-+	error_string = strerror (errnr);
-+	if ( error_string == NULL )
-+	{
-+		if ( errno == EINVAL )
-+			error_string = "<error not in list>";
-+		else
-+			error_string = "<error calling strerror()>";
-+	}
-+	
- 	fprintf(log_fp, "\n%02d/%02d %02d:%02d:%02d %s %s: %s",
- 		             tm->tm_mon+1,  tm->tm_mday,
- 			     tm->tm_hour, tm->tm_min, tm->tm_sec,
- 		             log_infix, ws,
--			     ( errnr <= sys_nerr ) ? sys_errlist[errnr]:
--			     "<error not in list>" );
-+			     strerror (errnr));
- #ifdef SYSLOG
- 	syslog( level == L_FATAL? LOG_ALERT: LOG_ERR, "%s: %m", ws );
- #endif
diff --git a/net-dialup/mgetty/mgetty-1.1.35-r2.ebuild b/net-dialup/mgetty/mgetty-1.1.35-r2.ebuild
deleted file mode 100644
index 4068533ed638..000000000000
--- a/net-dialup/mgetty/mgetty-1.1.35-r2.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/mgetty/mgetty-1.1.35-r2.ebuild,v 1.5 2008/05/19 20:37:44 mrness Exp $
-
-inherit toolchain-funcs flag-o-matic eutils
-
-DESCRIPTION="Fax and Voice modem programs."
-SRC_URI="ftp://mgetty.greenie.net/pub/mgetty/source/1.1/${PN}${PV}-Feb22.tar.gz"
-HOMEPAGE="http://mgetty.greenie.net/"
-
-DEPEND="doc? ( virtual/latex-base )
-	>=sys-apps/sed-4
-	sys-apps/gawk
-	sys-apps/groff
-	dev-lang/perl
-	sys-apps/texinfo"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc sparc x86"
-IUSE="doc fidonet"
-
-pkg_setup() {
-	enewgroup fax
-	enewuser fax -1 -1 /dev/null fax
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-gentoo.patch"
-	epatch "${FILESDIR}/${P}-strerror.patch" # fix deprecate warnings
-	epatch "${FILESDIR}/${P}-callback.patch" # add callback install to Makefile
-	epatch "${FILESDIR}/Lucent.c.patch" # Lucent modem CallerID patch - bug #80366
-	epatch "${FILESDIR}/${P}-faxrunq.patch"
-	epatch "${FILESDIR}/${P}-netpbm-collision.patch" #g3topbm is installed by netpbm
-	epatch "${FILESDIR}/${P}-implicit-decl.patch"
-
-	#Avoid "is setXid, dynamically linked and using lazy bindings" QA notices
-	append-ldflags $(bindnow-flags)
-
-	sed -i 's: \$(CFLAGS) -o faxq-helper faxq-helper.o: $(LDLAGS) '$(bindnow-flags)' -o faxq-helper faxq-helper.o:' "${S}/fax/Makefile"
-
-	sed -e 's:var/log/mgetty:var/log/mgetty/mgetty:' \
-		-e 's:var/log/sendfax:var/log/mgetty/sendfax:' \
-		-e 's:\/\* \(\#define CNDFILE "dialin.config"\) \*\/:\1:' \
-		-e 's:\(\#define FAX_NOTIFY_PROGRAM\).*:\1 "/etc/mgetty+sendfax/new_fax":' \
-		"${S}/policy.h-dist" > "${S}/policy.h"
-
-	#Set proper owner:group
-	sed -i -e "s:uucp:fax:g" "${S}/mgetty.cfg.in"
-	sed -i -e "s:phone_group phone:phone_group fax:g" \
-		-e "s:phone_owner root:phone_owner fax:g" \
-		-e "s/root.phone/fax:fax/g" "${S}/voice/voice.conf-dist"
-
-	# bug 44231 and remove move warning
-	sed -e 's:ECHO="echo":ECHO="echo -e":' \
-		-e "/mv -f \$(SBINDIR)/d" \
-		-i "${S}/Makefile"
-
-	sed -i -e 's:/usr/local/lib/mgetty+sendfax:/etc/mgetty+sendfax:' faxrunq.config
-	sed -i -e 's:/usr/local/bin/g3cat:/usr/bin/g3cat:' faxrunq.config fax/faxspool.rules
-
-	sed -e "/^doc-all:/s/mgetty.asc mgetty.info mgetty.dvi mgetty.ps/mgetty.info/" \
-		-i "${S}/doc/Makefile"
-	if use doc; then
-		sed -e "s:dvips -o mgetty.ps:dvips -M -o mgetty.ps:" \
-			-e "s/^doc-all:/doc-all: mgetty.ps/" \
-			-i "${S}/doc/Makefile"
-	fi
-}
-
-src_compile() {
-	use fidonet && append-flags "-DFIDO"
-	append-flags "-DAUTO_PPP"
-
-	# parallel make fix later - 'sedscript' issue
-	make prefix=/usr \
-		CC="$(tc-getCC)" \
-		CONFDIR=/etc/mgetty+sendfax \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		all vgetty || die "make failed."
-}
-
-src_install () {
-	dodir /var/spool
-	keepdir /var/log/mgetty
-	dodir /usr/share/info
-
-	make prefix="${D}/usr" \
-		INFODIR="${D}/usr/share/info" \
-		CONFDIR="${D}/etc/mgetty+sendfax" \
-		MAN1DIR="${D}/usr/share/man/man1" \
-		MAN4DIR="${D}/usr/share/man/man4" \
-		MAN5DIR="${D}/usr/share/man/man5" \
-		MAN8DIR="${D}/usr/share/man/man8" \
-		SBINDIR="${D}/usr/sbin" \
-		BINDIR="${D}/usr/bin" \
-		VOICE_DIR="${D}/var/spool/voice" \
-		PHONE_GROUP=fax \
-		PHONE_PERMS=755 \
-		spool="${D}/var/spool" \
-		install vgetty-install install-callback || die "make install failed."
-
-	#Install mgetty into /sbin (#119078)
-	dodir /sbin && \
-		mv "${D}"/usr/sbin/mgetty "${D}"/sbin && \
-		dosym /sbin/mgetty /usr/sbin/mgetty || die "failed to install /sbin/mgetty"
-	#Don't install ct (#106337)
-	rm "${D}"/usr/bin/ct || die "failed to remove useless ct program"
-
-	cd "${S}"
-	dodoc BUGS ChangeLog README.1st Recommend THANKS TODO \
-		doc/*.txt doc/modems.db || die "dodoc failed."
-	doinfo doc/mgetty.info || die "doinfo failed."
-
-	docinto vgetty
-	dodoc voice/{Readme,Announce,ChangeLog,Credits} || die "vgetty voice failed."
-
-	if use doc; then
-		dodoc doc/mgetty.ps || die "mgetty.ps failed"
-	fi
-
-	docinto vgetty/doc
-	dodoc voice/doc/*
-
-	mv samples/new_fax.all samples_new_fax.all || die "move failed."
-	docinto samples
-	dodoc samples/*
-
-	docinto samples/new_fax
-	dodoc samples_new_fax.all/*
-
-	insinto /usr/share/${PN}
-	doins -r patches frontends
-	insinto /usr/share/${PN}/voice
-	doins -r voice/{contrib,Perl,scripts}
-
-	diropts -m 0750 -o fax -g fax
-	dodir /var/spool/voice
-	keepdir /var/spool/voice/incoming
-	keepdir /var/spool/voice/messages
-	dodir /var/spool/fax
-	dodir /var/spool/fax/outgoing
-	keepdir /var/spool/fax/outgoing/locks
-	keepdir /var/spool/fax/incoming
-}
-
-pkg_postinst() {
-	elog "Users who wish to use the fax or voicemail capabilities must be members"
-	elog "of the group fax in order to access files"
-	elog
-	elog "If you want to grab voice messages from a remote location, you must save"
-	elog "the password in ${ROOT}var/spool/voice/.code file"
-	echo
-	ewarn "${ROOT}var/spool/voice/.code and ${ROOT}var/spool/voice/messages/Index"
-	ewarn "are not longer created by this automatically!"
-}
diff --git a/net-dialup/mgetty/mgetty-1.1.36-r1.ebuild b/net-dialup/mgetty/mgetty-1.1.36-r1.ebuild
index b280027d26fb..3a45485431ea 100644
--- a/net-dialup/mgetty/mgetty-1.1.36-r1.ebuild
+++ b/net-dialup/mgetty/mgetty-1.1.36-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/mgetty/mgetty-1.1.36-r1.ebuild,v 1.10 2008/05/19 20:37:44 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/mgetty/mgetty-1.1.36-r1.ebuild,v 1.11 2008/06/07 22:53:23 mrness Exp $
 
 inherit toolchain-funcs flag-o-matic eutils
 
@@ -50,21 +50,17 @@ src_unpack() {
 	sed -e "/^doc-all:/s/mgetty.asc mgetty.info mgetty.dvi mgetty.ps/mgetty.info/" \
 		-i "${S}/doc/Makefile"
 	if use doc; then
-		sed -e "s:dvips -o mgetty.ps:dvips -M -o mgetty.ps:" \
-			-e "s/^doc-all:/doc-all: mgetty.ps/" \
+		sed -e "s/^doc-all:/doc-all: mgetty.ps/" \
 			-i "${S}/doc/Makefile"
 	fi
 }
 
 src_compile() {
-	#Avoid "is setXid, dynamically linked and using lazy bindings" QA notices
-	append-ldflags $(bindnow-flags)
-
 	use fidonet && append-flags "-DFIDO"
 	append-flags "-DAUTO_PPP"
 
 	# parallel make fix later - 'sedscript' issue
-	make prefix=/usr \
+	VARTEXFONTS="${T}"/fonts make prefix=/usr \
 		CC="$(tc-getCC)" \
 		CONFDIR=/etc/mgetty+sendfax \
 		CFLAGS="${CFLAGS}" \