forced lilo to always install manfiles into usr/share/man vs usr/man

3 files changed, 9 insertions, 244 deletions

diff --git a/sys-boot/lilo/ChangeLog b/sys-boot/lilo/ChangeLog
index 1fc33ed33387..ad5c84e3e0d0 100644
--- a/sys-boot/lilo/ChangeLog
+++ b/sys-boot/lilo/ChangeLog
@@ -1,244 +1,9 @@
 # ChangeLog for sys-boot/lilo
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/ChangeLog,v 1.16 2004/06/28 01:48:08 agriffis Exp $
+# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/ChangeLog,v 1.17 2004/07/03 18:58:35 solar Exp $
 
-  27 Jun 2004; Aron Griffis <agriffis@gentoo.org> lilo-22.5.8-r3.ebuild,
-  lilo-22.5.9-r1.ebuild:
-  QA - fix use invocation
+*lilo-22.5.9-r1 (03 Jul 2004)
 
-*lilo-22.5.9-r1 (10 Jun 2004)
+  03 Jul 2004; <solar@gentoo.org> lilo-22.5.9-r1.ebuild:
+  forced lilo to always install manfiles into usr/share/man vs usr/man
 
-  10 Jun 2004; Tony Vroon <chainsaw@gentoo.org>
-  files/lilo-22.5.9-devmapper_gentoo.patch, +lilo-22.5.9-r1.ebuild:
-  Device mapper support patch updated by Christophe Saout <christophe@saout.de>
-  in bug #53413. Will only install the dolilo config file as an example, to make
-  sure rewrite mode is disabled by default. Closes bug #53462.
-
-*lilo-22.5.9 (09 Jun 2004)
-
-  09 Jun 2004; Tony Vroon <chainsaw@gentoo.org> files/lilo-22.5.9-devmapper_gentoo.patch:
-  Rediffed patch as it failed to apply properly. Fixes reopened bug #53413.
-
-  09 Jun 2004; Tony Vroon <chainsaw@gentoo.org> metadata.xml,
-  +files/lilo-22.5.9-correct-usage-info.patch,
-  +files/lilo-22.5.9-create-install-dirs.patch,
-  +files/lilo-22.5.9-devmapper_gentoo.patch,
-  +files/lilo-22.5.9-glibc233.patch, +files/lilo-22.5.9-lvm.2-6headers.patch,
-  +lilo-22.5.9.ebuild:
-  New revision, adds 'static' USE-flag.
-  Fixes bugs #40562, #43554, #53173 and #53413.
-
-  12 May 2004; Alexander Gabert <pappy@gentoo.org> lilo-22.5.8.ebuild:
-  added flag-o-matic eclass
-
-  12 May 2004; Alexander Gabert <pappy@gentoo.org> lilo-22.5.1.ebuild,
-  lilo-22.5.7.2.ebuild, lilo-22.5.8-r1.ebuild, lilo-22.5.8-r2.ebuild,
-  lilo-22.5.8-r3.ebuild, lilo-22.5.8.ebuild:
-  changed hardened PIC PIE flag logic for all lilo ebuilds
-
-  11 May 2004; Michael Sterrett <mr_bones_@gentoo.org> lilo-22.5.8-r3.ebuild:
-  fix dep
-
-*lilo-22.5.8-r3 (09 May 2004)
-
-  09 May 2004; Thomas Raschbacher <lordvan@gentoo.org> +lilo-22.5.8-r3.ebuild:
-  new revision - added devmap USE for device-mapper patch & dep
-  fixes Bug #48243; Thanks to Solar and Andrej Kacian.
-
-  20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
-  lilo-22.5.8-r1.ebuild, lilo-22.5.8-r2.ebuild:
-  Fixed borkage relating to -fPIC usage in default specs.  Fix by tseng, thanks.
-
-*lilo-22.5.8-r2 (13 Apr 2004)
-
-  13 Apr 2004; Thomas Raschbacher <lordvan@gentoo.org> lilo-22.5.8-r2.ebuild,
-  files/lilo-22.5.8-devmapper_gentoo.patch:
-  Added patch for lilo to work with device-mapper volumes (
-  http://www.saout.de/misc/ changed the patch to work with gentoo's
-  device-mapper install )
-
-  08 Feb 2004; Martin Schlemmer <azarah@gentoo.org> lilo-22.5.8-r1.ebuild,
-  files/lilo-22.5.8-create-install-dirs.patch:
-  Fix creation of install dirs, bug #39405. Patch thanks to Ed Grimm
-  <paranoid@gentoo.evolution.tgape.org>.
-
-  01 Feb 2004; <plasmaroo@gentoo.org> lilo-22.5.8-r1.ebuild,
-  files/lilo-22.5.8.lvm.2-6headers.patch:
-  Added a patch to get LILO to compile on 2.6 headers; closes bug #32707.
-
-  19 Jan 2004; Martin Schlemmer <azarah@gentoo.org> lilo-22.5.8-r1.ebuild:
-  Mark stable closing bug #38685.
-
-*lilo-22.5.8 (08 Dec 2003)
-
-  08 Dec 2003; Seemant Kulleen <seemant@gentoo.org> lilo-22.1-r3.ebuild,
-  lilo-22.3.3-r1.ebuild, lilo-22.3.4.ebuild, lilo-22.5.1.ebuild,
-  lilo-22.5.6-r2.ebuild, lilo-22.5.6-r3.ebuild, lilo-22.5.7.2.ebuild,
-  lilo-22.5.8-r1.ebuild, lilo-22.5.8.ebuild, metadata.xml,
-  files/lilo-22.5.6-animated-menu.patch, files/lilo-22.5.6-glibc233.patch,
-  files/lilo.conf:
-  moved from sys-apps to sys-boot
-
-  12 Nov 2003; Alexander Gabert <pappy@gentoo.org> lilo-22.5.8-r1.ebuild:
-  added hardened-gcc -yet_exec flags for gcc building lilo which has assembler
-  parts in it
-
-*lilo-22.5.8-r1 (06 Nov 2003)
-
-  06 Nov 2003; Martin Schlemmer <azarah@gentoo.org> lilo-22.5.8-r1.ebuild:
-  Get the build to actually use gcc as $CC; remove the hardened crap.
-
-*lilo-22.5.8 (13 Oct 2003)
-
-  13 Oct 2003; Martin Schlemmer <azarah@gentoo.org> lilo-22.5.8.ebuild:
-  Update version.
-
-  07 Sep 2003; Alexander Gabert <pappy@gentoo.org> lilo-22.5.1.ebuild,
-  lilo-22.5.7.2.ebuild:
-  added hardened-gcc excludes
-
-*lilo-22.5.7.2 (01 Sep 2003)
-
-  01 Sep 2003; Martin Schlemmer <azarah@gentoo.org> lilo-22.5.7.2.ebuild:
-  Update, closes bug #27141.
-
-*lilo-22.5.1 (05 Aug 2003)
-
-  05 Aug 2003; Martin Schlemmer <azarah@gentoo.org> lilo-22.5.1.ebuild:
-  Add back lilo-22.5.1 ebuild that I removed by mistake.
-
-  03 Aug 2003; Martin Schlemmer <azarah@gentoo.org> lilo-22.5.6-r3.ebuild,
-  files/lilo-22.5.6-animated-menu.patch, files/lilo-22.5.6-glibc233.patch:
-  Add fixes for latest libc. Mask again until the 'timeout=' option can be fixed
-  (for my friend chip).
-
-*lilo-22.5.6-r3 (03 Aug 2003)
-
-  03 Aug 2003; Martin Schlemmer <azarah@gentoo.org> lilo-22.5.6-r3.ebuild,
-  files/lilo-22.5.6-animated-menu.patch:
-  Add updated animated graphical bootmenu support (bug #19397), thanks to
-  Quequero <quequero@bitchx.it>.
-
-*lilo-22.5.6-r2 (17 Jul 2003)
-
-  17 Jul 2003; Martin Schlemmer <azarah@gentoo.org> lilo-22.5.6-r2.ebuild,
-  files/lilo.conf:
-  More cleanups.  Remove the loaders (*.b files), as they are no longer needed.
-  Add the 'disk=' examples to lilo.conf (bug #24035), thanks to Kidion
-  <david_en_clarina@zonnet.nl>.
-
-  16 Jul 2003; Martin Schlemmer <azarah@gentoo.org> lilo-22.5.6-r1.ebuild:
-  Cleanup the build again.  Fix my BOOTS kludge, and remove the patch.
-
-*lilo-22.5.6-r1 (14 Jul 2003)
-
-  14 Jul 2003; Patrick Kursawe <phosphan@gentoo.org> lilo-22.5.6-r1.ebuild,
-  lilo-22.5.6.ebuild, files/dot-b-files.patch:
-  Didn't install all .b files - bug 24368
-
-  11 Jul 2003; Patrick Kursawe <phosphan@gentoo.org> lilo-22.5.6.ebuild:
-  Added entry with "obsolete" to SRC_URI which should work in the future.
-
-*lilo-22.5.6 (10 Jul 2003)
-
-  10 Jul 2003; Patrick Kursawe <phosphan@gentoo.org> lilo-22.5.6.ebuild:
-  Version bump. Using new download URI which quite likely will have to be
-  changed to .../obsolete/ soon :-(
-
-  10 Jul 2003; Patrick Kursawe <phosphan@gentoo.org> lilo-22.3.4.ebuild,
-  lilo-22.5.1.ebuild, lilo-22.5.5.ebuild:
-  Updated SRC_URI, tarballs were moved to /obsolete. Ebuilds for new versions
-  should perhaps try ftp://metalab.unc.edu/pub/Linux/system/boot/lilo, at least
-  this location is encouraged in announcement as the "main distribution site".
-
-*lilo-22.5.5 (24 Jun 2003)
-
-  24 Jun 2003; Martin Schlemmer <azarah@gentoo.org> lilo-22.5.5.ebuild:
-  New version.
-
-  03 Apr 2003; Martin Schlemmer <azarah@gentoo.org> lilo-22.5.1.ebuild :
-  Set OPTS down to -O1 to fix a problem where lilo sometimes locked at
-  boot.
-
-*lilo-22.5.1 (30 Mar 2003)
-
-  30 Mar 2003; Martin Schlemmer <azarah@gentoo.org> lilo-22.5.1.ebuild :
-  New version.  Added support to detect if lilo is used as boot loader,
-  and then run /sbin/lilo.
-
-  24 Jan 2002; <woodchip@gentoo.org> *.ebuild : Reorder mount-boot.eclass
-  function, clean some fluff.
-
-*lilo-22.3.4 (04 Jan 2002)
-
-  24 Feb 2003; Nicholas Wourms <dragon@gentoo.org> lilo-22.3.4.ebuild :
-  This is definitely not for mips.
-
-  06 Jan 2002; Seemant Kulleen <seemant@gentoo.org> *.ebuild :
-  PROVIDE virtual/bootloader
-
-  04 Jan 2002; Donny Davies <woodchip@gentoo.org> :
-  New testing release.
-
-  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
- 
-*lilo-22.3.3-r1 (22 Sep 2002)
-
-  24 Feb 2003; Nicholas Wourms <dragon@gentoo.org> lilo-22.3.3-r1.ebuild :
-  This is definitely not for mips.
-
-  29 Sep 2002; Donny Davies <woodchip@gentoo.org> :
-  Several fixes + cosmetic issues.  #7898, #8057, #7903.
-
-  22 Sep 2002; Donny Davies <woodchip@gentoo.org> :
-  Now uses mount-boot.eclass.  Created new patch a la Suse.
-
-*lilo-22.3.3 (3 Sep 2002)
-
-  3 Sep 2002; Martin Schlemmer <azarah@gentoo.org> :
-  Updated version.
-
-*lilo-21.7.5-r2 (8 Apr 2002)
-
-  20 Jul 2002; Mark Guertin <gerk@gentoo.org> :
-  Adjusted keywords
-
-  14 Jul 2002; phoen][x <phoenix@gentoo.org> lilo-21.7.5-r2.ebuild :
-  Added LICENSE, KEYWORDS, SLOT.
-
-  8 Apr 2002; Donny Davies <woodchip@gentoo.org> lilo-21.7.5-r2.ebuild,
-  lilo-21.7.5-r1.ebuild, lilo-22.1-r2.ebuild :
-  Sync pkg_setup() with lilo-22.1-r3 and added the sample lilo.conf.
-
-*lilo-22.1-r3 (5 Apr 2002)
-
-  24 Feb 2003; Nicholas Wourms <dragon@gentoo.org> lilo-22.1-r3.ebuild :
-  This is definitely not for mips.
-
-  14 Jul 2002; phoen][x <phoenix@gentoo.org> lilo-22.1-r3.ebuild :
-  Added LICENSE, KEYWORDS, SLOT.
-  Removed the stale ebuilds.
-
-  5 Apr 2002; M.Schlemmer <azarah@gentoo.org> lilo-22.1-r3.ebuild :
-  Fix the /boot issue finally (hopefully :P).  Add $ROOT checking afterwards.
-
-*lilo-22.1-r2 (4 Feb 2002)
-
-  4 Feb 2002; G.Bevin <gbevin@gentoo.org> lilo-22.1-r2.ebuild :  
-  Added new setup function which detects if /boot is mounted or not, in case
-  it's not mounted it will try to do it automatically and in case of a failure
-  exit with an error message.
-  
-*lilo-21.7.5-r1 (2 Feb 2002)
-
-  2 Feb 2002; Donny Davies <woodchip@gentoo.org> lilo-22.1-r1.ebuild:
-  Added several patches from SuSE for animated boot logos.
-
-*lilo-22.1-r1 (1 Feb 2002)
-
-  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :  
-  Added initial ChangeLog which should be updated whenever the package is
-  updated in any way. This changelog is targetted to users. This means that the
-  comments should well explained and written in clean English. The details about
-  writing correct changelogs are explained in the skel.ChangeLog file which you
-  can find in the root directory of the portage repository.
diff --git a/sys-boot/lilo/Manifest b/sys-boot/lilo/Manifest
index 8c7387bfec05..1f7fe10e3d52 100644
--- a/sys-boot/lilo/Manifest
+++ b/sys-boot/lilo/Manifest
@@ -1,9 +1,9 @@
 MD5 aaba1e239412a893dd30b8ce53603d26 lilo-22.5.8-r2.ebuild 4451
-MD5 a0abd8ccbaa3ed165652e3f60c530af2 lilo-22.5.9-r1.ebuild 5250
+MD5 e56348ae56c8b06eaa13762e55442c21 lilo-22.5.9-r1.ebuild 5300
 MD5 fcf6e453bb787b12ca84de9773e0655c lilo-22.5.8-r1.ebuild 4335
 MD5 0b4fc8ce5ee804af28889d87991dd8d2 lilo-22.5.8-r3.ebuild 4627
 MD5 566aa7affcfb6e2e37c3f38e0e655325 lilo-22.5.8.ebuild 4044
-MD5 cc87baacac102d03a2760341946fa7aa ChangeLog 9283
+MD5 9df95d637490ecc08bf52d9f9b4b856f ChangeLog 9410
 MD5 eeee4743c4e463eeed3a7a4c15380e0d metadata.xml 254
 MD5 45847050f78ebbd2b2d89c03f6a08fb4 files/lilo-22.5.8-devmapper_gentoo.patch 11889
 MD5 ab2657bc635313522eb791e30b1166ef files/lilo-22.5.9-correct-usage-info.patch 683
diff --git a/sys-boot/lilo/lilo-22.5.9-r1.ebuild b/sys-boot/lilo/lilo-22.5.9-r1.ebuild
index 4af0c8231703..0e0ae947817c 100644
--- a/sys-boot/lilo/lilo-22.5.9-r1.ebuild
+++ b/sys-boot/lilo/lilo-22.5.9-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/lilo-22.5.9-r1.ebuild,v 1.3 2004/06/28 01:48:08 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/lilo-22.5.9-r1.ebuild,v 1.4 2004/07/03 18:58:35 solar Exp $
 
 inherit eutils flag-o-matic
 
@@ -61,10 +61,10 @@ src_unpack() {
 	epatch ${FILESDIR}/${P}-create-install-dirs.patch
 	# Correctly document commandline options -v and -V, bug #43554
 	epatch ${FILESDIR}/${P}-correct-usage-info.patch
+	sed -i -e s,usr/man,usr/share/man,g ${S}/Makefile
 }
 
 src_compile() {
-
 	# hardened automatic PIC plus PIE building should be suppressed
 	# because of assembler instructions that cannot be compiled PIC
 	HARDENED_CFLAGS="`test_flag -fno-pic` `test_flag -nopie`"