summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2005-07-01 00:04:39 +0000
committerMike Frysinger <vapier@gentoo.org>2005-07-01 00:04:39 +0000
commit2e2307027ab8785ad602622b7e7ada2a0888847c (patch)
tree33f24dd9efc21e38d4a3bf4a919d6d9ce7a6ed01 /sys-apps/man
parentI'll take care of netatalk from now on. (diff)
downloadhistorical-2e2307027ab8785ad602622b7e7ada2a0888847c.tar.gz
historical-2e2307027ab8785ad602622b7e7ada2a0888847c.tar.bz2
historical-2e2307027ab8785ad602622b7e7ada2a0888847c.zip
fix patch to be correct
Package-Manager: portage-2.0.51.22-r1
Diffstat (limited to 'sys-apps/man')
-rw-r--r--sys-apps/man/ChangeLog4
-rw-r--r--sys-apps/man/Manifest24
-rw-r--r--sys-apps/man/files/man-1.6-parallel-make.patch26
3 files changed, 33 insertions, 21 deletions
diff --git a/sys-apps/man/ChangeLog b/sys-apps/man/ChangeLog
index 934ec83d0850..50ff432a663d 100644
--- a/sys-apps/man/ChangeLog
+++ b/sys-apps/man/ChangeLog
@@ -1,10 +1,10 @@
# ChangeLog for sys-apps/man
# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/ChangeLog,v 1.69 2005/06/30 10:18:45 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/ChangeLog,v 1.70 2005/07/01 00:04:39 vapier Exp $
30 Jun 2005; Luca Barbato <lu_zero@gentoo.org>
+files/man-1.6-parallel-make.patch, man-1.6.ebuild:
- Proper fix by Octavio Ruiz (Ta^3) <tacvbo@tacvbo.net> fixes bug #97439
+ Proper fix by Octavio Ruiz (Ta^3) fixes bug #97439.
30 Jun 2005; Luca Barbato <lu_zero@gentoo.org> man-1.6.ebuild:
Forced -j1 in the ebuild
diff --git a/sys-apps/man/Manifest b/sys-apps/man/Manifest
index 74ca8521d339..bd4a150ecc0f 100644
--- a/sys-apps/man/Manifest
+++ b/sys-apps/man/Manifest
@@ -1,12 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 f8110e4f866320bf931b4d71f43b2642 man-1.6.ebuild 2546
-MD5 8ddc30ced25dd8e48b069d8c24738d2b ChangeLog 10226
MD5 9c896566b39c57595f9b9c807aa05a00 man-1.5p.ebuild 2574
-MD5 80f2a25fb0b5692f39a1990527a93271 files/man-1.5m-groff-1.18.patch 923
+MD5 f8110e4f866320bf931b4d71f43b2642 man-1.6.ebuild 2546
+MD5 b5a737a99f981150d0cd332039b15670 ChangeLog 10206
MD5 90c01e3cfecc4bc92266780a9be71429 files/digest-man-1.6 59
-MD5 d27759c6ed98d4cfc152ea86c72b6dfa files/man-1.6-parallel-make.patch 1077
-MD5 a1fe892ffb27e5e044ed342b611d2db1 files/makewhatis.cron 126
-MD5 148b7ee661e1e9384930fbd508dd5027 files/man-1.5p-parallel-make.patch 437
-MD5 6d6e219c5e8357b2d60e92e0ac88d76b files/digest-man-1.5p 60
+MD5 80f2a25fb0b5692f39a1990527a93271 files/man-1.5m-groff-1.18.patch 923
MD5 14e1c7533927dfb89900ee788666b342 files/man-1.5p-defmanpath-symlinks.patch 663
+MD5 6d6e219c5e8357b2d60e92e0ac88d76b files/digest-man-1.5p 60
+MD5 148b7ee661e1e9384930fbd508dd5027 files/man-1.5p-parallel-make.patch 437
+MD5 a1fe892ffb27e5e044ed342b611d2db1 files/makewhatis.cron 126
+MD5 bc796c3f2d1f9becb3d0bedc1b6dc051 files/man-1.6-parallel-make.patch 1033
MD5 7b2b00aace5bcdb963286e235eaf22b2 files/man-1.5p-search-order.patch 519
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCxIisgIKl8Uu19MoRAiHnAJ0XlnMFWJQkvSf6K5uGeWWTfEJmVACfX6oG
+bNLNBlmqq1HnUKKbm0QKjNM=
+=Hm+H
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/man/files/man-1.6-parallel-make.patch b/sys-apps/man/files/man-1.6-parallel-make.patch
index dbf8c8e82bff..172ba5f84fcd 100644
--- a/sys-apps/man/files/man-1.6-parallel-make.patch
+++ b/sys-apps/man/files/man-1.6-parallel-make.patch
@@ -1,6 +1,9 @@
-diff -ur man-1.6.orig/Makefile.in man-1.6/Makefile.in
---- man-1.6.orig/Makefile.in 2005-06-30 04:38:50.000000000 -0500
-+++ man-1.6/Makefile.in 2005-06-30 04:39:21.000000000 -0500
+Fix parallel building
+
+src/Makefile.in fixes by Octavio Ruiz http://bugs.gentoo.org/97439
+
+--- man-1.6/Makefile.in
++++ man-1.6/Makefile.in
@@ -33,13 +33,13 @@
source: src/Makefile
cd src; $(MAKE)
@@ -17,15 +20,14 @@ diff -ur man-1.6.orig/Makefile.in man-1.6/Makefile.in
% cd msgs; $(MAKE)
%gencat/gencat:
-diff -ur man-1.6.orig/src/Makefile.in man-1.6/src/Makefile.in
---- man-1.6.orig/src/Makefile.in 2005-06-30 04:38:50.000000000 -0500
-+++ man-1.6/src/Makefile.in 2005-06-30 04:39:21.000000000 -0500
-@@ -56,7 +56,7 @@
+--- man-1.6/src/Makefile.in
++++ man-1.6/src/Makefile.in
+@@ -52,7 +52,7 @@
+ man-config.o man-getopt.o man.o manpath.o to_cat.o: defs.h
+ different.o man.o: different.h
+ man.o manfile.o: glob.h
+-different.o gripes.o man-config.o man-getopt.o man.o manpath.o util.o: gripes.h gripedefs.h
++different.o gripes.o man-config.o man-getopt.o man.o manfile.o manpath.o util.o: gripes.h gripedefs.h
different.o man-config.o man-getopt.o man.o manpath.o: man-config.h
gripes.o man-config.o man-getopt.o man.o manpath.o util.o: man.h
man-getopt.o man.o manpath.o: man-getopt.h
--man.o manfile.o to_cat.o: manfile.h
-+man.o manfile.o to_cat.o: manfile.h gripes.h gripedefs.h
- man.o man-iconv.o: man-iconv.h
- man.o manpath.o: manpath.h
- man-config.o: paths.h