diff options
author | Nicholas Jones <carpaski@gentoo.org> | 2004-02-10 01:47:51 +0000 |
---|---|---|
committer | Nicholas Jones <carpaski@gentoo.org> | 2004-02-10 01:47:51 +0000 |
commit | 924c6ece1fc986a88d0a828198dfe4d1b7826f56 (patch) | |
tree | 21d8307a63081474e44f360ddc9dc96bc652d9b1 /sys-apps | |
parent | ~hppa (diff) | |
download | historical-924c6ece1fc986a88d0a828198dfe4d1b7826f56.tar.gz historical-924c6ece1fc986a88d0a828198dfe4d1b7826f56.tar.bz2 historical-924c6ece1fc986a88d0a828198dfe4d1b7826f56.zip |
New portage that fixes the emerge-fails-with-no-profile bug along with the ldconfig bug and a few other minor things.
Diffstat (limited to 'sys-apps')
-rw-r--r-- | sys-apps/portage/ChangeLog | 12 | ||||
-rw-r--r-- | sys-apps/portage/Manifest | 12 | ||||
-rw-r--r-- | sys-apps/portage/files/digest-portage-2.0.49-r20 | 1 | ||||
-rw-r--r-- | sys-apps/portage/files/digest-portage-2.0.50-r1 | 1 | ||||
-rw-r--r-- | sys-apps/portage/files/digest-portage-2.0.50_pre21 | 1 | ||||
-rw-r--r-- | sys-apps/portage/files/digest-portage-2.0.50_pre22 | 1 | ||||
-rw-r--r-- | sys-apps/portage/portage-2.0.49-r20.ebuild | 306 | ||||
-rw-r--r-- | sys-apps/portage/portage-2.0.50-r1.ebuild (renamed from sys-apps/portage/portage-2.0.50_pre21.ebuild) | 107 | ||||
-rw-r--r-- | sys-apps/portage/portage-2.0.50.ebuild | 71 | ||||
-rw-r--r-- | sys-apps/portage/portage-2.0.50_pre22.ebuild | 280 |
10 files changed, 134 insertions, 658 deletions
diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog index 8957e3800558..490aa3a448e6 100644 --- a/sys-apps/portage/ChangeLog +++ b/sys-apps/portage/ChangeLog @@ -1,17 +1,7 @@ # ChangeLog for sys-apps/portage # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.27 2003/11/06 15:42:29 brad_mssw Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.28 2004/02/10 01:47:51 carpaski Exp $ # See the gentoo-src Portage ChangeLog for up-to-date release information: # http://www.gentoo.org/cgi-bin/viewcvs.cgi/portage/ChangeLog?rev=HEAD&cvsroot=gentoo-src&content-type=text/vnd.viewcvs-markup -*portage-2.0.49-r15 (06 Nov 2003) - - 06 Nov 2003; Brad House <brad_mssw@gentoo.org> portage-2.0.49-r15.ebuild: - mark stable on amd64 - -*portage-2.0.49-r16 (04 Nov 2003) - - 04 Nov 2003; Brad House <brad_mssw@gentoo.org> portage-2.0.49-r16.ebuild: - mark as stable for amd64 - diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest index efd803511050..cdc1f831ac20 100644 --- a/sys-apps/portage/Manifest +++ b/sys-apps/portage/Manifest @@ -1,17 +1,13 @@ MD5 4143452262e01976a763e0a4c87b6058 portage-2.0.49-r21.ebuild 10463 -MD5 d822fb423a0ac812af1c5b665455ef82 portage-2.0.50_pre22.ebuild 9083 -MD5 f0b4ccf65097624d8e23fa33f75425d8 portage-2.0.50.ebuild 9171 -MD5 dbc739d33fdd409bd2f7973e35689abb portage-2.0.49-r20.ebuild 10524 -MD5 3d889f27da546b08d93c8e44dd378019 portage-2.0.50_pre21.ebuild 10516 -MD5 2264df67fab8f5ab427e536d7e32f497 ChangeLog 695 +MD5 6656f9e483d6aa4b88f7b4153881239a portage-2.0.50.ebuild 10943 +MD5 93e9ceb4ee5450a7e2dfed26ad3571e1 portage-2.0.50-r1.ebuild 10946 +MD5 11b450108bb4370da5918f1ffd07b269 ChangeLog 420 MD5 4ec0f0ae9676b9d2d227d737d508306b metadata.xml 165 MD5 b6989b04bc0ab44de75cf82ab47698fa files/portage-rescue-2.0.48-r1-sparc.tbz2 227629 MD5 35519288ced0c9c3a2893d16e666a5cf files/portage-rescue-2.0.49-r3-alpha.tbz2 284986 -MD5 769354495275ded3f6894b2e586802b8 files/digest-portage-2.0.49-r20 71 MD5 078bf046d839129b0efe44362beeeda3 files/digest-portage-2.0.49-r21 71 -MD5 05503d7d26699322d53105a8e5933bff files/digest-portage-2.0.50_pre21 73 -MD5 283bc5bddc369ccd143343602964b6a3 files/digest-portage-2.0.50_pre22 73 MD5 9384a44e4c6eccfa05a3067dc1284663 files/digest-portage-2.0.50 67 +MD5 1385fe23e0fd1fe4d30ba915df2af4b6 files/digest-portage-2.0.50-r1 70 MD5 0e69f4c26d5511882f92601c55bb960e files/portage-rescue-2.0.47-r10-x86.tbz2 206746 MD5 73094a2d75dca36817b40611589ea226 files/portage-rescue-2.0.44-ppc.tbz2 168027 MD5 d4bb71bd3515647145916ba7d6287d20 files/README.RESCUE 1064 diff --git a/sys-apps/portage/files/digest-portage-2.0.49-r20 b/sys-apps/portage/files/digest-portage-2.0.49-r20 deleted file mode 100644 index acd1701236f1..000000000000 --- a/sys-apps/portage/files/digest-portage-2.0.49-r20 +++ /dev/null @@ -1 +0,0 @@ -MD5 2bdbf070acdd2315e044020c74204f51 portage-2.0.49-r20.tar.bz2 237299 diff --git a/sys-apps/portage/files/digest-portage-2.0.50-r1 b/sys-apps/portage/files/digest-portage-2.0.50-r1 new file mode 100644 index 000000000000..80213f9bc9bc --- /dev/null +++ b/sys-apps/portage/files/digest-portage-2.0.50-r1 @@ -0,0 +1 @@ +MD5 eb2374da61ce2a11e3fe30641f7ed212 portage-2.0.50-r1.tar.bz2 222535 diff --git a/sys-apps/portage/files/digest-portage-2.0.50_pre21 b/sys-apps/portage/files/digest-portage-2.0.50_pre21 deleted file mode 100644 index 082c007c97bf..000000000000 --- a/sys-apps/portage/files/digest-portage-2.0.50_pre21 +++ /dev/null @@ -1 +0,0 @@ -MD5 02e5a8e5eddbcc3a56d0c5200622712e portage-2.0.50_pre21.tar.bz2 260738 diff --git a/sys-apps/portage/files/digest-portage-2.0.50_pre22 b/sys-apps/portage/files/digest-portage-2.0.50_pre22 deleted file mode 100644 index e4080492d77c..000000000000 --- a/sys-apps/portage/files/digest-portage-2.0.50_pre22 +++ /dev/null @@ -1 +0,0 @@ -MD5 bd23fbea34f042729e99554a61068861 portage-2.0.50_pre22.tar.bz2 223197 diff --git a/sys-apps/portage/portage-2.0.49-r20.ebuild b/sys-apps/portage/portage-2.0.49-r20.ebuild deleted file mode 100644 index 5a25c158a4c7..000000000000 --- a/sys-apps/portage/portage-2.0.49-r20.ebuild +++ /dev/null @@ -1,306 +0,0 @@ -# Copyright 1999-2004 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.49-r20.ebuild,v 1.3 2004/01/06 11:07:44 carpaski Exp $ - -IUSE="build" - -# If the old /lib/sandbox.so is in /etc/ld.so.preload, it can -# cause everything to segfault !! -export SANDBOX_DISABLED="1" - -S=${WORKDIR}/${PF} -SLOT="0" -DESCRIPTION="Portage ports system" -SRC_URI="http://gentoo.twobit.net/portage/${PF}.tar.bz2 mirror://gentoo/${PF}.tar.bz2" -HOMEPAGE="http://www.gentoo.org" - -# Contact carpaski with a reason before you modify any of these. -KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86" -#KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" - -LICENSE="GPL-2" -RDEPEND="!build? ( >=sys-apps/sed-4.0.5 dev-python/python-fchksum >=dev-lang/python-2.2.1 sys-apps/debianutils >=app-shells/bash-2.05a ) selinux? ( dev-python/python-selinux )" - -python_version() { - local tmpstr="$(/usr/bin/python -V 2>&1 )" - export PYVER_ALL="${tmpstr#Python }" - - export PYVER_MAJOR=$(echo ${PYVER_ALL} | cut -d. -f1) - export PYVER_MINOR=$(echo ${PYVER_ALL} | cut -d. -f2) - export PYVER_MICRO=$(echo ${PYVER_ALL} | cut -d. -f3-) - export PYVER="${PYVER_MAJOR}.${PYVER_MINOR}" -} - -src_unpack() { - unpack ${A} - cd ${S} - sed -i 's:^VERSION=.*:VERSION="2.0.49-r20":' pym/portage.py -} - -src_compile() { - cd ${S}/src; ${CC:-gcc} ${CFLAGS} tbz2tool.c -o tbz2tool - cd ${S}/src/sandbox-1.1 - if [ "${ARCH}" = "x86" ]; then - make CFLAGS="-march=i386 -O1 -pipe" || die - else - make || die - fi - cd ${S}/bin -} - -src_install() { - #config files - cd ${S}/cnf - insinto /etc - case "$ARCH" in - alpha ) - newins make.globals.alpha make.globals - newins make.conf.alpha make.conf - ;; - arm ) - newins make.globals.arm make.globals - newins make.conf.arm make.conf - ;; - hppa ) - newins make.globals.hppa make.globals - newins make.conf.hppa make.conf - ;; - mips ) - newins make.globals.mips make.globals - newins make.conf.mips make.conf - ;; - ppc ) - newins make.globals.ppc make.globals - newins make.conf.ppc make.conf - ;; - sparc ) - newins make.globals.sparc make.globals - newins make.conf.sparc make.conf - ;; - * ) - doins make.globals make.conf - ;; - esac - - #This special handling of make.conf is required for catalyst - #to function properly. - mv ${D}/etc/make.conf ${D}/etc/make.conf.example - - doins etc-update.conf dispatch-conf.conf - - #python modules - if [ -x "$(type -p python2.2)" ] || [ -x /usr/bin/python2.2 ]; then - cd ${S}/src/python-missingos - chmod +x setup.py - ./setup.py install --root ${D} || die "Failed to install missingos module" - fi - - - dodir /usr/lib/portage/pym - cd ${S}/pym - insinto /usr/lib/portage/pym - doins *.py ../bin/emergehelp.py - - - #binaries, libraries and scripts - dodir /usr/lib/portage/bin - cd ${S}/bin - exeinto /usr/lib/portage/bin - doexe * - dosym emake /usr/lib/portage/bin/pmake - doexe ${S}/src/tbz2tool - - #install sandbox - cd ${S}/src/sandbox-1.1 - make DESTDIR=${D} install || die "Failed to compile sandbox" - - #symlinks - dodir /usr/bin /usr/sbin - dosym ../lib/portage/bin/emerge /usr/bin/emerge - dosym ../lib/portage/bin/pkgmerge /usr/sbin/pkgmerge - dosym ../lib/portage/bin/ebuild /usr/sbin/ebuild - dosym ../lib/portage/bin/ebuild.sh /usr/sbin/ebuild.sh - - dosym ../lib/portage/bin/etc-update /usr/sbin/etc-update - dosym ../lib/portage/bin/dispatch-conf /usr/sbin/dispatch-conf - dosym ../lib/portage/bin/archive-conf /usr/sbin/archive-conf - dosym ../lib/portage/bin/fixpackages /usr/sbin/fixpackages - - dosym ../lib/portage/bin/env-update /usr/sbin/env-update - dosym ../lib/portage/bin/xpak /usr/bin/xpak - dosym ../lib/portage/bin/repoman /usr/bin/repoman - dosym ../lib/portage/bin/tbz2tool /usr/bin/tbz2tool - dosym ../lib/portage/bin/portageq /usr/bin/portageq - - dosym ../lib/portage/bin/g-cpan.pl /usr/bin/g-cpan.pl - dosym ../lib/portage/bin/quickpkg /usr/bin/quickpkg - dosym ../lib/portage/bin/regenworld /usr/sbin/regenworld - dosym ../lib/portage/bin/emerge-webrsync /usr/sbin/emerge-webrsync - - dosym newins /usr/lib/portage/bin/donewins - - # man pages - doman ${S}/man/*.[15] - - # temp dir creation - dodir /var/tmp - chmod 1777 ${D}/var/tmp - touch ${D}/var/tmp/.keep - - #documentation - dodoc ${S}/ChangeLog -} - - -pkg_preinst() { - if has livecvsportage $FEATURES; then - if [ "$ROOT" == "/" ]; then - rm -Rf "${IMAGE}"/usr/lib/portage/pym/* - - mv "${IMAGE}"/usr/lib/portage/bin/{sandbox,tbz2tool} ${T} - rm -Rf "${IMAGE}"/usr/lib/portage/bin/* - mv "${T}"/{sandbox,tbz2tool} "${IMAGE}"/usr/lib/portage/bin/ - fi - fi -} - -pkg_postinst() { - local x - - [ -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 - - #remove possible previous sandbox files that could cause conflicts - if [ -d /usr/lib/sandbox ]; then - rm -f ${ROOT}/usr/lib/portage/bin/ebuild.sh.orig - rm -f ${ROOT}/usr/lib/portage/pym/portage.py.orig - rm -f ${ROOT}/usr/bin/sandbox - rm -rf ${ROOT}/usr/lib/sandbox - 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 - - if [ ! -f "/etc/portage/package.mask" ]; then - if [ -f "/etc/portage/profiles/package.mask" ]; then - ln /etc/portage/profiles/package.mask /etc/portage/package.mask - einfo "/etc/portage/profiles/package.mask is now /etc/portage/package.mask" - einfo "a hardlink has been created to the new location if it exists in profiles" - einfo "already." - echo - fi - fi - echo - if [ -e /etc/._cfg*make.globals ]; then - eerror "NOTICE: PLEASE *REPLACE* your make.globals. All user changes to variables" - eerror "in make.globals should be placed in make.conf. DO NOT MODIFY make.globals." - echo - fi - einfo "Feature additions are noted in help and make.conf.example descriptions." - echo - einfo "Update configs using 'etc-update' please. Maintaining current configs" - einfo "for portage and other system packages is fairly important for the" - einfo "continued health of your system." - echo - - if [ -z "$PORTAGE_TEST" ]; then - for TICKER in 1 2 3 4 5; do - # Double beep here. - echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null - echo -ne "\a" ; sleep 1 - done - sleep 8 - - # Kill the existing counter and generate a new one. - echo -n "Recalculating the counter... " - mv /var/cache/edb/counter /var/cache/edb/counter.old - python -c 'import sys; sys.path = ["/usr/lib/portage/pym"]+sys.path; import portage; portage.db["/"]["vartree"].dbapi.counter_tick("/")' &>/dev/null - if [ -f /var/cache/edb/counter ] ; then - echo "Counter updated successfully." - rm -f /var/cache/edb/counter.old - else - echo "FAILED to update counter." - echo "!!! This is a problem." - mv /var/cache/edb/counter.old /var/cache/edb/counter - fi - - # Changes in the size of auxdbkeys can cause aux_get() problems. - echo -n ">>> Clearing invalid entries in dependency cache..." - cd ${ROOT}var/cache/edb/dep - #Nick, I changed the following to deal with situations where stderr spits out stuff like: "!!! CANNOT IMPORT FTPLIB:" - #which causes an infinite loop. (drobbins) - python -c 'import sys; sys.path = ["/usr/lib/portage/pym"]+sys.path; import portage; myf=open("/tmp/auxdbkl","w"); myf.write(str(len(portage.auxdbkeys))); myf.close()' - AUXDBKEYLEN=`cat /tmp/auxdbkl` - rm -f /tmp/auxdbkl - find ${ROOT}var/cache/edb/dep -type f -exec wc -l {} \; | egrep -v "^ *${AUXDBKEYLEN}" | sed 's:^ \+[0-9]\+ \+\([^ ]\+\)$:\1:' 2>/dev/null | xargs -n 50 -r rm -f - echo " ...done!" - fi # PORTAGE_TESTING - - #fix cache (could contain staleness) - if [ ! -d ${ROOT}var/cache/edb/dep ] - then - #upgrade /var/db/pkg library; conditional required for build image creation - if [ -d ${ROOT}var/db/pkg ] - then - echo ">>> Database upgrade..." - cd ${ROOT}var/db/pkg - for x in * - do - [ ! -d "$x" ] && continue - #go into each category directory so we don't overload the python command-line - cd $x - #fix silly output from this command (hack) - python ${ROOT}usr/lib/portage/bin/db-update.py `find -name VIRTUAL` > /dev/null - cd .. - done - echo ">>> Database upgrade complete." - #remove old virtual directory to prevent virtual deps from getting messed-up - [ -d ${ROOT}var/db/pkg/virtual ] && rm -rf ${ROOT}var/db/pkg/virtual - fi - install -d -m0755 ${ROOT}var/cache/edb - install -d -m2775 -o root -g portage ${ROOT}var/cache/edb/dep - fi - - # Old place of install - rm -f ${ROOT}usr/lib/python2.2/site-packages/portage.py[co] - rm -f ${ROOT}usr/lib/python2.2/site-packages/xpak.py[co] - rm -f ${ROOT}usr/lib/python2.2/site-packages/output.py[co] - rm -f ${ROOT}usr/lib/python2.2/site-packages/cvstree.py[co] - rm -f ${ROOT}usr/lib/python2.2/site-packages/getbinpkg.py[co] - rm -f ${ROOT}usr/lib/python2.2/site-packages/emergehelp.py[co] - rm -f ${ROOT}usr/lib/python2.2/site-packages/dispatch_conf.py[co] - - # New old place of install - rm -f ${ROOT}usr/lib/portage/pym/*.py[co] - - chmod 2775 ${ROOT}var/cache/edb/dep ${ROOT}var/cache/edb/dep/* - chown -R root:portage ${ROOT}var/cache/edb/dep - - # we gotta re-compile these modules and deal with systems with clock skew (stale compiled files) - python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/portage.py')" - python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/portage.py')" - python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/output.py')" - python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/output.py')" - python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/cvstree.py')" - python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/cvstree.py')" - python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/getbinpkg.py')" - python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/getbinpkg.py')" - python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/dispatch_conf.py')" - python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/dispatch_conf.py')" - python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/emergehelp.py')" - python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/emergehelp.py')" - - if has ccache $FEATURES && has userpriv $FEATURES; then - chown -R portage:portage /var/tmp/ccache &> /dev/null - chmod -R g+rws /var/tmp/ccache &>/dev/null - fi -} diff --git a/sys-apps/portage/portage-2.0.50_pre21.ebuild b/sys-apps/portage/portage-2.0.50-r1.ebuild index aedfb2a1c614..81b56f6e9e7f 100644 --- a/sys-apps/portage/portage-2.0.50_pre21.ebuild +++ b/sys-apps/portage/portage-2.0.50-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.50_pre21.ebuild,v 1.1 2004/01/29 06:50:05 carpaski Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.50-r1.ebuild,v 1.1 2004/02/10 01:47:51 carpaski Exp $ IUSE="build" @@ -15,8 +15,8 @@ SRC_URI="http://gentoo.twobit.net/portage/${PF}.tar.bz2 mirror://gentoo/${PF}.ta HOMEPAGE="http://www.gentoo.org" # Contact carpaski with a reason before you modify any of these. -#KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86" +#KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" LICENSE="GPL-2" RDEPEND="!build? ( >=sys-apps/sed-4.0.5 dev-python/python-fchksum >=dev-lang/python-2.2.1 sys-apps/debianutils >=app-shells/bash-2.05a ) selinux? ( dev-python/python-selinux )" @@ -34,6 +34,8 @@ python_version() { src_unpack() { unpack ${A} cd ${S} + bzip2 -dc ${FILESDIR}/regenworld.bz2 2>/dev/null > bin/regenworld + chmod a+rx bin/regenworld } src_compile() { @@ -231,40 +233,10 @@ pkg_postinst() { echo "!!! This is a problem." mv /var/cache/edb/counter.old /var/cache/edb/counter fi - - # Changes in the size of auxdbkeys can cause aux_get() problems. - echo -n ">>> Clearing invalid entries in dependency cache..." - cd ${ROOT}var/cache/edb/dep - #Nick, I changed the following to deal with situations where stderr spits out stuff like: "!!! CANNOT IMPORT FTPLIB:" - #which causes an infinite loop. (drobbins) - python -c 'import sys; sys.path = ["/usr/lib/portage/pym"]+sys.path; import portage; myf=open("/tmp/auxdbkl","w"); myf.write(str(len(portage.auxdbkeys))); myf.close()' - AUXDBKEYLEN=`cat /tmp/auxdbkl` - rm -f /tmp/auxdbkl - find ${ROOT}var/cache/edb/dep -type f -exec wc -l {} \; | egrep -v "^ *${AUXDBKEYLEN}" | sed 's:^ \+[0-9]\+ \+\([^ ]\+\)$:\1:' 2>/dev/null | xargs -n 50 -r rm -f - echo " ...done!" fi # PORTAGE_TESTING - #fix cache (could contain staleness) if [ ! -d ${ROOT}var/cache/edb/dep ] then - #upgrade /var/db/pkg library; conditional required for build image creation - if [ -d ${ROOT}var/db/pkg ] - then - echo ">>> Database upgrade..." - cd ${ROOT}var/db/pkg - for x in * - do - [ ! -d "$x" ] && continue - #go into each category directory so we don't overload the python command-line - cd $x - #fix silly output from this command (hack) - python ${ROOT}usr/lib/portage/bin/db-update.py `find -name VIRTUAL` > /dev/null - cd .. - done - echo ">>> Database upgrade complete." - #remove old virtual directory to prevent virtual deps from getting messed-up - [ -d ${ROOT}var/db/pkg/virtual ] && rm -rf ${ROOT}var/db/pkg/virtual - fi install -d -m0755 ${ROOT}var/cache/edb install -d -m2775 -o root -g portage ${ROOT}var/cache/edb/dep fi @@ -285,23 +257,76 @@ pkg_postinst() { chown -R root:portage ${ROOT}var/cache/edb/dep # we gotta re-compile these modules and deal with systems with clock skew (stale compiled files) - python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/portage.py')" - python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/portage.py')" - python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/output.py')" - python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/output.py')" + python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/emergehelp.py')" + python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/emergehelp.py')" + python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/cvstree.py')" python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/cvstree.py')" - python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/getbinpkg.py')" - python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/getbinpkg.py')" + + python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/dcdialog.py')" + python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/dcdialog.py')" + python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/dispatch_conf.py')" python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/dispatch_conf.py')" - python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/emergehelp.py')" - python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/emergehelp.py')" + python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/getbinpkg.py')" + python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/getbinpkg.py')" + + python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/output.py')" + python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/output.py')" + + python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/portage.py')" + python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/portage.py')" + + python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/portage_db_anydbm.py')" + python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/portage_db_anydbm.py')" + + python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/portage_db_cpickle.py')" + python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/portage_db_cpickle.py')" + + python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/portage_db_flat.py')" + python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/portage_db_flat.py')" + + python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/portage_db_template.py')" + python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/portage_db_template.py')" + + python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/xpak.py')" + python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/xpak.py')" + + if has ccache $FEATURES && has userpriv $FEATURES; then chown -R portage:portage /var/tmp/ccache &> /dev/null chmod -R g+rws /var/tmp/ccache &>/dev/null fi + + +# +# Take a shot at fixing the world file... +# This finds all specific-version ebuilds without modifiers. +# + addwrite ${ROOT}var/cache/edb/ + python -c " +import portage +world = portage.grabfile('${ROOT}var/cache/edb/world') +newlist = [] + +for x in world: + try: + if portage.catpkgsplit(x) and (x == portage.dep_getcpv(x)): + newlist.append('='+x) + continue + except: + pass + newlist.append(x) + +if newlist and (len(newlist) == len(world)): + myworld=open('${ROOT}var/cache/edb/world','w') + for x in newlist: + myworld.write(x+'\\n') + + myworld.close() + +" for X in ${ROOT}etc/._cfg????_make.globals; do # Overwrite the globals file automatically. diff --git a/sys-apps/portage/portage-2.0.50.ebuild b/sys-apps/portage/portage-2.0.50.ebuild index 0f5bd73dacea..a335f9b11092 100644 --- a/sys-apps/portage/portage-2.0.50.ebuild +++ b/sys-apps/portage/portage-2.0.50.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.50.ebuild,v 1.2 2004/02/06 21:09:39 carpaski Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.50.ebuild,v 1.3 2004/02/10 01:47:51 carpaski Exp $ IUSE="build" @@ -257,23 +257,76 @@ pkg_postinst() { chown -R root:portage ${ROOT}var/cache/edb/dep # we gotta re-compile these modules and deal with systems with clock skew (stale compiled files) - python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/portage.py')" - python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/portage.py')" - python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/output.py')" - python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/output.py')" + python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/emergehelp.py')" + python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/emergehelp.py')" + python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/cvstree.py')" python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/cvstree.py')" - python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/getbinpkg.py')" - python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/getbinpkg.py')" + + python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/dcdialog.py')" + python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/dcdialog.py')" + python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/dispatch_conf.py')" python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/dispatch_conf.py')" - python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/emergehelp.py')" - python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/emergehelp.py')" + python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/getbinpkg.py')" + python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/getbinpkg.py')" + + python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/output.py')" + python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/output.py')" + + python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/portage.py')" + python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/portage.py')" + + python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/portage_db_anydbm.py')" + python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/portage_db_anydbm.py')" + + python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/portage_db_cpickle.py')" + python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/portage_db_cpickle.py')" + + python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/portage_db_flat.py')" + python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/portage_db_flat.py')" + + python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/portage_db_template.py')" + python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/portage_db_template.py')" + + python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/xpak.py')" + python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/xpak.py')" + + if has ccache $FEATURES && has userpriv $FEATURES; then chown -R portage:portage /var/tmp/ccache &> /dev/null chmod -R g+rws /var/tmp/ccache &>/dev/null fi + + +# +# Take a shot at fixing the world file... +# This finds all specific-version ebuilds without modifiers. +# + addwrite ${ROOT}var/cache/edb/ + python -c " +import portage +world = portage.grabfile('${ROOT}var/cache/edb/world') +newlist = [] + +for x in world: + try: + if portage.catpkgsplit(x) and (x == portage.dep_getcpv(x)): + newlist.append('='+x) + continue + except: + pass + newlist.append(x) + +if newlist and (len(newlist) == len(world)): + myworld=open('${ROOT}var/cache/edb/world','w') + for x in newlist: + myworld.write(x+'\\n') + + myworld.close() + +" for X in ${ROOT}etc/._cfg????_make.globals; do # Overwrite the globals file automatically. diff --git a/sys-apps/portage/portage-2.0.50_pre22.ebuild b/sys-apps/portage/portage-2.0.50_pre22.ebuild deleted file mode 100644 index 7ad73d1aae0b..000000000000 --- a/sys-apps/portage/portage-2.0.50_pre22.ebuild +++ /dev/null @@ -1,280 +0,0 @@ -# Copyright 1999-2004 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.50_pre22.ebuild,v 1.1 2004/02/04 23:26:53 carpaski Exp $ - -IUSE="build" - -# If the old /lib/sandbox.so is in /etc/ld.so.preload, it can -# cause everything to segfault !! -export SANDBOX_DISABLED="1" - -S=${WORKDIR}/${PF} -SLOT="0" -DESCRIPTION="Portage ports system" -SRC_URI="http://gentoo.twobit.net/portage/${PF}.tar.bz2 mirror://gentoo/${PF}.tar.bz2" -HOMEPAGE="http://www.gentoo.org" - -# Contact carpaski with a reason before you modify any of these. -#KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" - -LICENSE="GPL-2" -RDEPEND="!build? ( >=sys-apps/sed-4.0.5 dev-python/python-fchksum >=dev-lang/python-2.2.1 sys-apps/debianutils >=app-shells/bash-2.05a ) selinux? ( dev-python/python-selinux )" - -python_version() { - local tmpstr="$(/usr/bin/python -V 2>&1 )" - export PYVER_ALL="${tmpstr#Python }" - - export PYVER_MAJOR=$(echo ${PYVER_ALL} | cut -d. -f1) - export PYVER_MINOR=$(echo ${PYVER_ALL} | cut -d. -f2) - export PYVER_MICRO=$(echo ${PYVER_ALL} | cut -d. -f3-) - export PYVER="${PYVER_MAJOR}.${PYVER_MINOR}" -} - -src_unpack() { - unpack ${A} - cd ${S} -} - -src_compile() { - cd ${S}/src; ${CC:-gcc} ${CFLAGS} tbz2tool.c -o tbz2tool - cd ${S}/src/sandbox-1.1 - if [ "${ARCH}" = "x86" ]; then - make CFLAGS="-march=i386 -O1 -pipe" || die - else - make || die - fi - cd ${S}/bin -} - -src_install() { - #config files - cd ${S}/cnf - insinto /etc - case "$ARCH" in - alpha ) - newins make.globals.alpha make.globals - newins make.conf.alpha make.conf - ;; - arm ) - newins make.globals.arm make.globals - newins make.conf.arm make.conf - ;; - hppa ) - newins make.globals.hppa make.globals - newins make.conf.hppa make.conf - ;; - mips ) - newins make.globals.mips make.globals - newins make.conf.mips make.conf - ;; - ppc ) - newins make.globals.ppc make.globals - newins make.conf.ppc make.conf - ;; - sparc ) - newins make.globals.sparc make.globals - newins make.conf.sparc make.conf - ;; - * ) - doins make.globals make.conf - ;; - esac - - #This special handling of make.conf is required for catalyst - #to function properly. - mv ${D}/etc/make.conf ${D}/etc/make.conf.example - - doins etc-update.conf dispatch-conf.conf - - #python modules - if [ -x "$(type -p python2.2)" ] || [ -x /usr/bin/python2.2 ]; then - cd ${S}/src/python-missingos - chmod +x setup.py - ./setup.py install --root ${D} || die "Failed to install missingos module" - fi - - - dodir /usr/lib/portage/pym - cd ${S}/pym - insinto /usr/lib/portage/pym - doins *.py ../bin/emergehelp.py - - - #binaries, libraries and scripts - dodir /usr/lib/portage/bin - cd ${S}/bin - exeinto /usr/lib/portage/bin - doexe * - dosym emake /usr/lib/portage/bin/pmake - doexe ${S}/src/tbz2tool - - #install sandbox - cd ${S}/src/sandbox-1.1 - make clean - make DESTDIR=${D} install || die "Failed to compile sandbox" - - #symlinks - dodir /usr/bin /usr/sbin - dosym ../lib/portage/bin/emerge /usr/bin/emerge - dosym ../lib/portage/bin/pkgmerge /usr/sbin/pkgmerge - dosym ../lib/portage/bin/ebuild /usr/sbin/ebuild - dosym ../lib/portage/bin/ebuild.sh /usr/sbin/ebuild.sh - - dosym ../lib/portage/bin/etc-update /usr/sbin/etc-update - dosym ../lib/portage/bin/dispatch-conf /usr/sbin/dispatch-conf - dosym ../lib/portage/bin/archive-conf /usr/sbin/archive-conf - dosym ../lib/portage/bin/fixpackages /usr/sbin/fixpackages - - dosym ../lib/portage/bin/env-update /usr/sbin/env-update - dosym ../lib/portage/bin/xpak /usr/bin/xpak - dosym ../lib/portage/bin/repoman /usr/bin/repoman - dosym ../lib/portage/bin/tbz2tool /usr/bin/tbz2tool - dosym ../lib/portage/bin/portageq /usr/bin/portageq - - dosym ../lib/portage/bin/g-cpan.pl /usr/bin/g-cpan.pl - dosym ../lib/portage/bin/quickpkg /usr/bin/quickpkg - dosym ../lib/portage/bin/regenworld /usr/sbin/regenworld - dosym ../lib/portage/bin/emerge-webrsync /usr/sbin/emerge-webrsync - - dosym newins /usr/lib/portage/bin/donewins - - # man pages - doman ${S}/man/*.[15] - - # temp dir creation - dodir /var/tmp - chmod 1777 ${D}/var/tmp - touch ${D}/var/tmp/.keep - - #documentation - dodoc ${S}/ChangeLog -} - - -pkg_preinst() { - if has livecvsportage $FEATURES; then - if [ "$ROOT" == "/" ]; then - rm -Rf "${IMAGE}"/usr/lib/portage/pym/* - - mv "${IMAGE}"/usr/lib/portage/bin/{sandbox,tbz2tool} ${T} - rm -Rf "${IMAGE}"/usr/lib/portage/bin/* - mv "${T}"/{sandbox,tbz2tool} "${IMAGE}"/usr/lib/portage/bin/ - fi - fi -} - -pkg_postinst() { - local x - - [ -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 - - #remove possible previous sandbox files that could cause conflicts - if [ -d /usr/lib/sandbox ]; then - rm -f ${ROOT}/usr/lib/portage/bin/ebuild.sh.orig - rm -f ${ROOT}/usr/lib/portage/pym/portage.py.orig - rm -f ${ROOT}/usr/bin/sandbox - rm -rf ${ROOT}/usr/lib/sandbox - 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 - - if [ ! -f "/etc/portage/package.mask" ]; then - if [ -f "/etc/portage/profiles/package.mask" ]; then - ln /etc/portage/profiles/package.mask /etc/portage/package.mask - einfo "/etc/portage/profiles/package.mask is now /etc/portage/package.mask" - einfo "a hardlink has been created to the new location if it exists in profiles" - einfo "already." - echo - fi - fi - echo - - einfo "Feature additions are noted in help and make.conf descriptions." - echo - einfo "GENTOOLKIT will need to be updated to at least 0.2.0 for some tools" - einfo "to work properly." - echo - einfo "Update configs using 'etc-update' please. Maintaining current configs" - einfo "for portage and other system packages is fairly important for the" - einfo "continued health of your system." - echo - - if [ -z "$PORTAGE_TEST" ]; then - for TICKER in 1 2 3 4 5; do - # Double beep here. - echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null - echo -ne "\a" ; sleep 1 - done - sleep 8 - - # Kill the existing counter and generate a new one. - echo -n "Recalculating the counter... " - mv /var/cache/edb/counter /var/cache/edb/counter.old - python -c 'import sys; sys.path = ["/usr/lib/portage/pym"]+sys.path; import portage; portage.db["/"]["vartree"].dbapi.counter_tick("/")' &>/dev/null - if [ -f /var/cache/edb/counter ] ; then - echo "Counter updated successfully." - rm -f /var/cache/edb/counter.old - else - echo "FAILED to update counter." - echo "!!! This is a problem." - mv /var/cache/edb/counter.old /var/cache/edb/counter - fi - fi # PORTAGE_TESTING - - if [ ! -d ${ROOT}var/cache/edb/dep ] - then - install -d -m0755 ${ROOT}var/cache/edb - install -d -m2775 -o root -g portage ${ROOT}var/cache/edb/dep - fi - - # Old place of install - rm -f ${ROOT}usr/lib/python2.2/site-packages/portage.py[co] - rm -f ${ROOT}usr/lib/python2.2/site-packages/xpak.py[co] - rm -f ${ROOT}usr/lib/python2.2/site-packages/output.py[co] - rm -f ${ROOT}usr/lib/python2.2/site-packages/cvstree.py[co] - rm -f ${ROOT}usr/lib/python2.2/site-packages/getbinpkg.py[co] - rm -f ${ROOT}usr/lib/python2.2/site-packages/emergehelp.py[co] - rm -f ${ROOT}usr/lib/python2.2/site-packages/dispatch_conf.py[co] - - # New old place of install - rm -f ${ROOT}usr/lib/portage/pym/*.py[co] - - chmod 2775 ${ROOT}var/cache/edb/dep ${ROOT}var/cache/edb/dep/* - chown -R root:portage ${ROOT}var/cache/edb/dep - - # we gotta re-compile these modules and deal with systems with clock skew (stale compiled files) - python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/portage.py')" - python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/portage.py')" - python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/output.py')" - python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/output.py')" - python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/cvstree.py')" - python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/cvstree.py')" - python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/getbinpkg.py')" - python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/getbinpkg.py')" - python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/dispatch_conf.py')" - python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/dispatch_conf.py')" - python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/emergehelp.py')" - python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/emergehelp.py')" - - if has ccache $FEATURES && has userpriv $FEATURES; then - chown -R portage:portage /var/tmp/ccache &> /dev/null - chmod -R g+rws /var/tmp/ccache &>/dev/null - fi - - for X in ${ROOT}etc/._cfg????_make.globals; do - # Overwrite the globals file automatically. - [ -e "${X}" ] && mv -f "${X}" "${ROOT}etc/make.globals" - done -} |