summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Stubbs <jstubbs@gentoo.org>2005-05-02 01:32:35 +0000
committerJason Stubbs <jstubbs@gentoo.org>2005-05-02 01:32:35 +0000
commitc5207dc3f6b6706a44c96f0354b250cc1576e0c3 (patch)
treecd88652166b57e6d0cc59e7ca23bb01919e8c743 /sys-apps
parentRemoving old ebuilds. (diff)
downloadhistorical-c5207dc3f6b6706a44c96f0354b250cc1576e0c3.tar.gz
historical-c5207dc3f6b6706a44c96f0354b250cc1576e0c3.tar.bz2
historical-c5207dc3f6b6706a44c96f0354b250cc1576e0c3.zip
Updates galore..
Package-Manager: portage-1.524.2.69-cvs
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/portage/Manifest11
-rw-r--r--sys-apps/portage/files/2.0.51.20-fixes.patch201
-rw-r--r--sys-apps/portage/files/digest-portage-2.0.51.20-r51
-rw-r--r--sys-apps/portage/files/digest-portage-2.0.51.211
-rw-r--r--sys-apps/portage/portage-2.0.51.21.ebuild (renamed from sys-apps/portage/portage-2.0.51.20-r5.ebuild)17
5 files changed, 7 insertions, 224 deletions
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 2f65fc078c28..ddc942d1fa8d 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -6,18 +6,17 @@ MD5 c697b628359c7055961817876804f0a6 metadata.xml 221
MD5 b169f143c9eb3069924e41f10e8d40ac portage-2.0.51-r15.ebuild 13133
MD5 f9fd4371c2fb44b47a0a5d3cfd4f118c portage-2.0.51.18.ebuild 13211
MD5 985b398e1a2d623efa13c1c1fbe18119 portage-2.0.51.19.ebuild 13211
-MD5 dda3e1390650b36d3600e8a4aa91c15e portage-2.0.51.20-r5.ebuild 6063
+MD5 41c117da4ca9677b88151355edf34adf portage-2.0.51.21.ebuild 5629
MD5 a754ca9e2eea9f8484bf5f93d339043a files/README.RESCUE 1911
MD5 99e1115b7cb92bf81695feace57456da files/digest-portage-2.0.51-r15 71
MD5 4458663c2aa36fb828981a89ffcaac97 files/digest-portage-2.0.51.18 70
MD5 f8627c17a73d8568e94f92ea15c69360 files/digest-portage-2.0.51.19 70
MD5 8c6ba58bbfddca72824b15dacbed69ec files/gcc-2.95-libsandbox.patch 1163
-MD5 5f2f342d78aec333f4136420afd6a31f files/digest-portage-2.0.51.20-r5 70
-MD5 6e8c5fcce08e1dff0adc43bacec164c4 files/2.0.51.20-fixes.patch 8265
+MD5 3fac4cafcb4ac61518899a75b420cf7b files/digest-portage-2.0.51.21 70
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
-iD8DBQFCbizdxvWNPsk/ZP4RArWvAKCyvIxFdnUalpVp+/o0gexM7XuLMwCbB2i+
-2n5XfBMp7fAQny9t1fxppeI=
-=qbdl
+iD8DBQFCdYM9xvWNPsk/ZP4RAsXZAJ93LIERJqIkcZwb+sG3WyFogNIHMQCgvJD8
+RmZMFAuJaowDQTDJP70D8Ws=
+=sH9+
-----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/files/2.0.51.20-fixes.patch b/sys-apps/portage/files/2.0.51.20-fixes.patch
deleted file mode 100644
index 1e6f6270f3e0..000000000000
--- a/sys-apps/portage/files/2.0.51.20-fixes.patch
+++ /dev/null
@@ -1,201 +0,0 @@
-diff -uNr portage-2.0.51.20.orig/bin/dispatch-conf portage-2.0.51.20/bin/dispatch-conf
---- portage-2.0.51.20.orig/bin/dispatch-conf 2005-04-17 18:01:55.000000000 +0900
-+++ portage-2.0.51.20/bin/dispatch-conf 2005-04-26 20:21:29.000000000 +0900
-@@ -186,7 +186,7 @@
- elif c == 'm':
- merged = SCRATCH_DIR+"/"+os.path.basename(conf['current'])
- print
-- os.system (conf['merge'] % (merged, conf ['current'], newconf))
-+ os.system (self.options['merge'] % (merged, conf ['current'], newconf))
- shutil.copyfile(merged, mrgconf)
- os.remove(merged)
- mystat = os.lstat(conf['new'])
-diff -uNr portage-2.0.51.20.orig/bin/ebuild.sh portage-2.0.51.20/bin/ebuild.sh
---- portage-2.0.51.20.orig/bin/ebuild.sh 2005-04-21 00:19:03.000000000 +0900
-+++ portage-2.0.51.20/bin/ebuild.sh 2005-04-26 20:21:29.000000000 +0900
-@@ -400,6 +400,8 @@
- }
-
- econf() {
-+ local LOCAL_EXTRA_ECONF="${EXTRA_ECONF}"
-+
- if [ -z "${ECONF_SOURCE}" ]; then
- ECONF_SOURCE="."
- fi
-@@ -415,11 +417,11 @@
- fi
-
- if [ ! -z "${CBUILD}" ]; then
-- EXTRA_ECONF="--build=${CBUILD} ${EXTRA_ECONF}"
-+ LOCAL_EXTRA_ECONF="--build=${CBUILD} ${LOCAL_EXTRA_ECONF}"
- fi
-
- if [ ! -z "${CTARGET}" ]; then
-- EXTRA_ECONF="--target=${CTARGET} ${EXTRA_ECONF}"
-+ LOCAL_EXTRA_ECONF="--target=${CTARGET} ${LOCAL_EXTRA_ECONF}"
- fi
-
- # if the profile defines a location to install libs to aside from default, pass it on.
-@@ -452,7 +454,7 @@
- CONF_LIBDIR_RESULT="${CONF_LIBDIR_RESULT//\/\///}"
- done
-
-- EXTRA_ECONF="--libdir=${CONF_LIBDIR_RESULT} ${EXTRA_ECONF}"
-+ LOCAL_EXTRA_ECONF="--libdir=${CONF_LIBDIR_RESULT} ${LOCAL_EXTRA_ECONF}"
- fi
-
- echo "${ECONF_SOURCE}/configure" \
-@@ -463,7 +465,7 @@
- --datadir=/usr/share \
- --sysconfdir=/etc \
- --localstatedir=/var/lib \
-- ${EXTRA_ECONF} \
-+ ${LOCAL_EXTRA_ECONF} \
- "$@"
-
- if ! "${ECONF_SOURCE}/configure" \
-@@ -474,7 +476,7 @@
- --datadir=/usr/share \
- --sysconfdir=/etc \
- --localstatedir=/var/lib \
-- ${EXTRA_ECONF} \
-+ ${LOCAL_EXTRA_ECONF} \
- "$@" ; then
-
- if [ -s config.log ]; then
-@@ -1627,8 +1629,7 @@
- addread "${CCACHE_DIR}"
- addwrite "${CCACHE_DIR}"
-
-- [ -z "${CCACHE_SIZE}" ] && export CCACHE_SIZE="500M"
-- ccache -M ${CCACHE_SIZE} &> /dev/null
-+ [ -z "${CCACHE_SIZE}" ] && ccache -M ${CCACHE_SIZE} &> /dev/null
- fi
-
- # XXX: Load up the helper functions.
-diff -uNr portage-2.0.51.20.orig/bin/emerge portage-2.0.51.20/bin/emerge
---- portage-2.0.51.20.orig/bin/emerge 2005-04-23 15:26:45.000000000 +0900
-+++ portage-2.0.51.20/bin/emerge 2005-04-26 20:21:29.000000000 +0900
-@@ -119,10 +119,24 @@
- def sorted_versions(verlist):
- ret = []
- for ver in verlist:
-+ verparts = ver.split("-")
-+ if len(verparts) == 2:
-+ verrev = int(verparts[1][1:])
-+ else:
-+ verrev = 0
- x = 0
- while x < len(ret):
-- if portage.vercmp(ret[x], ver) >= 0:
-+ retparts = ret[x].split("-")
-+ verdiff = portage.vercmp(retparts[0], verparts[0])
-+ if verdiff > 0:
- break
-+ elif verdiff == 0:
-+ if len(retparts) == 2:
-+ retrev = int(retparts[1][1:])
-+ else:
-+ retrev = 0
-+ if retrev >= verrev:
-+ break
- x += 1
- ret.insert(x, ver)
- return ret
-diff -uNr portage-2.0.51.20.orig/bin/repoman portage-2.0.51.20/bin/repoman
---- portage-2.0.51.20.orig/bin/repoman 2005-04-23 16:26:04.000000000 +0900
-+++ portage-2.0.51.20/bin/repoman 2005-04-26 20:21:29.000000000 +0900
-@@ -1399,7 +1399,7 @@
- mysigs=[]
- if myheaders or myupdates or myremoved or mynew:
- myfiles=myheaders+myupdates+myremoved+mynew
-- for x in range(len(myfiles), -1, -1):
-+ for x in range(len(myfiles)-1, -1, -1):
- if not os.path.exists(myfiles[x]) or not os.path.isdir(myfiles[x]):
- del myfiles[x]
- mydone=[]
-diff -uNr portage-2.0.51.20.orig/pym/dispatch_conf.py portage-2.0.51.20/pym/dispatch_conf.py
---- portage-2.0.51.20.orig/pym/dispatch_conf.py 2005-04-17 18:01:55.000000000 +0900
-+++ portage-2.0.51.20/pym/dispatch_conf.py 2005-04-26 20:21:29.000000000 +0900
-@@ -33,7 +33,10 @@
-
- for key in mandatory_opts:
- if not opts.has_key(key):
-- print >> sys.stderr, 'dispatch-conf: Missing option "%s" in /etc/dispatch-conf.conf; fatal' % (key,)
-+ if key == "merge":
-+ opts["merge"] = "sdiff --suppress-common-lines --output=%s %s %s"
-+ else:
-+ print >> sys.stderr, 'dispatch-conf: Missing option "%s" in /etc/dispatch-conf.conf; fatal' % (key,)
-
- if not os.path.exists(opts['archive-dir']):
- os.mkdir(opts['archive-dir'])
-diff -uNr portage-2.0.51.20.orig/pym/portage.py portage-2.0.51.20/pym/portage.py
---- portage-2.0.51.20.orig/pym/portage.py 2005-04-23 16:39:43.000000000 +0900
-+++ portage-2.0.51.20/pym/portage.py 2005-04-26 20:21:29.000000000 +0900
-@@ -4,7 +4,7 @@
- # $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/files/2.0.51.20-fixes.patch,v 1.1 2005/04/26 11:58:51 jstubbs Exp $
- cvs_id_string="$Id: 2.0.51.20-fixes.patch,v 1.1 2005/04/26 11:58:51 jstubbs Exp $"[5:-2]
-
--VERSION="2.0.51.20"
-+VERSION="2.0.51.20-r5"
-
- # ===========================================================================
- # START OF IMPORTS -- START OF IMPORTS -- START OF IMPORTS -- START OF IMPORT
-@@ -1192,7 +1192,7 @@
- if "maketest" in self.features and "test" not in self.features:
- self.features.append("test")
-
-- if not portage_exec.sandbox_capable and "sandbox" in self.features or "usersandbox" in self.features:
-+ if not portage_exec.sandbox_capable and ("sandbox" in self.features or "usersandbox" in self.features):
- writemsg(red("!!! Problem with sandbox binary. Disabling...\n\n"))
- if "sandbox" in self.features:
- self.features.remove("sandbox")
-@@ -2518,12 +2518,14 @@
- spawn("chown "+str(portage_uid)+":"+str(portage_gid)+" "+mysettings["CCACHE_DIR"], mysettings, free=1)
- spawn("chmod -R u+rw "+mysettings["CCACHE_DIR"], mysettings, free=1)
- spawn("chmod -R g+rw "+mysettings["CCACHE_DIR"], mysettings, free=1)
-+ spawn("find "+mysettings["CCACHE_DIR"]+" -type d -exec chmod g+s \{\} \;", mysettings, free=1)
- else:
- if mystat[stat.ST_UID] != 0 or ((mystat[stat.ST_MODE]&02070)!=02070):
- spawn("chgrp -R "+str(portage_gid)+" "+mysettings["CCACHE_DIR"], mysettings, free=1)
- spawn("chown 0:"+str(portage_gid)+" "+mysettings["CCACHE_DIR"], mysettings, free=1)
- spawn("chmod -R u+rw "+mysettings["CCACHE_DIR"], mysettings, free=1)
- spawn("chmod -R g+rw "+mysettings["CCACHE_DIR"], mysettings, free=1)
-+ spawn("find "+mysettings["CCACHE_DIR"]+" -type d -exec chmod g+s \{\} \;", mysettings, free=1)
- except OSError, e:
- print "!!! File system problem. (ReadOnly? Out of space?)"
- print "!!! Perhaps: rm -Rf",mysettings["BUILD_PREFIX"]
-@@ -5661,6 +5663,7 @@
- self.populate()
- origcp=mylist[1]
- newcp=mylist[2]
-+ mynewcat=newcp.split("/")[0]
- origmatches=self.dbapi.cp_list(origcp)
- if not origmatches:
- return
-@@ -6652,10 +6655,23 @@
- if self.isprotected(mydest):
- # Use md5 of the target in ${D} if it exists...
- if os.path.exists(os.path.normpath(srcroot+myabsto)):
-- mydest = new_protect_filename(myrealdest, newmd5=portage_checksum.perform_md5(srcroot+myabsto))
-+ try:
-+ mydest = new_protect_filename(myrealdest, newmd5=portage_checksum.perform_md5(srcroot+myabsto))
-+ except IOError:
-+ print "========================================"
-+ print "mysrc",mysrc
-+ print "mymode",mymode
-+ print "myabsto",myabsto
-+ print "myto",myto
-+ print "myrealto",myrealto
-+ print "mydest",mydest
-+ print "mydmode",mydmode
-+ print "========================================"
-+ print "Please file the above in bug #71787"
-+ sys.exit(1)
- else:
- mydest = new_protect_filename(myrealdest, newmd5=portage_checksum.perform_md5(myabsto))
--
-+
- # if secondhand==None it means we're operating in "force" mode and should not create a second hand.
- if (secondhand!=None) and (not os.path.exists(myrealto)):
- # either the target directory doesn't exist yet or the target file doesn't exist -- or
diff --git a/sys-apps/portage/files/digest-portage-2.0.51.20-r5 b/sys-apps/portage/files/digest-portage-2.0.51.20-r5
deleted file mode 100644
index 50f1663b40b0..000000000000
--- a/sys-apps/portage/files/digest-portage-2.0.51.20-r5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2a954eb155660fea05276f648816de34 portage-2.0.51.20.tar.bz2 254269
diff --git a/sys-apps/portage/files/digest-portage-2.0.51.21 b/sys-apps/portage/files/digest-portage-2.0.51.21
new file mode 100644
index 000000000000..58a1a9e8a3d8
--- /dev/null
+++ b/sys-apps/portage/files/digest-portage-2.0.51.21
@@ -0,0 +1 @@
+MD5 6309551a32a71b621d880327e1318a09 portage-2.0.51.21.tar.bz2 248384
diff --git a/sys-apps/portage/portage-2.0.51.20-r5.ebuild b/sys-apps/portage/portage-2.0.51.21.ebuild
index cc28a80647b0..06a99347f4b5 100644
--- a/sys-apps/portage/portage-2.0.51.20-r5.ebuild
+++ b/sys-apps/portage/portage-2.0.51.21.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.51.20-r5.ebuild,v 1.1 2005/04/26 11:58:51 jstubbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.51.21.ebuild,v 1.1 2005/05/02 01:32:35 jstubbs Exp $
inherit toolchain-funcs
@@ -27,7 +27,6 @@ python_has_lchown() {
src_unpack() {
unpack ${A}
- patch -d ${S} -p1 -g0 < ${FILESDIR}/2.0.51.20-fixes.patch
}
src_compile() {
@@ -94,7 +93,6 @@ src_install() {
dosym ../lib/portage/bin/portageq /usr/bin/portageq
dosym ../lib/portage/bin/ebuild /usr/bin/ebuild
dosym ../lib/portage/bin/quickpkg /usr/bin/quickpkg
- dosym ../lib/portage/bin/g-cpan.pl /usr/bin/g-cpan.pl
dosym ../lib/portage/bin/env-update /usr/sbin/env-update
dosym ../lib/portage/bin/ebuild /usr/sbin/ebuild
@@ -123,19 +121,6 @@ pkg_postinst() {
[ -f "${ROOT}etc/make.conf" ] || touch ${ROOT}etc/make.conf
- #disable global sandbox if it's active (it's been deprecated)
- if [ -f /etc/ld.so.preload ] ; then
- cp /etc/ld.so.preload ${T}
- grep -v libsandbox ${T}/ld.so.preload > /etc/ld.so.preload
- fi
-
- #yank old cache files
- if [ -d /var/cache/edb ]
- then
- rm -f /var/cache/edb/xcache.p
- rm -f /var/cache/edb/mtimes
- fi
-
install -o root -g portage -m 0755 -d "${ROOT}/etc/portage"
if [ ! -f "${ROOT}/var/lib/portage/world" ] &&