From 5c3ef6fcf9c0278b95c712d41eceade535de737b Mon Sep 17 00:00:00 2001 From: Daniel Robbins Date: Thu, 1 Aug 2002 06:44:27 +0000 Subject: Portage 2.0.23 (bug fix release) --- sys-apps/portage/files/digest-portage-2.0.22 | 0 sys-apps/portage/files/digest-portage-2.0.23 | 0 sys-apps/portage/files/portage-2.0.22.tar.bz2 | Bin 157201 -> 0 bytes sys-apps/portage/files/portage-2.0.23.tar.bz2 | Bin 0 -> 143657 bytes sys-apps/portage/portage-2.0.22.ebuild | 191 -------------------------- sys-apps/portage/portage-2.0.23.ebuild | 191 ++++++++++++++++++++++++++ 6 files changed, 191 insertions(+), 191 deletions(-) delete mode 100644 sys-apps/portage/files/digest-portage-2.0.22 create mode 100644 sys-apps/portage/files/digest-portage-2.0.23 delete mode 100644 sys-apps/portage/files/portage-2.0.22.tar.bz2 create mode 100644 sys-apps/portage/files/portage-2.0.23.tar.bz2 delete mode 100644 sys-apps/portage/portage-2.0.22.ebuild create mode 100644 sys-apps/portage/portage-2.0.23.ebuild (limited to 'sys-apps') diff --git a/sys-apps/portage/files/digest-portage-2.0.22 b/sys-apps/portage/files/digest-portage-2.0.22 deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/sys-apps/portage/files/digest-portage-2.0.23 b/sys-apps/portage/files/digest-portage-2.0.23 new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/sys-apps/portage/files/portage-2.0.22.tar.bz2 b/sys-apps/portage/files/portage-2.0.22.tar.bz2 deleted file mode 100644 index 58f71dedb688..000000000000 Binary files a/sys-apps/portage/files/portage-2.0.22.tar.bz2 and /dev/null differ diff --git a/sys-apps/portage/files/portage-2.0.23.tar.bz2 b/sys-apps/portage/files/portage-2.0.23.tar.bz2 new file mode 100644 index 000000000000..f98ee687a378 Binary files /dev/null and b/sys-apps/portage/files/portage-2.0.23.tar.bz2 differ diff --git a/sys-apps/portage/portage-2.0.22.ebuild b/sys-apps/portage/portage-2.0.22.ebuild deleted file mode 100644 index ab4d7f86bb54..000000000000 --- a/sys-apps/portage/portage-2.0.22.ebuild +++ /dev/null @@ -1,191 +0,0 @@ -# Copyright 1999-2002 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.22.ebuild,v 1.1 2002/07/30 05:15:36 drobbins Exp $ - -S=${WORKDIR}/${P} -SLOT="0" -DESCRIPTION="Portage ports system" -SRC_URI="" -HOMEPAGE="http://www.gentoo.org" -KEYWORDS="x86 ppc sparc64" -LICENSE="GPL-2" - -#We need this if/then/else clause for compatibility with stuff that doesn't know !build? -if [ "`use build`" ] -then - RDEPEND="" -else - RDEPEND=">=sys-apps/fileutils-4.1.8 dev-python/python-fchksum >=dev-lang/python-2.2.1 sys-apps/debianutils >=sys-apps/bash-2.05a" -fi - -src_unpack() { - #We are including the Portage bzipped tarball on CVS now, so that if a person's - #emerge gets hosed, they are not completely stuck. - cd ${WORKDIR}; tar xjf ${FILESDIR}/portage-${PV}.tar.bz2 -} - -src_compile() { - cd ${S}/src; gcc ${CFLAGS} tbz2tool.c -o tbz2tool - cd ${S}/src/sandbox - if [ "${ARCH}" = "x86" ]; then - emake CFLAGS="-O2 -march=i486 -pipe" || die - else - emake || die - fi -} - -src_install() { - #config files - cd ${S}/cnf - insinto /etc - case "$ARCH" in - ppc ) - newins make.globals.ppc make.globals - newins make.conf.ppc make.conf - ;; - * ) - doins make.globals make.conf - ;; - esac - - #python modules - cd ${S}/src/python-missingos - chmod +x setup.py - ./setup.py install --root ${D} || die - cd ${S}/pym - insinto /usr/lib/python2.2/site-packages - doins xpak.py portage.py output.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 - - into /usr/lib/portage - dobin ${S}/src/sandbox/sandbox - dodir /usr/lib/portage/lib - exeinto /lib - doexe ${S}/src/sandbox/libsandbox.so - insinto //usr/lib/portage/lib - doins ${S}/src/sandbox/sandbox.bashrc - #reset into - into /usr - - #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 /usr/lib/portage/bin/portage-maintain /usr/sbin/portage-maintain - 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 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_postinst() { - if [ ! -e ${ROOT}/etc/make.profile ] - then - cd ${ROOT}/etc - case "$ARCH" in - ppc ) - ln -sf ../usr/portage/profiles/default-ppc-1.0 make.profile - ;; - sparc ) - ln -sf ../usr/portage/profiles/default-sparc-1.0 make.profile - ;; - sparc64 ) - ln -sf ../usr/portage/profiles/default-sparc64-1.0 make.profile - ;; - x86 ) - ln -sf ../usr/portage/profiles/default-1.0 make.profile - ;; - esac - - fi - local x - #remove possible previous sandbox files that could cause conflicts - if [ -d /usr/lib/sandbox ]; then - if [ -f /etc/ld.so.preload ]; then - mv /etc/ld.so.preload /etc/ld.so.preload_orig - grep -v libsandbox.so /etc/ld.so.preload_orig > /etc/ld.so.preload - rm /etc/ld.so.preload_orig - fi - - 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 - - #fix cache (could contain staleness) - if [ ! -d ${ROOT}var/cache/edb/dep/sys-apps ] - then - 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 python2.2 command-line - cd $x - #fix silly output from this command (hack) - python2.2 ${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 - fi - install -d -m0755 ${ROOT}var/cache/edb - install -d -m4755 -o root -g wheel ${ROOT}var/cache/edb/dep - else - chown -R root.wheel ${ROOT}var/cache/edb/dep/* - chmod g+sw ${ROOT}var/cache/edb/dep/* - fi - rm -f ${ROOT}usr/lib/python2.2/site-packages/portage.py[co] - chmod 4755 ${ROOT}var/cache/edb/dep - chown root.wheel ${ROOT}var/cache/edb/dep - [ -e ${ROOT}var/cache/edb/xcache.p ] && chmod 0664 ${ROOT}var/cache/edb/xcache.p && chown root.wheel ${ROOT}var/cache/edb/xcache.p - - # 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/python2.2/site-packages/portage.py')" || die - python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/python2.2/site-packages/portage.py')" || die - - echo - echo - einfo "WARNING: The default behavior for 'emerge rsync' is to have --clean enabled." - einfo "Please back up any modified files in your Portage tree before running emerge" - einfo "rsync." - echo - einfo "You may want to move any custom ebuilds to a new directory, and then set" - einfo "PORTDIR_OVERLAY (in /etc/make.conf) to point to this directory. For example," - einfo "make a /usr/portage.local/sys-apps/foo directory and put your ebuild in there." - einfo "Then set PORTDIR_OVERLAY=\"/usr/portage.local\" Portage should see your" - einfo "personal ebuilds. NOTE: PORTDIR_OVERLAY support is *beta* code; it may not" - einfo "work correctly yet." - echo - echo - } diff --git a/sys-apps/portage/portage-2.0.23.ebuild b/sys-apps/portage/portage-2.0.23.ebuild new file mode 100644 index 000000000000..b041b109494d --- /dev/null +++ b/sys-apps/portage/portage-2.0.23.ebuild @@ -0,0 +1,191 @@ +# Copyright 1999-2002 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.23.ebuild,v 1.1 2002/08/01 06:44:27 drobbins Exp $ + +S=${WORKDIR}/${P} +SLOT="0" +DESCRIPTION="Portage ports system" +SRC_URI="" +HOMEPAGE="http://www.gentoo.org" +KEYWORDS="x86 ppc sparc64" +LICENSE="GPL-2" + +#We need this if/then/else clause for compatibility with stuff that doesn't know !build? +if [ "`use build`" ] +then + RDEPEND="" +else + RDEPEND=">=sys-apps/fileutils-4.1.8 dev-python/python-fchksum >=dev-lang/python-2.2.1 sys-apps/debianutils >=sys-apps/bash-2.05a" +fi + +src_unpack() { + #We are including the Portage bzipped tarball on CVS now, so that if a person's + #emerge gets hosed, they are not completely stuck. + cd ${WORKDIR}; tar xjf ${FILESDIR}/portage-${PV}.tar.bz2 +} + +src_compile() { + cd ${S}/src; gcc ${CFLAGS} tbz2tool.c -o tbz2tool + cd ${S}/src/sandbox + if [ "${ARCH}" = "x86" ]; then + emake CFLAGS="-O2 -march=i486 -pipe" || die + else + emake || die + fi +} + +src_install() { + #config files + cd ${S}/cnf + insinto /etc + case "$ARCH" in + ppc ) + newins make.globals.ppc make.globals + newins make.conf.ppc make.conf + ;; + * ) + doins make.globals make.conf + ;; + esac + + #python modules + cd ${S}/src/python-missingos + chmod +x setup.py + ./setup.py install --root ${D} || die + cd ${S}/pym + insinto /usr/lib/python2.2/site-packages + doins xpak.py portage.py output.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 + + into /usr/lib/portage + dobin ${S}/src/sandbox/sandbox + dodir /usr/lib/portage/lib + exeinto /lib + doexe ${S}/src/sandbox/libsandbox.so + insinto //usr/lib/portage/lib + doins ${S}/src/sandbox/sandbox.bashrc + #reset into + into /usr + + #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 /usr/lib/portage/bin/portage-maintain /usr/sbin/portage-maintain + 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 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_postinst() { + if [ ! -e ${ROOT}/etc/make.profile ] + then + cd ${ROOT}/etc + case "$ARCH" in + ppc ) + ln -sf ../usr/portage/profiles/default-ppc-1.0 make.profile + ;; + sparc ) + ln -sf ../usr/portage/profiles/default-sparc-1.0 make.profile + ;; + sparc64 ) + ln -sf ../usr/portage/profiles/default-sparc64-1.0 make.profile + ;; + x86 ) + ln -sf ../usr/portage/profiles/default-1.0 make.profile + ;; + esac + + fi + local x + #remove possible previous sandbox files that could cause conflicts + if [ -d /usr/lib/sandbox ]; then + if [ -f /etc/ld.so.preload ]; then + mv /etc/ld.so.preload /etc/ld.so.preload_orig + grep -v libsandbox.so /etc/ld.so.preload_orig > /etc/ld.so.preload + rm /etc/ld.so.preload_orig + fi + + 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 + + #fix cache (could contain staleness) + if [ ! -d ${ROOT}var/cache/edb/dep/sys-apps ] + then + 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 python2.2 command-line + cd $x + #fix silly output from this command (hack) + python2.2 ${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 + fi + install -d -m0755 ${ROOT}var/cache/edb + install -d -m4755 -o root -g wheel ${ROOT}var/cache/edb/dep + else + chown -R root.wheel ${ROOT}var/cache/edb/dep/* + chmod g+sw ${ROOT}var/cache/edb/dep/* + fi + rm -f ${ROOT}usr/lib/python2.2/site-packages/portage.py[co] + chmod 4755 ${ROOT}var/cache/edb/dep + chown root.wheel ${ROOT}var/cache/edb/dep + [ -e ${ROOT}var/cache/edb/xcache.p ] && chmod 0664 ${ROOT}var/cache/edb/xcache.p && chown root.wheel ${ROOT}var/cache/edb/xcache.p + + # 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/python2.2/site-packages/portage.py')" || die + python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/python2.2/site-packages/portage.py')" || die + + echo + echo + einfo "WARNING: The default behavior for 'emerge rsync' is to have --clean enabled." + einfo "Please back up any modified files in your Portage tree before running emerge" + einfo "rsync." + echo + einfo "You may want to move any custom ebuilds to a new directory, and then set" + einfo "PORTDIR_OVERLAY (in /etc/make.conf) to point to this directory. For example," + einfo "make a /usr/portage.local/sys-apps/foo directory and put your ebuild in there." + einfo "Then set PORTDIR_OVERLAY=\"/usr/portage.local\" Portage should see your" + einfo "personal ebuilds. NOTE: PORTDIR_OVERLAY support is *beta* code; it may not" + einfo "work correctly yet." + echo + echo + } -- cgit v1.2.3-65-gdbad