From: Mike Frysinger <vapier@gentoo.org>
Date: Wed, 12 Jan 2005 18:34:13 +0000 (+0000)
Subject: Version bump.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6360399be9d58e4d8dca6059bd548627ac457de2;p=gentoo.git

Version bump.
---

diff --git a/sys-apps/gawk/ChangeLog b/sys-apps/gawk/ChangeLog
index 218e4a1f35b0..eed42bf9d6f7 100644
--- a/sys-apps/gawk/ChangeLog
+++ b/sys-apps/gawk/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/gawk
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gawk/ChangeLog,v 1.47 2004/11/22 06:03:16 vapier Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gawk/ChangeLog,v 1.48 2005/01/12 18:27:53 vapier Exp $
+
+*gawk-3.1.4 (12 Jan 2005)
+
+  12 Jan 2005; Mike Frysinger <vapier@gentoo.org> gawk-3.1.3-r2.ebuild,
+  +gawk-3.1.4.ebuild:
+  Version bump.
 
 *gawk-3.1.3-r2 (22 Nov 2004)
 
diff --git a/sys-apps/gawk/files/digest-gawk-3.1.4 b/sys-apps/gawk/files/digest-gawk-3.1.4
new file mode 100644
index 000000000000..a8f0b595ff36
--- /dev/null
+++ b/sys-apps/gawk/files/digest-gawk-3.1.4
@@ -0,0 +1 @@
+MD5 3c8935efb9fdc7202720894279ad04a7 gawk-3.1.4.tar.gz 2260582
diff --git a/sys-apps/gawk/gawk-3.1.3-r1.ebuild b/sys-apps/gawk/gawk-3.1.3-r1.ebuild
index 4262172844dc..aa181c7b2afe 100644
--- a/sys-apps/gawk/gawk-3.1.3-r1.ebuild
+++ b/sys-apps/gawk/gawk-3.1.3-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gawk/gawk-3.1.3-r1.ebuild,v 1.22 2004/11/14 21:08:05 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gawk/gawk-3.1.3-r1.ebuild,v 1.23 2005/01/12 18:27:53 vapier Exp $
 
 inherit eutils gnuconfig toolchain-funcs
 
diff --git a/sys-apps/gawk/gawk-3.1.3-r2.ebuild b/sys-apps/gawk/gawk-3.1.3-r2.ebuild
index 5b1b4aeec50e..922c449965c0 100644
--- a/sys-apps/gawk/gawk-3.1.3-r2.ebuild
+++ b/sys-apps/gawk/gawk-3.1.3-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gawk/gawk-3.1.3-r2.ebuild,v 1.1 2004/11/22 06:03:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gawk/gawk-3.1.3-r2.ebuild,v 1.2 2005/01/12 18:27:53 vapier Exp $
 
 inherit eutils toolchain-funcs
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/gawk/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86"
 IUSE="nls build uclibc"
 
 RDEPEND="virtual/libc"
