+++ /dev/null
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/debianutils/debianutils-1.16.7-r4.ebuild,v 1.17 2004/12/08 02:34:04 vapier Exp $
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="A selection of tools from Debian"
-HOMEPAGE="http://packages.debian.org/unstable/base/debianutils.html"
-SRC_URI="mirror://gentoo/${PN}_${PV}.tar.gz"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 ppc-macos s390 sh sparc x86"
-IUSE="static build"
-
-DEPEND="virtual/libc"
-RDEPEND="app-arch/bzip2"
-
-src_unpack() {
- unpack ${A}
-
- cd ${S}
-
- # Make installkernel and mkboot more Gentoo friendly
- # <azarah@gentoo.org> (25 Sep 2002)
- epatch ${FILESDIR}/${P}-gentoo.patch
-
- # Patch savelog to use bzip2 compression instead of gzip
- epatch ${FILESDIR}/${PN}-compress.patch
-
- # Get it to work with gcc-3.3
- # <azarah@gentoo.org> (18 May 2003)
- epatch ${FILESDIR}/${P}-gcc33.patch
-}
-
-src_compile() {
- use static && append-ldflags -static
- emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" || die
-}
-
-src_install() {
- into /
- dobin tempfile mktemp || die
-
- if ! use build
- then
- dobin run-parts
- insopts -m755
- exeinto /usr/sbin
- doexe savelog
- dosbin installkernel || die "installkernel"
- into /usr
- dosbin mkboot || die "mkboot"
-
- into /usr
- doman mktemp.1 tempfile.1 run-parts.8 savelog.8 \
- installkernel.8 mkboot.8
-
- cd debian
- dodoc changelog control
- fi
-}
+++ /dev/null
-diff -urpN debianutils-1.16.7/run-parts.c debianutils-1.16.7.azarah/run-parts.c
---- debianutils-1.16.7/run-parts.c 2003-05-19 00:54:27.000000000 +0200
-+++ debianutils-1.16.7.azarah/run-parts.c 2003-05-19 00:57:02.000000000 +0200
-@@ -55,10 +55,10 @@ void error (char *format,...)
- void version ()
- {
- fprintf (stderr, "Debian GNU/Linux run-parts program, version " VERSION
--"\nCopyright (C) 1994 Ian Jackson, Copyright (C) 1996 Jeff Noxon.
--Copyright (C) 1996,1997,1998,1999 Guy Maor
--This is free software; see the GNU General Public License version 2
--or later for copying conditions. There is NO warranty.
-+"\nCopyright (C) 1994 Ian Jackson, Copyright (C) 1996 Jeff Noxon.\n\
-+Copyright (C) 1996,1997,1998,1999 Guy Maor\n\
-+This is free software; see the GNU General Public License version 2\n\
-+or later for copying conditions. There is NO warranty.\n\
- ");
- exit (0);
- }
-@@ -66,14 +66,14 @@ or later for copying conditions. There
-
- void usage ()
- {
-- fprintf (stderr, "Usage: run-parts [OPTION]... DIRECTORY
-- --test print script names which would run, but don't run them.
-- --verbose print script names before running them.
-- --report print script names if they produce output.
-- --umask=UMASK sets umask to UMASK (octal), default is 022.
-- --arg=ARGUMENT pass ARGUMENT to scripts, use once for each argument.
-- --version output version information and exit.
-- --help display this help and exit.
-+ fprintf (stderr, "Usage: run-parts [OPTION]... DIRECTORY\n\
-+ --test print script names which would run, but don't run them.\n\
-+ --verbose print script names before running them.\n\
-+ --report print script names if they produce output.\n\
-+ --umask=UMASK sets umask to UMASK (octal), default is 022.\n\
-+ --arg=ARGUMENT pass ARGUMENT to scripts, use once for each argument.\n\
-+ --version output version information and exit.\n\
-+ --help display this help and exit.\n\
- ");
- exit(0);
- }
-diff -urpN debianutils-1.16.7/tempfile.c debianutils-1.16.7.azarah/tempfile.c
---- debianutils-1.16.7/tempfile.c 2002-09-28 21:17:03.000000000 +0200
-+++ debianutils-1.16.7.azarah/tempfile.c 2003-05-19 00:57:15.000000000 +0200
-@@ -17,7 +17,7 @@ usage (int status)
- fprintf(stderr, "Try `%s --help' for more information.\n", progname);
- else
- printf("Usage: %s [OPTION]\n\
--Create a temporary file in a safe manner.
-+Create a temporary file in a safe manner.\n\
- \n\
- -d, --directory=DIR place temporary file in DIR\n\
- -p, --prefix=STRING set temporary file's prefix to STRING\n\
+++ /dev/null
-diff -urN debianutils-1.16.7.old/installkernel debianutils-1.16.7/installkernel
---- debianutils-1.16.7.old/installkernel 2002-09-28 12:17:03.000000000 -0700
-+++ debianutils-1.16.7/installkernel 2003-04-03 16:16:55.000000000 -0800
-@@ -33,7 +33,7 @@
- cat "$2" > "$dir/$1-$ver"
-
- if [ -f "$dir/$1" ] ; then
-- if [ -L "$dir/$1" -a $(ls -l "$dir/$1" | awk '{print $11}') \
-+ if [ -L "$dir/$1" -a "$(ls -l "$dir/$1" | awk '{print $11}')" \
- = "$1-$ver" ] ; then
- ln -sf "$1-$ver.old" "$dir/$1.old"
- else
-@@ -53,4 +53,4 @@
- updatever config "$config"
- fi
-
--mkboot -i
-+/usr/sbin/mkboot -i
---- debianutils-1.16.7.old/mkboot 2002-10-16 20:20:42.000000000 -0700
-+++ debianutils-1.16.7/mkboot 2003-04-03 16:16:55.000000000 -0800
-@@ -14,7 +14,18 @@
-
- # check whether GRUB is installed
- grubcheck () {
-- [ $(dpkg -s grub | grep -i ^status: | cut -d ' ' -f 4) = "installed" ]
-+ # Right way in Gentoo to check, but grub is in system profile,
-+ # so rather check for lilo first....
-+ if [ -x /usr/bin/portageq ] ; then
-+ if portageq has_version / "sys-boot/grub" ; then
-+ return 0
-+ elif portageq has_version / "sys-boot/grub-static" ; then
-+ return 0
-+ fi
-+ return 1
-+ else
-+ return 1
-+ fi
- }
-
- # check whether LILO is installed
-@@ -90,7 +90,7 @@
-
- # make a boot disk
- makedisk () {
-- kernel=${1:-/vmlinuz}
-+ kernel=${1:-/boot/vmlinuz}
- if [ ! -r $kernel ] ; then
- echo "Error: Can't read $kernel."
- exit 1
-@@ -96,7 +102,7 @@
- fi
-
- boottype="lilo"
-- if [ $(whoami) != root ] ; then
-+ if [ "$(whoami)" != root ] ; then
- echo "Since you don't have root permissions, I can't put LILO on the diskette."
- echo "I will make a non-LILO diskette instead, but it won't be as useful. You"
- echo "can hit <Ctrl-C> to cancel."
-@@ -146,6 +152,16 @@
- echo "either make a bootable floppy diskette, re-run LILO, or have GRUB"
- echo "installed."
-
-+ lilocheck
-+ if [ $? -eq 0 ] ; then
-+ echo -en "\nShould I run /sbin/lilo? (y/n) "
-+ read input
-+ if [ "$input" = "y" ] ; then
-+ /sbin/lilo && exit 0
-+ echo "There was a problem running /sbin/lilo."
-+ fi
-+ fi
-+
- grubcheck
- if [ $? -eq 0 ] ; then
- echo -e "\nGRUB is installed. To automatically switch to new kernels, point your"
-@@ -153,16 +169,6 @@
- exit 0
- fi
-
-- lilocheck
-- if [ $? -eq 0 ] ; then
-- echo -en "\nShould I run /sbin/lilo? (y/n) "
-- read input
-- if [ "$input" = "y" ] ; then
-- /sbin/lilo && exit 0
-- echo "There was a problem running /sbin/lilo."
-- fi
-- fi
--
- echo -en "\nShould I make a bootdisk? (y/n) "
- read input
- if [ "$input" = "y" ] ; then
---- debianutils-1.16.7.old/run-parts.c 2002-10-16 21:19:37.000000000 -0700
-+++ debianutils-1.16.7/run-parts.c 2003-04-03 16:17:20.000000000 -0800
-@@ -120,7 +120,8 @@
- !fnmatch("*~", c, 0) ||
- !fnmatch("*.pre_fcopy", c, 0) ||
- !fnmatch("*.notslocate", c, 0) ||
-- !fnmatch("*.disabled", c, 0) );
-+ !fnmatch("*.disabled", c, 0) ||
-+ !fnmatch("*.keep", c, 0) );
- }
-
-
---- /usr/sbin/mkboot.orig 2004-10-05 20:12:50.198385480 -0400
-+++ /usr/sbin/mkboot 2004-10-05 20:13:29.477414160 -0400
+++ /dev/null
---- savelog.orig 2003-03-07 16:07:01.000000000 -0800
-+++ savelog 2003-03-07 16:08:13.000000000 -0800
-@@ -2,6 +2,8 @@
- # savelog - save a log file
- # Copyright (C) 1987, 1988 Ronald S. Karr and Landon Curt Noll
- # Copyright (C) 1992 Ronald S. Karr
-+# Slight modifications by Low Zhen Lin <lowzl@hotmail.com>:
-+# * Uses `bzip2' rather than `gzip'
- # Slight modifications by Ian A. Murdock <imurdock@gnu.ai.mit.edu>:
- # * uses `gzip' rather than `compress'
- # * doesn't use $savedir; keeps saved log files in the same directory
-@@ -69,8 +71,8 @@
-
- # common location
- export PATH=$PATH:/sbin:/bin:/usr/sbin:/usr/bin
--COMPRESS="gzip -9f"
--DOT_Z=".gz"
-+COMPRESS="bzip2 -9f"
-+DOT_Z=".bz2"
-
- # parse args
- exitcode=0 # no problems to far
+++ /dev/null
-MD5 7ff426c92daf7fab4d19dcec81f27800 debianutils_1.16.7.tar.gz 26097
projects / gentoo.git / commitdiff