summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Robbins <drobbins@gentoo.org>2000-08-14 17:43:01 +0000
committerDaniel Robbins <drobbins@gentoo.org>2000-08-14 17:43:01 +0000
commit78cb24d2b6d01cb52e69e5bb49f5cc6c0d3003b7 (patch)
treebf905acdf60ab56c82528c669a95f08414088703 /sys-apps
parentsmall fix so that rev 0 works ok (diff)
downloadgentoo-2-78cb24d2b6d01cb52e69e5bb49f5cc6c0d3003b7.tar.gz
gentoo-2-78cb24d2b6d01cb52e69e5bb49f5cc6c0d3003b7.tar.bz2
gentoo-2-78cb24d2b6d01cb52e69e5bb49f5cc6c0d3003b7.zip
digest fix, sed update
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/portage/files/ebuild24
-rw-r--r--sys-apps/sed/files/digest2
-rw-r--r--sys-apps/sed/sed-3.02-r1.ebuild25
3 files changed, 17 insertions, 34 deletions
diff --git a/sys-apps/portage/files/ebuild b/sys-apps/portage/files/ebuild
index 6869c5d458ba..1805cd016038 100644
--- a/sys-apps/portage/files/ebuild
+++ b/sys-apps/portage/files/ebuild
@@ -2,10 +2,6 @@
# Copyright 1999-2000 Daniel Robbins, Gentoo Technologies, Inc.
# Distributed under the GPL
-export PROXY
-export HTTP_PROXY
-export FTP_PROXY
-
if [ "`whoami`" != "root" ]
then
echo "Since ebuild can modify critical system files, only root is"
@@ -14,6 +10,10 @@ then
fi
source /etc/make.conf
+export PROXY
+export HTTP_PROXY
+export FTP_PROXY
+
initvars() {
#fix up ROOT path so that it always has a / after it
@@ -154,9 +154,17 @@ digest_check() {
then
echo
echo '!!!'" No message digest found for ${1}."
- echo '!!!'" Maintainer: ebuild digest to update message digests."
- echo
- return 1
+ if [ -n "$MAINTAINER" ]
+ then
+ echo '>>> Maintainer mode: auto-computing digests.'
+ dyn_digest
+ echo
+ return 0
+ else
+ echo '!!!'" Maintainer: ebuild digest to update message digests."
+ echo
+ return 1
+ fi
fi
local mydigest=`md5sum ${DISTDIR}/${1} | cut -f1 -d" "`
if [ "$mycdigest" != "$mydigest" ]
@@ -210,7 +218,7 @@ dyn_fetch() {
digest_check ${y}
if [ $? -ne 0 ]
then
- exit 1
+ exit 1
fi
done
}
diff --git a/sys-apps/sed/files/digest b/sys-apps/sed/files/digest
index 17541881d32e..eb3052c500e7 100644
--- a/sys-apps/sed/files/digest
+++ b/sys-apps/sed/files/digest
@@ -1 +1 @@
-MD5 74db866f052b47fa8ec1c2b8f967bc69 sed-3.02.tar.gz
+MD5 2d960d1629bac872de97a693f2ce4410 sed-3.02a.tar.gz
diff --git a/sys-apps/sed/sed-3.02-r1.ebuild b/sys-apps/sed/sed-3.02-r1.ebuild
deleted file mode 100644
index 49ac90ecfcea..000000000000
--- a/sys-apps/sed/sed-3.02-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sed/sed-3.02-r1.ebuild,v 1.1 2000/08/02 17:07:14 achim Exp $
-
-P="sed-3.02"
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="Super-useful stream editor"
-CATEGORY="sys-apps"
-SRC_URI="ftp://prep.ai.mit.edu/gnu/sed/${A}"
-
-src_compile() {
- ./configure --prefix=/usr --host=${CHOST}
- make
-}
-
-src_install() {
- into /usr
- doinfo doc/sed.info
- doman doc/sed.1
- dobin sed/sed
- dodoc COPYING NEWS README* THANKS TODO AUTHORS BUGS ANNOUNCE
-}
-