diff --git a/sys-apps/gawk/gawk-3.1.4.ebuild b/sys-apps/gawk/gawk-3.1.4.ebuild
new file mode 100644
index 000000000000..a99edfc59130
--- /dev/null
+++ b/sys-apps/gawk/gawk-3.1.4.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gawk/gawk-3.1.4.ebuild,v 1.1 2005/01/12 18:27:53 vapier Exp $
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="GNU awk pattern-matching language"
+HOMEPAGE="http://www.gnu.org/software/gawk/gawk.html"
+SRC_URI="mirror://gnu/gawk/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="nls build uclibc"
+
+RDEPEND="virtual/libc"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+
+src_unpack() {
+	unpack ${A}
+
+	# Copy filefuncs module's source over ...
+	cp -PR "${FILESDIR}"/filefuncs "${WORKDIR}"/ || die "cp failed"
+
+	cd ${S}
+	# support for dec compiler.
+	[[ $(tc-getCC) == "ccc" ]] && epatch ${FILESDIR}/${PN}-3.1.2-dec-alpha-compiler.diff
+}
+
+src_compile() {
+	econf --bindir=/bin $(use_enable nls) || die
+	emake || die "emake failed"
+
+	cd ../filefuncs
+	emake AWKINCDIR="${S}" CC=$(tc-getCC) || die "filefuncs emake failed"
+}
+
+src_install() {
+	make install DESTDIR="${D}" || die "install failed"
+	cd ../filefuncs
+	make \
+		DESTDIR="${D}" \
+		AWKINCDIR="${S}" \
+		install \
+		|| die "filefuncs install failed"
+
+	dodir /usr/bin
+	# In some rare cases, (p)gawk gets installed as (p)gawk- and not
+	# (p)gawk-${PV} ..  Also make sure that /bin/(p)gawk is a symlink
+	# to /bin/(p)gawk-${PV}.
+	local x=
+	for x in gawk pgawk igawk ; do
+		local binpath="/bin"
+
+		case ${x} in
+			igawk|pgawk)
+				binpath="/usr/bin"
+				;;
+		esac
+
+		if [ -f "${D}/bin/${x}" -a ! -f "${D}/bin/${x}-${PV}" ]
+		then
+			mv -f ${D}/bin/${x} ${D}/${binpath}/${x}-${PV}
+		elif [ -f "${D}/bin/${x}-" -a ! -f "${D}/bin/${x}-${PV}" ]
+		then
+			mv -f ${D}/bin/${x}- ${D}/${binpath}/${x}-${PV}
+		elif [ "${binpath}" = "/usr/bin" -a -f "${D}/bin/${x}-${PV}" ]
+		then
+			mv -f ${D}/bin/${x}-${PV} ${D}/${binpath}/${x}-${PV}
+		fi
+
+		rm -f ${D}/bin/${x}
+		dosym ${x}-${PV} ${binpath}/${x}
+		[[ ${binpath} == "/usr/bin" ]] && dosym /usr/bin/${x}-${PV} /bin/${x}
+	done
+
+	rm -f "${D}"/bin/awk
+	dosym gawk-${PV} /bin/awk
+	# Compat symlinks
+	dodir /usr/bin
+	dosym /bin/gawk-${PV} /usr/bin/awk
+	dosym /bin/gawk-${PV} /usr/bin/gawk
+
+	# Install headers
+	insinto /usr/include/awk
+	for x in ${S}/*.h ; do
+		# We do not want 'acconfig.h' in there ...
+		[[ -f ${x} && ${x/acconfig.h/} == ${x} ]] && doins ${x}
+	done
+
+	if ! use build ; then
+		cd ${S}
+		dosym gawk.1.gz /usr/share/man/man1/awk.1.gz
+		dodoc AUTHORS ChangeLog FUTURES LIMITATIONS NEWS PROBLEMS POSIX.STD README
+		docinto README_d
+		dodoc README_d/*
+		docinto awklib
+		dodoc awklib/ChangeLog
+		docinto pc
+		dodoc pc/ChangeLog
+		docinto posix
+		dodoc posix/ChangeLog
+	else
+		rm -r "${D}"/usr/share
+	fi
+}
diff --git a/sys-apps/help2man/ChangeLog b/sys-apps/help2man/ChangeLog
index 9fe64a14fbb2..2a478887ab31 100644
--- a/sys-apps/help2man/ChangeLog
+++ b/sys-apps/help2man/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/help2man
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/help2man/ChangeLog,v 1.17 2005/01/02 23:21:26 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/help2man/ChangeLog,v 1.18 2005/01/12 18:30:57 vapier Exp $
+
+*help2man-1.35.1 (12 Jan 2005)
+
+  12 Jan 2005; Mike Frysinger <vapier@gentoo.org> help2man-1.33.1.ebuild,
+  +help2man-1.35.1.ebuild:
+  Version bump.
 
   02 Jan 2005; Ciaran McCreesh <ciaranm@gentoo.org> :
   Change encoding to UTF-8 for GLEP 31 compliance
diff --git a/sys-apps/help2man/files/digest-help2man-1.35.1 b/sys-apps/help2man/files/digest-help2man-1.35.1
new file mode 100644
index 000000000000..f0790765ae61
--- /dev/null
+++ b/sys-apps/help2man/files/digest-help2man-1.35.1
@@ -0,0 +1 @@
+MD5 e3c9e846dd163eb7f1d1661e2d0baa07 help2man-1.35.1.tar.gz 76472
diff --git a/sys-apps/help2man/help2man-1.33.1.ebuild b/sys-apps/help2man/help2man-1.33.1.ebuild
index 6bfe48154dd0..6320b7585fbd 100644
--- a/sys-apps/help2man/help2man-1.33.1.ebuild
+++ b/sys-apps/help2man/help2man-1.33.1.ebuild
@@ -1,15 +1,14 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/help2man/help2man-1.33.1.ebuild,v 1.8 2005/01/02 23:21:26 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/help2man/help2man-1.33.1.ebuild,v 1.9 2005/01/12 18:30:57 vapier Exp $
 
-MY_P="${P/-/_}"
 DESCRIPTION="GNU utility to convert program --help output to a man page"
 HOMEPAGE="http://www.gnu.org/software/help2man"
-SRC_URI="http://ftp.gnu.org/gnu/help2man/${MY_P}.tar.gz"
+SRC_URI="http://ftp.gnu.org/gnu/help2man/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha ~amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 sh ~sparc ~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86"
 IUSE="nls"
 
 DEPEND="dev-lang/perl
diff --git a/sys-apps/help2man/help2man-1.35.1.ebuild b/sys-apps/help2man/help2man-1.35.1.ebuild
new file mode 100644
index 000000000000..718f6ea6f640
--- /dev/null
+++ b/sys-apps/help2man/help2man-1.35.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/help2man/help2man-1.35.1.ebuild,v 1.1 2005/01/12 18:30:57 vapier Exp $
+
+DESCRIPTION="GNU utility to convert program --help output to a man page"
+HOMEPAGE="http://www.gnu.org/software/help2man"
+SRC_URI="http://ftp.gnu.org/gnu/help2man/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="nls"
+
+RDEPEND="dev-lang/perl"
+DEPEND="${RDEPEND}
+	nls? ( dev-perl/Locale-gettext
+		>=sys-devel/gettext-0.12.1-r1 )"
+
+src_compile() {
+	econf $(use_enable nls) || die
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+	dodoc ChangeLog NEWS README THANKS
+}
diff --git a/sys-apps/man-pages/ChangeLog b/sys-apps/man-pages/ChangeLog
index 1a5c3e514d8c..4bee6de1e5b3 100644
--- a/sys-apps/man-pages/ChangeLog
+++ b/sys-apps/man-pages/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/man-pages
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/man-pages/ChangeLog,v 1.30 2004/12/19 18:06:35 vapier Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/man-pages/ChangeLog,v 1.31 2005/01/12 18:33:10 vapier Exp $
+
+*man-pages-2.01 (12 Jan 2005)
+
+  12 Jan 2005; Mike Frysinger <vapier@gentoo.org> +man-pages-2.01.ebuild:
+  Version bump.
 
 *man-pages-2.00 (19 Dec 2004)
 
diff --git a/sys-apps/man-pages/Manifest b/sys-apps/man-pages/Manifest
index 67e416fb4782..9c0acdf4de1f 100644
--- a/sys-apps/man-pages/Manifest
+++ b/sys-apps/man-pages/Manifest
@@ -1,16 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 0d4ebc004b071a78719deaf751305f3d ChangeLog 4078
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 595216264b95cc8dfc83ce68f3c8ca95 man-pages-1.70.ebuild 639
-MD5 90a8487bc0b1fdf954693283b2875b9b man-pages-2.00.ebuild 651
+MD5 d95f28a150d40c3f11df77c7e9748a4f man-pages-2.01.ebuild 639
 MD5 75b47d1d9e1715d399d3d84605040469 files/digest-man-pages-1.70 68
 MD5 3162ed89cf59d81c5e755f075f7a11c5 files/digest-man-pages-2.00 68
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFBxcM8roRuSHgZdywRAuCeAJ9Y9MD4X8XvpzPIQy+mF55orsobwwCfR3f/
-3+X6S/uCvaW1Sd9FXcLA/hs=
-=4Zlo
------END PGP SIGNATURE-----
+MD5 8d8e3bbc41de361f3adf148da48a5844 files/digest-man-pages-2.01 68
diff --git a/sys-apps/man-pages/files/digest-man-pages-2.01 b/sys-apps/man-pages/files/digest-man-pages-2.01
new file mode 100644
index 000000000000..85f0bfb931bb
--- /dev/null
+++ b/sys-apps/man-pages/files/digest-man-pages-2.01
@@ -0,0 +1 @@
+MD5 f417de446b7554cc33ea033a82525dae man-pages-2.01.tar.bz2 1671171
diff --git a/sys-apps/man-pages/man-pages-1.70.ebuild b/sys-apps/man-pages/man-pages-1.70.ebuild
index 80e2d30c3040..99a3ccd1b00f 100644
--- a/sys-apps/man-pages/man-pages-1.70.ebuild
+++ b/sys-apps/man-pages/man-pages-1.70.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/man-pages/man-pages-1.70.ebuild,v 1.2 2004/12/09 05:04:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/man-pages/man-pages-1.70.ebuild,v 1.3 2005/01/12 18:33:10 vapier Exp $
 
 DESCRIPTION="A somewhat comprehensive collection of Linux man pages"
 HOMEPAGE="http://www.win.tue.nl/~aeb/linux/man/"
diff --git a/sys-apps/man-pages/man-pages-2.00.ebuild b/sys-apps/man-pages/man-pages-2.00.ebuild
index 67783c98644e..53ce27a64977 100644
--- a/sys-apps/man-pages/man-pages-2.00.ebuild
+++ b/sys-apps/man-pages/man-pages-2.00.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/man-pages/man-pages-2.00.ebuild,v 1.1 2004/12/19 18:06:35 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/man-pages/man-pages-2.00.ebuild,v 1.2 2005/01/12 18:33:10 vapier Exp $
 
 DESCRIPTION="A somewhat comprehensive collection of Linux man pages"
 HOMEPAGE="http://www.win.tue.nl/~aeb/linux/man/"
diff --git a/sys-apps/man-pages/man-pages-2.01.ebuild b/sys-apps/man-pages/man-pages-2.01.ebuild
new file mode 100644
index 000000000000..4e8c2c39e28e
--- /dev/null
+++ b/sys-apps/man-pages/man-pages-2.01.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/man-pages/man-pages-2.01.ebuild,v 1.1 2005/01/12 18:33:10 vapier Exp $
+
+DESCRIPTION="A somewhat comprehensive collection of Linux man pages"
+HOMEPAGE="http://www.win.tue.nl/~aeb/linux/man/"
+SRC_URI="mirror://kernel/linux/docs/manpages/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+RDEPEND="sys-apps/man"
+
+src_compile() { :; }
+
+src_install() {
+	make install prefix="${D}" || die
+	dodoc man-pages-*.Announce README
+}
diff --git a/sys-apps/man/ChangeLog b/sys-apps/man/ChangeLog
index 359deaade9a3..71c5b990d4f1 100644
--- a/sys-apps/man/ChangeLog
+++ b/sys-apps/man/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-apps/man
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/ChangeLog,v 1.64 2005/01/08 02:23:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/ChangeLog,v 1.65 2005/01/12 18:29:48 vapier Exp $
+
+*man-1.5p (12 Jan 2005)
+
+  12 Jan 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/man-1.5p-defmanpath-symlinks.patch,
+  +files/man-1.5p-parallel-make.patch, +files/man-1.5p-search-order.patch,
+  +man-1.5p.ebuild:
+  Version bump.
 
 *man-1.5o_p2 (07 Jan 2005)
 
diff --git a/sys-apps/man/files/digest-man-1.5p b/sys-apps/man/files/digest-man-1.5p
new file mode 100644
index 000000000000..a87e48b72e5e
--- /dev/null
+++ b/sys-apps/man/files/digest-man-1.5p
@@ -0,0 +1 @@
+MD5 037d5644f8ef9ea0ef22b271bae0297d man-1.5p.tar.gz 233732
diff --git a/sys-apps/man/files/man-1.5p-defmanpath-symlinks.patch b/sys-apps/man/files/man-1.5p-defmanpath-symlinks.patch
new file mode 100644
index 000000000000..277f7a91f67a
--- /dev/null
+++ b/sys-apps/man/files/man-1.5p-defmanpath-symlinks.patch
@@ -0,0 +1,20 @@
+--- man-1.5o2/src/makewhatis.sh.orig	2005-01-07 21:19:37.812163552 -0500
++++ man-1.5o2/src/makewhatis.sh	2005-01-07 21:20:43.023249960 -0500
+@@ -41,7 +41,7 @@
+ # and should be first.
+ # It is a bug to add /var/cache/man to DEFCATPATH.
+ dm=
+-for d in /usr/man /usr/share/man /usr/X11R6/man /usr/local/man
++for d in /usr/local/man /usr/share/man
+ do
+     if [ -d $d ]; then
+ 	if [ x$dm = x ]; then dm=$d; else dm=$dm:$d; fi
+@@ -49,7 +49,7 @@
+ done
+ DEFMANPATH=$dm
+ dc=
+-for d in /usr/man/preformat /usr/man /usr/share/man/preformat /usr/share/man
++for d in /usr/local/man /usr/share/man
+ do
+     if [ -d $d ]; then
+ 	if [ x$dc = x ]; then dc=$d; else dc=$dc:$d; fi
diff --git a/sys-apps/man/files/man-1.5p-parallel-make.patch b/sys-apps/man/files/man-1.5p-parallel-make.patch
new file mode 100644
index 000000000000..22f15fd7eadc
--- /dev/null
+++ b/sys-apps/man/files/man-1.5p-parallel-make.patch
@@ -0,0 +1,18 @@
+--- Makefile.in.orig	2005-01-12 10:59:10.934526728 -0500
++++ Makefile.in	2005-01-12 11:01:22.765485376 -0500
+@@ -33,13 +33,13 @@
+ source:	src/Makefile
+ 	cd src; $(MAKE)
+ 
+-manhtml: man2html/Makefile
++manhtml: man2html/Makefile source
+ 	cd man2html; $(MAKE)
+ 
+ manpages: man/Makefile
+ 	cd man; $(MAKE) subdirs
+ 
+-%messages: gencat/gencat msgs/Makefile
++%messages: gencat/gencat msgs/Makefile source
+ %	cd msgs; $(MAKE)
+ 
+ %gencat/gencat:
diff --git a/sys-apps/man/files/man-1.5p-search-order.patch b/sys-apps/man/files/man-1.5p-search-order.patch
new file mode 100644
index 000000000000..a3cbd1201d9d
--- /dev/null
+++ b/sys-apps/man/files/man-1.5p-search-order.patch
@@ -0,0 +1,17 @@
+diff -Narup man-1.5p.orig/src/man.conf.in man-1.5p/src/man.conf.in
+--- man-1.5p.orig/src/man.conf.in	2002-07-17 15:08:40.000000000 -0400
++++ man-1.5p/src/man.conf.in	2002-12-19 09:04:28.000000000 -0500
+@@ -36,11 +36,11 @@
+ #
+ # Every automatically generated MANPATH includes these fields
+ #
+-MANPATH	/usr/man
+ MANPATH	/usr/share/man
+-MANPATH	/usr/local/man
+ MANPATH	/usr/local/share/man
+ MANPATH	/usr/X11R6/man
++MANPATH	/usr/local/man
++MANPATH	/usr/man
+ #
+ # Uncomment if you want to include one of these by default
+ #
diff --git a/sys-apps/man/man-1.5p.ebuild b/sys-apps/man/man-1.5p.ebuild
new file mode 100644
index 000000000000..bc2a9b7c3db5
--- /dev/null
+++ b/sys-apps/man/man-1.5p.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/man-1.5p.ebuild,v 1.1 2005/01/12 18:29:48 vapier Exp $
+
+inherit eutils flag-o-matic toolchain-funcs
+
+NV="${PV/_p}"
+DESCRIPTION="Standard commands to read man pages"
+HOMEPAGE="http://freshmeat.net/projects/man/"
+SRC_URI="mirror://kernel/linux/utils/man/man-${NV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="nls"
+
+DEPEND="virtual/libc
+	>=sys-apps/sed-4"
+RDEPEND="sys-apps/cronbase
+	>=sys-apps/groff-1.18
+	nls? ( sys-devel/gettext )"
+
+S="${WORKDIR}/${PN}-${NV}"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# Make sure we can build with -j :)
+	epatch ${FILESDIR}/man-1.5p-parallel-make.patch
+
+	# Fix search order in man.conf so that system installed manpages
+	# will be found first ...
+	epatch ${FILESDIR}/man-1.5p-search-order.patch
+
+	# For groff-1.18 or later we need to call nroff with '-c'
+	epatch ${FILESDIR}/man-1.5m-groff-1.18.patch
+
+	# makewhatis traverses manpages twice, as default manpath
+	# contains two directories that are symlinked together
+	epatch ${FILESDIR}/man-1.5p-defmanpath-symlinks.patch
+
+	# use non-lazy binds for man. And let portage handling stripping.
+	append-ldflags -Wl,-z,now
+	sed -i \
+		-e "/^LDFLAGS = -s/s:=.*:=${LDFLAGS}:" \
+		src/Makefile.in \
+		|| die "failed to edit default LDLFAGS"
+}
+
+src_compile() {
+	tc-export CC BUILD_CC
+
+	local myconf=
+	use nls && myconf="+lang all" || myconf="+lang none"
+	./configure \
+		-confdir=/etc \
+		+sgid +fhs \
+		${myconf} || die "configure failed"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	make PREFIX="${D}" install || die "make install failed"
+	dosym man /usr/bin/manpath
+
+	dodoc LSM README* TODO
+
+	exeinto /etc/cron.weekly
+	newexe "${FILESDIR}"/makewhatis.cron makewhatis
+
+	keepdir /var/cache/man
+	diropts -m0775 -g man
+	local mansects=$(grep ^MANSECT "${D}"/etc/man.conf | cut -f2-)
+	for x in ${mansects//:/ } ; do
+		keepdir /var/cache/man/cat${x}
+	done
+}
+
+pkg_postinst() {
+	einfo "Forcing sane permissions onto ${ROOT}/var/cache/man (Bug #40322)"
+	chown -R root:man "${ROOT}"/var/cache/man
+	chmod -R g+w "${ROOT}"/var/cache/man
+	[[ -e ${ROOT}/var/cache/man/whatis ]] \
+		&& chown root:root "${ROOT}"/var/cache/man/whatis
+
+	echo
+
+	local files=$(ls "${ROOT}"/etc/cron.{daily,weekly}/makewhatis{,.cron} 2>/dev/null)
+	if [[ ${files/$'\n'} != ${files} ]] ; then
+		ewarn "You have multiple makewhatis cron files installed."
+		ewarn "You might want to delete all but one of these:"
+		echo ${files}
+	fi
+}
diff --git a/sys-apps/miscfiles/ChangeLog b/sys-apps/miscfiles/ChangeLog
index e745c5502620..d1ab81667151 100644
--- a/sys-apps/miscfiles/ChangeLog
+++ b/sys-apps/miscfiles/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/miscfiles
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/miscfiles/ChangeLog,v 1.19 2004/09/23 05:47:31 robbat2 Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/miscfiles/ChangeLog,v 1.20 2005/01/12 18:34:13 vapier Exp $
+
+*miscfiles-1.4.2 (12 Jan 2005)
+
+  12 Jan 2005; Mike Frysinger <vapier@gentoo.org> +miscfiles-1.4.2.ebuild:
+  Version bump.
 
   22 Sep 2004; Robin H. Johnson <robbat2@gentoo.org> miscfiles-1.3-r1.ebuild:
   libc is NOT needed, come on people, this only installs textfiles...
diff --git a/sys-apps/miscfiles/files/digest-miscfiles-1.4.2 b/sys-apps/miscfiles/files/digest-miscfiles-1.4.2
new file mode 100644
index 000000000000..0e0baa0eb473
--- /dev/null
+++ b/sys-apps/miscfiles/files/digest-miscfiles-1.4.2
@@ -0,0 +1 @@
+MD5 04aa131278173731f40dd92e70cf7c4c miscfiles-1.4.2.tar.gz 1524786
diff --git a/sys-apps/miscfiles/miscfiles-1.3-r1.ebuild b/sys-apps/miscfiles/miscfiles-1.3-r1.ebuild
index 12ee1ce730ac..985183c6f4a8 100644
--- a/sys-apps/miscfiles/miscfiles-1.3-r1.ebuild
+++ b/sys-apps/miscfiles/miscfiles-1.3-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/miscfiles/miscfiles-1.3-r1.ebuild,v 1.13 2004/11/12 21:16:55 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/miscfiles/miscfiles-1.3-r1.ebuild,v 1.14 2005/01/12 18:34:13 vapier Exp $
 
 inherit eutils
 
diff --git a/sys-apps/miscfiles/miscfiles-1.4.2.ebuild b/sys-apps/miscfiles/miscfiles-1.4.2.ebuild
new file mode 100644
index 000000000000..31ac13424fe1
--- /dev/null
+++ b/sys-apps/miscfiles/miscfiles-1.4.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/miscfiles/miscfiles-1.4.2.ebuild,v 1.1 2005/01/12 18:34:13 vapier Exp $
+
+inherit eutils
+
+DESCRIPTION="Miscellaneous files"
+HOMEPAGE="http://www.gnu.org/directory/miscfiles.html"
+SRC_URI="ftp://ftp.gnu.org/gnu/miscfiles/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="minimal"
+
+DEPEND=""
+RDEPEND=""
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/miscfiles-1.3-Makefile.diff
+}
+
+src_install() {
+	make install prefix="${D}/usr" || die
+	dodoc GNU* NEWS ORIGIN README dict-README
+
+	if use minimal ; then
+		cd "${D}"/usr/share/dict
+		rm -f words extra.words README
+		gzip -9 *
+		ln -s web2.gz words
+		ln -s web2a.gz extra.words
+		ln -s connectives{.gz,}
+		ln -s propernames{.gz,}
+		cd ..
+		rm -r misc rfc
+	fi
+}