old

6 files changed, 6 insertions, 211 deletions

diff --git a/sys-apps/groff/files/groff-1.18-infoext.patch b/sys-apps/groff/files/groff-1.18-infoext.patch
deleted file mode 100644
index ee8bc9793fab..000000000000
--- a/sys-apps/groff/files/groff-1.18-infoext.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- groff-1.18/doc/Makefile.in.orig	Mon Jul 29 12:50:04 2002
-+++ groff-1.18/doc/Makefile.in	Mon Jul 29 12:54:49 2002
-@@ -104,7 +104,7 @@
- prepare_examples: grnexmpl.g
- 	test -f grnexmpl.g || cp $(srcdir)/grnexmpl.g .
- 
--groff: groff.texinfo
-+groff.info: groff.texinfo
- 	$(MAKEINFO) -I$(srcdir) $(srcdir)/groff.texinfo
- 
- gnu.eps: gnu.xpm
---- groff-1.18/doc/groff.texinfo.orig	Mon Jul 29 12:48:56 2002
-+++ groff-1.18/doc/groff.texinfo	Mon Jul 29 12:49:07 2002
-@@ -8,7 +8,7 @@
- @c
- 
- @c %**start of header (This is for running Texinfo on a region.)
--@setfilename groff
-+@setfilename groff.info
- @settitle The GNU Troff Manual
- @setchapternewpage odd
- @footnotestyle separate
diff --git a/sys-apps/groff/files/groff-1.18-no-netpbm-depend.patch b/sys-apps/groff/files/groff-1.18-no-netpbm-depend.patch
deleted file mode 100644
index 1ec42fce9616..000000000000
--- a/sys-apps/groff/files/groff-1.18-no-netpbm-depend.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Don't install the example files.  The second hunk is to workaround 
-shells that suck at life.
-
-http://bugs.gentoo.org/show_bug.cgi?id=89174
-
---- groff-1.18/doc/Makefile.sub
-+++ groff-1.18/doc/Makefile.sub
-@@ -60,12 +60,12 @@
- HTMLDOCIMAGEFILES=\
-   pic*
- 
--EXAMPLEFILES=\
-+EXAMPLEFILES=#\
-   webpage.ms \
-   grnexmpl.g \
-   grnexmpl.me
- 
--PROCESSEDEXAMPLEFILES=\
-+PROCESSEDEXAMPLEFILES=#\
-   webpage.ps \
-   gnu.eps \
-   gnu.png \
-@@ -170,11 +170,11 @@
- 	  $(INSTALL_DATA) $$f $(docdir)/$$f; \
- 	done
- 	-test -d $(exampledir) || $(mkinstalldirs) $(exampledir)
--	for f in $(EXAMPLEFILES); do \
-+	list="$(EXAMPLEFILES)"; for f in $${list}; do \
- 	  rm -f $(exampledir)/$$f; \
- 	  $(INSTALL_DATA) $(srcdir)/$$f $(exampledir)/$$f; \
- 	done
--	for f in $(PROCESSEDEXAMPLEFILES); do \
-+	list="$(PROCESSEDEXAMPLEFILES)"; for f in $${list}; do \
- 	  rm -f $(exampledir)/$$f; \
- 	  $(INSTALL_DATA) $$f $(exampledir)/$$f; \
- 	done
diff --git a/sys-apps/groff/files/groff-1.18.1.1-deb-fix.patch b/sys-apps/groff/files/groff-1.18.1.1-deb-fix.patch
deleted file mode 100644
index 1ecbdfa108ef..000000000000
--- a/sys-apps/groff/files/groff-1.18.1.1-deb-fix.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- groff-1.18.1/tmac/docj.tmac
-+++ groff-1.18.1/tmac/docj.tmac
-@@ -49,14 +49,14 @@
- .de sO
- .mso mdoc/\\$1
- ..
-+.sO doc-doc-common
-+.sO doc-doc-syms
- .if t \{\
- .       sO docj-ditroff
- .\}
- .if n \{\
- .       sO docj-nroff
- .\}
--.sO doc-common
--.sO doc-syms
- .\" NS Db macro - start/stop DEBUG MODE
- .\" NS Db register DEBUG MODE
- .\" NS iN register DEBUG MODE (inline if 1, to stderr if 0 (default))
diff --git a/sys-apps/groff/files/groff_1.18.1.1-10-fix.patch b/sys-apps/groff/files/groff_1.18.1.1-10-fix.patch
deleted file mode 100644
index b063603c2a19..000000000000
--- a/sys-apps/groff/files/groff_1.18.1.1-10-fix.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -urN groff-1.18.1-orig/tmac/docj.tmac groff-1.18.1/tmac/docj.tmac
---- groff-1.18.1.orig/tmac/docj.tmac	2003-02-20 12:31:28.000000000 +0900
-+++ groff-1.18.1/tmac/docj.tmac	2003-02-20 12:34:30.000000000 +0900
-@@ -49,14 +49,14 @@
- .de sO
- .mso mdoc/\\$1
- ..
-+.sO doc-doc-common
-+.sO doc-doc-syms
- .if t \{\
- .       sO docj-ditroff
- .\}
- .if n \{\
- .       sO docj-nroff
- .\}
--.sO doc-common
--.sO doc-syms
- .\" NS Db macro - start/stop DEBUG MODE
- .\" NS Db register DEBUG MODE
- .\" NS iN register DEBUG MODE (inline if 1, to stderr if 0 (default))
diff --git a/sys-apps/groff/groff-1.18.1.1.ebuild b/sys-apps/groff/groff-1.18.1.1.ebuild
deleted file mode 100644
index b7c77ea6eac0..000000000000
--- a/sys-apps/groff/groff-1.18.1.1.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/groff/groff-1.18.1.1.ebuild,v 1.7 2006/06/21 17:21:21 vapier Exp $
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DEB_PATCH="${P/-/_}-12"
-DESCRIPTION="Text formatter used for man pages"
-HOMEPAGE="http://www.gnu.org/software/groff/groff.html"
-SRC_URI="mirror://gnu/groff/${P}.tar.gz
-	mirror://debian/pool/main/g/groff/${DEB_PATCH}.diff.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
-IUSE="X cjk"
-
-DEPEND=">=sys-apps/texinfo-4.0"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# We lub Debian
-	epatch "${WORKDIR}"/${DEB_PATCH}.diff
-	epatch "${FILESDIR}"/${P}-deb-fix.patch
-
-	# Fix the info pages to have .info extensions,
-	# else they do not get gzipped.
-	epatch "${FILESDIR}"/groff-1.18-infoext.patch
-
-	# Do not generate example files that require us to
-	# depend on netpbm.
-	epatch "${FILESDIR}"/groff-1.18-no-netpbm-depend.patch
-
-	# Make dashes the same as minus on the keyboard so that you
-	# can search for it. Fixes #17580 and #16108
-	# Thanks to James Cloos <cloos@jhcloos.com>
-	epatch "${FILESDIR}"/${PN}-man-UTF-8.diff
-
-	# Fix syntax error in pic2graph. Closes #32300.
-	sed -i -e "s:groffpic_opts=\"-U\":groffpic_opts=\"-U\";;:" contrib/pic2graph/pic2graph.sh
-}
-
-src_compile() {
-	local myconf=""
-
-	# Fix problems with not finding g++
-	export CC="$(tc-getCC)"
-	export CXX="$(tc-getCXX)"
-
-	case ${ARCH} in
-		alpha)
-			# -Os causes segfaults, -O is probably a fine replacement
-			# (fixes bug 36008, 06 Jan 2004 agriffis)
-			replace-flags -Os -O
-			;;
-		hppa)
-			# -march=2.0 makes groff unable to finish the compile process
-			export CFLAGS="${CFLAGS/-march=2.0/}"
-			export CXXFLAGS="${CXXFLAGS/-march=2.0/}"
-			;;
-	esac
-
-	myconf="${myconf} `use_enable cjk multibyte`"
-
-	./configure --host=${CHOST} \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--infodir=\${inforoot} \
-		${myconf} || die
-
-	# parallel build doesn't work
-	emake -j1 || die
-
-	# Only build X stuff if we have X installed, but do
-	# not depend on it, else we get circular deps.
-	if use X && [[ -n $(type -p xmkmf) ]] ; then
-		cd ${S}/src/xditview
-		xmkmf || die
-		make depend all || die
-	fi
-}
-
-src_install() {
-	dodir /usr /usr/share/doc/${PF}/{examples,html}
-	make prefix=${D}/usr \
-		manroot=${D}/usr/share/man \
-		inforoot=${D}/usr/share/info \
-		docdir=${D}/usr/share/doc/${PF} \
-		install || die
-
-	if use X && [[ -n $(type -p xmkmf) ]] ; then
-		cd ${S}/src/xditview
-		make DESTDIR=${D} \
-			BINDIR=/usr/bin \
-			MANPATH=/usr/share/man \
-			install \
-			install.man || die
-	fi
-
-	#the following links are required for xman
-	dosym eqn /usr/bin/geqn
-	dosym tbl /usr/bin/gtbl
-	dosym soelim /usr/bin/zsoelim
-
-	cd ${S}
-	dodoc BUG-REPORT COPYING ChangeLog FDL MORE.STUFF NEWS \
-		PROBLEMS PROJECTS README REVISION TODO VERSION
-}
diff --git a/sys-apps/man/Manifest b/sys-apps/man/Manifest
index ad2367d3eba7..c69c14fa30b9 100644
--- a/sys-apps/man/Manifest
+++ b/sys-apps/man/Manifest
@@ -15,16 +15,18 @@ AUX man-1.6e-headers.patch 241 RMD160 04052f079124c57fcc6b0ebe29a4a62eba39baa4 S
 AUX man-1.6e-man2html-bzip2.patch 1511 RMD160 1a2cd248001f272d5ce79b952c7e59b9244f5df4 SHA1 ed923a79f45650cf53c77e4d08ed50e108c1bb8c SHA256 ac080c92233d0de35f09641b7ff79f71dd0fff60bf95a310b33dc55134b3505c
 AUX man-1.6e-readonly-whatis2.patch 1179 RMD160 71e357153c18bcf444b9264b64d29de7e303ecab SHA1 981ab4e9743dce40a07fbb90d2c179c7a8716c56 SHA256 e87c4a98c9caee7fe80f873f29523232c9754f42aa78830028af2ddc40f408a8
 AUX man-1.6f-man2html-compression.patch 1559 RMD160 c154c9d0f27ded25a9b60e1bf1496d624fe9cc08 SHA1 a7714a9ee7421ba3dd7b1a4fd66a436caadbe6da SHA256 dba59d9d94684995f670065ad09da392af5318f1b95eeba66806631f5339afa9
