Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/sys-apps
diff options
context:
space:
mode:
authorSeemant Kulleen <seemant@gentoo.org>2003-03-26 23:04:29 +0000
committerSeemant Kulleen <seemant@gentoo.org>2003-03-26 23:04:29 +0000
commit2e7ce5d2588966ecc5b6b931069eb9fff94c66f2 (patch)
treebfccb1204334bf377b9b255395bbe3c3de06fbf6 /sys-apps
parentversion bumpage (diff)
downloadgentoo-2-2e7ce5d2588966ecc5b6b931069eb9fff94c66f2.tar.gz
gentoo-2-2e7ce5d2588966ecc5b6b931069eb9fff94c66f2.tar.bz2
gentoo-2-2e7ce5d2588966ecc5b6b931069eb9fff94c66f2.zip
version bump to debian stable's current stable
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/debianutils/ChangeLog8
-rw-r--r--sys-apps/debianutils/debianutils-1.16.7.ebuild (renamed from sys-apps/debianutils/debianutils-1.16.3.ebuild)15
-rw-r--r--sys-apps/debianutils/debianutils-1.16.ebuild48
-rw-r--r--sys-apps/debianutils/files/debianutils-1.16.7-gentoo.patch73
-rw-r--r--sys-apps/debianutils/files/digest-debianutils-1.161
-rw-r--r--sys-apps/debianutils/files/digest-debianutils-1.16.31
6 files changed, 88 insertions, 58 deletions
diff --git a/sys-apps/debianutils/ChangeLog b/sys-apps/debianutils/ChangeLog
index 4eab90f99b84..44ae3eabaa92 100644
--- a/sys-apps/debianutils/ChangeLog
+++ b/sys-apps/debianutils/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for sys-apps/debianutils
# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/debianutils/ChangeLog,v 1.14 2003/03/08 00:08:25 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/debianutils/ChangeLog,v 1.15 2003/03/26 23:04:29 seemant Exp $
+
+*debianutils-1.16.7 (26 Mar 2003)
+
+ 26 Mar 2003; Seemant Kulleen <seemant@gentoo.org> debianutils-1.16.7.ebuild,
+ files/debianutils-1.16.7-gentoo.patch:
+ version bump
21 Feb 2003; Zach Welch <zwelch@gentoo.org> debianutils-1.16.3.ebuild :
Added arm to keywords.
diff --git a/sys-apps/debianutils/debianutils-1.16.3.ebuild b/sys-apps/debianutils/debianutils-1.16.7.ebuild
index 318a3e71d4fb..08ad758b48db 100644
--- a/sys-apps/debianutils/debianutils-1.16.3.ebuild
+++ b/sys-apps/debianutils/debianutils-1.16.7.ebuild
@@ -1,32 +1,33 @@
# Copyright 1999-2003 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/debianutils/debianutils-1.16.3.ebuild,v 1.13 2003/03/07 20:59:54 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/debianutils/debianutils-1.16.7.ebuild,v 1.1 2003/03/26 23:04:29 seemant Exp $
-inherit eutils
-
-IUSE=""
+IUSE="static build"
S=${WORKDIR}/${P}
DESCRIPTION="A selection of tools from Debian"
SRC_URI="http://ftp.debian.org/debian/pool/main/d/${PN}/${PN}_${PV}.tar.gz"
HOMEPAGE="http://packages.debian.org/unstable/base/debianutils.html"
-KEYWORDS="x86 ppc sparc alpha mips hppa arm"
SLOT="0"
LICENSE="GPL-2 BSD SMAIL"
-IUSE="static build"
+KEYWORDS="x86 ppc sparc alpha mips hppa arm"
DEPEND="virtual/glibc"
+RDEPEND="sys-apps/bzip2"
+
src_unpack() {
unpack ${A}
cd ${S}
- epatch ${FILESDIR}/${P}-Makefile-gentoo.diff
# 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
}
src_compile() {
diff --git a/sys-apps/debianutils/debianutils-1.16.ebuild b/sys-apps/debianutils/debianutils-1.16.ebuild
deleted file mode 100644
index 80525eb3bdef..000000000000
--- a/sys-apps/debianutils/debianutils-1.16.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/debianutils/debianutils-1.16.ebuild,v 1.14 2003/02/13 15:52:01 vapier Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="A selection of tools from Debian"
-SRC_URI="http://ftp.debian.org/debian/pool/main/d/${PN}/${PN}_${PV}.tar.gz"
-HOMEPAGE="http://packages.debian.org/unstable/base/debianutils.html"
-KEYWORDS="x86 ppc sparc alpha"
-SLOT="0"
-LICENSE="GPL-2 BSD SMAIL"
-IUSE="static build"
-
-DEPEND="virtual/glibc"
-
-src_unpack() {
- unpack ${A}
- cd ${S}
- patch -p0 < ${FILESDIR}/${P}-Makefile-gentoo.diff
-}
-
-src_compile() {
- if [ -z "`use static`" ]
- then
- pmake || die
- else
- pmake LDFLAGS=-static || die
- fi
-}
-
-src_install() {
- into /
- dobin readlink tempfile mktemp
-
- if [ -z "`use build`" ]
- then
- dobin run-parts
- insopts -m755
- exeinto /usr/sbin
- doexe savelog
-
- into /usr
- doman mktemp.1 readlink.1 tempfile.1 run-parts.8 savelog.8
-
- cd debian
- dodoc changelog control copyright
- fi
-}
diff --git a/sys-apps/debianutils/files/debianutils-1.16.7-gentoo.patch b/sys-apps/debianutils/files/debianutils-1.16.7-gentoo.patch
new file mode 100644
index 000000000000..221286455ddb
--- /dev/null
+++ b/sys-apps/debianutils/files/debianutils-1.16.7-gentoo.patch
@@ -0,0 +1,73 @@
+diff -urN debianutils-1.16.3/installkernel debianutils-1.16.3.azarah/installkernel
+--- debianutils-1.16.3/installkernel 2002-06-13 14:22:33.000000000 +0200
++++ debianutils-1.16.3.azarah/installkernel 2002-09-26 23:07:52.000000000 +0200
+@@ -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
+diff -urN debianutils-1.16.3/mkboot debianutils-1.16.3.azarah/mkboot
+--- debianutils-1.16.3/mkboot 2002-02-19 02:03:17.000000000 +0200
++++ debianutils-1.16.3.azarah/mkboot 2002-09-26 23:10:00.000000000 +0200
+@@ -14,7 +14,13 @@
+
+ # 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/qpkg ] ; then
++ [ "$(qpkg -nc sys-apps/grub)" = "sys-apps/grub *" ]
++ else
++ return 1
++ fi
+ }
+
+ # check whether LILO is installed
+@@ -94,7 +100,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."
+@@ -144,6 +150,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"
+@@ -151,16 +167,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
diff --git a/sys-apps/debianutils/files/digest-debianutils-1.16 b/sys-apps/debianutils/files/digest-debianutils-1.16
deleted file mode 100644
index 2e620b6ea254..000000000000
--- a/sys-apps/debianutils/files/digest-debianutils-1.16
+++ /dev/null
@@ -1 +0,0 @@
-MD5 15c4b4d7f2e6bb9dde1f885cd0de360e debianutils_1.16.tar.gz 24962
diff --git a/sys-apps/debianutils/files/digest-debianutils-1.16.3 b/sys-apps/debianutils/files/digest-debianutils-1.16.3
deleted file mode 100644
index f2bf1a14d149..000000000000
--- a/sys-apps/debianutils/files/digest-debianutils-1.16.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b8989cad421f8c846ea4a17b5bffe152 debianutils_1.16.3.tar.gz 25226