+AUX man-1.6f-unicode.patch 656 RMD160 298d0012b34c803fb296d7cacc07febd8d314f39 SHA1 c4c716ae4417b949721fbfec0b667a91cf560810 SHA256 1c7624b5824e5585abd1c3d27ffd8e2d9207a05bf67e268aeaabaddf842d4709
 DIST man-1.6e.tar.gz 252657 RMD160 486099dc1b34fe86a2c1d19b7c89dc19b9787837 SHA1 7264bda7dd7bf08bdb9dac6ec7734e755ec0a8d1 SHA256 022faf23844eabb3662eabb105836925dd83bedda10271e2450a5bc5b61a5b5f
 DIST man-1.6f.tar.gz 254827 RMD160 8680bb94bff9b86fb9d061f58d9acb08c934531e SHA1 c97012607ed9d75a6eee7e66d257a99a8ed86918 SHA256 9f208c7e1981371ad4481d6e6c2c566bc726a15778723f94136d220fb9375f6c
 EBUILD man-1.6e-r3.ebuild 3557 RMD160 136047613d1e60452b2bb8a168c77fd314023e98 SHA1 2c5a28b01d7fe022a94dfb0eb8e27a546db9c264 SHA256 2c8306e947f7521669be148d64389b3d15546f01aa8972d9e573bb858bc4366a
+EBUILD man-1.6f-r1.ebuild 3000 RMD160 b5403613de0c7eb6d499033c898cf1a0972a8439 SHA1 1d3d15288263f0008a79534597a0676bdb3aa088 SHA256 0f1053ce33d8c579630331d5aac50396056e14b1be6d744fed9d5992075f3058
 EBUILD man-1.6f.ebuild 2974 RMD160 45440f8db6942835007bc02d050252337fa94f17 SHA1 944ff93af0fe39773a0a7036f1038a16517a048c SHA256 b80ac0b104fffe3f166a4fcf2b532ab861a19bcb9acb101c0f5a535b6ab96167
-MISC ChangeLog 17566 RMD160 c0e801e58336351b3bafd2dcb9290411cdb1252d SHA1 c1ab48d77e54e9df8182498324dbdcd347ce515d SHA256 2a3c24fa583bf5a9be41ec3658b3859542654591a4bd040eec4e07cdb2e4a947
+MISC ChangeLog 17809 RMD160 7029f6670d714e085ff50451446ef6f6765ff8ab SHA1 b85b22b090a47a1f2d97a6559613780717d14fda SHA256 afd8abad6ce9148409832d52c565243c940caa0a9f1383474363352fd9b12ac4
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHqQLpNQqtfCuFneMRArwZAJ4yQGwgdG1Ni8N20Oh7yS/iiI2hhQCdEwK5
-ogHfrBmzDd/3YkRsc9mvENk=
-=ZMtN
+iD8DBQFHwb7pj9hvisErhMIRAnurAKCM8Gth3U6z65G1sgg35UrEaFFTuwCg39aG
+Vp+D7UTPNwoTauvQACAHQc8=
+=9LTu
 -----END PGP SIGNATURE-----