From bb33e8f7a22a6b51b5ead86535cbd6e1548c68aa Mon Sep 17 00:00:00 2001 From: Jason Stubbs Date: Sun, 24 Apr 2005 09:40:59 +0000 Subject: fixed #90133 for macos lacking lchown. fixed bug with looping during -e system. Package-Manager: portage-1.524.2.59-cvs --- sys-apps/portage/Manifest | 12 +- sys-apps/portage/files/digest-portage-2.0.51.20-r3 | 1 - sys-apps/portage/files/digest-portage-2.0.51.20-r4 | 1 + sys-apps/portage/files/portage-fixes.patch | 9 + sys-apps/portage/portage-2.0.51.20-r3.ebuild | 181 --------------------- sys-apps/portage/portage-2.0.51.20-r4.ebuild | 181 +++++++++++++++++++++ 6 files changed, 197 insertions(+), 188 deletions(-) delete mode 100644 sys-apps/portage/files/digest-portage-2.0.51.20-r3 create mode 100644 sys-apps/portage/files/digest-portage-2.0.51.20-r4 delete mode 100644 sys-apps/portage/portage-2.0.51.20-r3.ebuild create mode 100644 sys-apps/portage/portage-2.0.51.20-r4.ebuild diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest index e70d85c24619..854bcec7c9ee 100644 --- a/sys-apps/portage/Manifest +++ b/sys-apps/portage/Manifest @@ -6,21 +6,21 @@ 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 73e7c423713b5738a3d7486f4945e0cf portage-2.0.51.20-r3.ebuild 6254 +MD5 f0b7328c994da26708e29d66df5b6670 portage-2.0.51.20-r4.ebuild 6292 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 ddcd57a496ee08ec51f06b031d54601e files/portage-fixes.patch 582 +MD5 a144de1dc5bb195a0a71fd2a5fd572fd files/portage-fixes.patch 1012 MD5 47a7436ab36074e8d1c7db19edb2c65a files/dispatch-conf-fixes.patch 1244 MD5 502ca546fcf8ca5141435a9edee6a57f files/repoman-fixes.patch 417 -MD5 5f2f342d78aec333f4136420afd6a31f files/digest-portage-2.0.51.20-r3 70 +MD5 5f2f342d78aec333f4136420afd6a31f files/digest-portage-2.0.51.20-r4 70 MD5 77b9bad3d53c36ce5ef3ecdf16554d5a files/emerge-fixes.patch 685 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) -iD8DBQFCa2XgxvWNPsk/ZP4RAg1PAJ9selrQ1vldg4ccOOavTTiufDwdXACdE0uF -5JUNKlDeC7smWM8FdZkkHDc= -=+ax/ +iD8DBQFCa2nAxvWNPsk/ZP4RAhkMAKCgvXWl5pWS5qezoN8B4Paywl1GlQCeKEs6 +UBpcdyd0cJtOrcmg/B6f6Hg= +=q4oo -----END PGP SIGNATURE----- diff --git a/sys-apps/portage/files/digest-portage-2.0.51.20-r3 b/sys-apps/portage/files/digest-portage-2.0.51.20-r3 deleted file mode 100644 index 50f1663b40b0..000000000000 --- a/sys-apps/portage/files/digest-portage-2.0.51.20-r3 +++ /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.20-r4 b/sys-apps/portage/files/digest-portage-2.0.51.20-r4 new file mode 100644 index 000000000000..50f1663b40b0 --- /dev/null +++ b/sys-apps/portage/files/digest-portage-2.0.51.20-r4 @@ -0,0 +1 @@ +MD5 2a954eb155660fea05276f648816de34 portage-2.0.51.20.tar.bz2 254269 diff --git a/sys-apps/portage/files/portage-fixes.patch b/sys-apps/portage/files/portage-fixes.patch index 801a460733e7..c4bb06db1323 100644 --- a/sys-apps/portage/files/portage-fixes.patch +++ b/sys-apps/portage/files/portage-fixes.patch @@ -1,5 +1,14 @@ --- pym/portage.py 23 Apr 2005 07:26:04 -0000 1.524.2.59 +++ pym/portage.py 23 Apr 2005 14:48:34 -0000 +@@ -4,7 +4,7 @@ + # $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/files/portage-fixes.patch,v 1.2 2005/04/24 09:40:59 jstubbs Exp $ + cvs_id_string="$Id: portage-fixes.patch,v 1.2 2005/04/24 09:40:59 jstubbs Exp $"[5:-2] + +-VERSION="2.0.51.20" ++VERSION="2.0.51.20-r4" + + # =========================================================================== + # 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") diff --git a/sys-apps/portage/portage-2.0.51.20-r3.ebuild b/sys-apps/portage/portage-2.0.51.20-r3.ebuild deleted file mode 100644 index e40de0ea437a..000000000000 --- a/sys-apps/portage/portage-2.0.51.20-r3.ebuild +++ /dev/null @@ -1,181 +0,0 @@ -# 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-r3.ebuild,v 1.2 2005/04/24 09:24:35 jstubbs Exp $ - -inherit toolchain-funcs - -DESCRIPTION="The Portage Package Management System. The primary package management and distribution system for Gentoo." -HOMEPAGE="http://www.gentoo.org/" - -SRC_URI="mirror://gentoo/${PN}-${PV}.tar.bz2 http://dev.gentoo.org/~jstubbs/releases/${PN}-${PV}.tar.bz2" -LICENSE="GPL-2" - -SLOT="0" -#KEYWORDS=" alpha amd64 arm hppa ia64 mips ppc ppc-macos ppc64 s390 sh sparc x86" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86" -RESTRICT="nosandbox sandbox multilib-pkg-force" - -# Disable the sandbox on portages that don't support RESTRICT="nosandbox" -export SANDBOX_DISABLED="1" - -IUSE="build selinux" -DEPEND="" -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 ) !x86-fbsd? ( !ppc-macos? ( sys-apps/sandbox ) ) selinux? ( >=dev-python/python-selinux-2.15 )" - -S=${WORKDIR}/${PN}-${PV} - - -python_has_lchown() { - [ "$(python -c 'import os; print "lchown" in dir(os)')" = "True" ] -} - -src_unpack() { - unpack ${A} - patch -d ${S} -p0 -g0 < ${FILESDIR}/emerge-fixes.patch - patch -d ${S} -p0 -g0 < ${FILESDIR}/portage-fixes.patch - patch -d ${S} -p0 -g0 < ${FILESDIR}/dispatch-conf-fixes.patch - patch -d ${S} -p0 -g0 < ${FILESDIR}/repoman-fixes.patch -} - -src_compile() { - python -O -c "import compileall; compileall.compile_dir('${S}/pym')" - - cd ${S}/src - $(tc-getCC) ${CFLAGS} -o tbz2tool tbz2tool.c - - if ! python_has_lchown; then - cd ${S}/src/python-missingos - ./setup.py build || die "Failed to build missingos module" - fi - - if use x86-fbsd; then - cd ${S}/src/bsd-flags - ./setup.py build || die "Failed to install bsd-chflags module" - fi -} - -src_install() { - cd ${S}/cnf - insinto /etc - doins etc-update.conf dispatch-conf.conf make.globals - if [ -f "make.conf.${ARCH}" ]; then - newins make.conf.${ARCH} make.conf.example - else - eerror "" - eerror "Portage does not have an arch-specific configuration for this arch." - eerror "Please notify the arch maintainer about this issue. Using generic." - eerror "" - newins make.conf make.conf.example - fi - - if ! python_has_lchown; then - cd ${S}/src/python-missingos - ./setup.py install --root ${D} || die "Failed to install missingos module" - fi - - if use x86-fbsd; then - cd ${S}/src/bsd-flags - ./setup.py install --root ${D} || die "Failed to install bsd-chflags module" - fi - - dodir /usr/lib/portage/bin - exeinto /usr/lib/portage/bin - cd ${S}/bin - doexe * - doexe ${S}/src/tbz2tool - dosym newins /usr/lib/portage/bin/donewins - - dodir /usr/lib/portage/pym - insinto /usr/lib/portage/pym - cd ${S}/pym - doins * - - doman ${S}/man/*.[0-9] - dodoc ${S}/ChangeLog - - dodir /usr/bin /usr/sbin - dosym ../lib/portage/bin/emerge /usr/bin/emerge - 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/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 - 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/regenworld /usr/sbin/regenworld - dosym ../lib/portage/bin/emerge-webrsync /usr/sbin/emerge-webrsync -} - -pkg_preinst() { - if has livecvsportage ${FEATURES} && [ "${ROOT}" = "/" ]; then - rm -rf ${IMAGE}/usr/lib/portage/pym/* - mv ${IMAGE}/usr/lib/portage/bin/tbz2tool ${T} - rm -rf ${IMAGE}/usr/lib/portage/bin/* - mv ${T}/tbz2tool ${IMAGE}/usr/lib/portage/bin/ - 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 - - #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" ] && - [ -f ${ROOT}/var/cache/edb/world ] && - [ ! -h ${ROOT}/var/cache/edb/world ]; then - mv ${ROOT}/var/cache/edb/world ${ROOT}/var/lib/portage/world - ln -s ../../lib/portage/world /var/cache/edb/world - fi - - echo - einfo "Feature additions are noted in help and make.conf 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 - ewarn "NOTICE: There have been changes in the location of some internal files" - ewarn " to better match the FHS. The changes do not directly affect users" - ewarn " but please be advised that changing between versions of portage" - ewarn " with and without these changes may introduce some inconsistencies" - ewarn " in package data regarding 'world' and 'virtuals' (provides)." - echo - einfo " /var/cache/edb/world has moved to /var/lib/portage/world" - echo - einfo " /var/cache/edb/virtuals has been deprecated and is now calculated" - einfo " on demand. Strictly _USER_ modifications to virtuals may go into" - einfo " /etc/portage/profile/virtuals and will not be modified by portage." - echo - - for X in ${ROOT}etc/._cfg????_make.globals; do - # Overwrite the globals file automatically. - [ -e "${X}" ] && mv -f "${X}" "${ROOT}etc/make.globals" - done - - einfo "You may run 'emerge metadata' to perform cache updates if you have" - einfo "changed versions of portage. This will provide a fairly dramatic" - einfo "speedup. Alternatively, you may 'emerge sync' if it has been more" - einfo "than 30 minutes since your last sync." -} diff --git a/sys-apps/portage/portage-2.0.51.20-r4.ebuild b/sys-apps/portage/portage-2.0.51.20-r4.ebuild new file mode 100644 index 000000000000..5a9628d42c9e --- /dev/null +++ b/sys-apps/portage/portage-2.0.51.20-r4.ebuild @@ -0,0 +1,181 @@ +# 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-r4.ebuild,v 1.1 2005/04/24 09:40:59 jstubbs Exp $ + +inherit toolchain-funcs + +DESCRIPTION="The Portage Package Management System. The primary package management and distribution system for Gentoo." +HOMEPAGE="http://www.gentoo.org/" + +SRC_URI="mirror://gentoo/${PN}-${PV}.tar.bz2 http://dev.gentoo.org/~jstubbs/releases/${PN}-${PV}.tar.bz2" +LICENSE="GPL-2" + +SLOT="0" +#KEYWORDS=" alpha amd64 arm hppa ia64 mips ppc ppc-macos ppc64 s390 sh sparc x86" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86" +RESTRICT="nosandbox sandbox multilib-pkg-force" + +# Disable the sandbox on portages that don't support RESTRICT="nosandbox" +export SANDBOX_DISABLED="1" + +IUSE="build selinux" +DEPEND="" +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 ) !x86-fbsd? ( !ppc-macos? ( sys-apps/sandbox ) ) selinux? ( >=dev-python/python-selinux-2.15 )" + +S=${WORKDIR}/${PN}-${PV} + + +python_has_lchown() { + [ "$(python -c 'import os; print "lchown" in dir(os)')" = "True" ] +} + +src_unpack() { + unpack ${A} + patch -d ${S} -p0 -g0 < ${FILESDIR}/emerge-fixes.patch + patch -d ${S} -p0 -g0 < ${FILESDIR}/portage-fixes.patch + patch -d ${S} -p0 -g0 < ${FILESDIR}/dispatch-conf-fixes.patch + patch -d ${S} -p0 -g0 < ${FILESDIR}/repoman-fixes.patch +} + +src_compile() { + python -O -c "import compileall; compileall.compile_dir('${S}/pym')" + + cd ${S}/src + $(tc-getCC) ${CFLAGS} -o tbz2tool tbz2tool.c + + if ! use ppc-macos && ! python_has_lchown; then + cd ${S}/src/python-missingos + ./setup.py build || die "Failed to build missingos module" + fi + + if use x86-fbsd; then + cd ${S}/src/bsd-flags + ./setup.py build || die "Failed to install bsd-chflags module" + fi +} + +src_install() { + cd ${S}/cnf + insinto /etc + doins etc-update.conf dispatch-conf.conf make.globals + if [ -f "make.conf.${ARCH}" ]; then + newins make.conf.${ARCH} make.conf.example + else + eerror "" + eerror "Portage does not have an arch-specific configuration for this arch." + eerror "Please notify the arch maintainer about this issue. Using generic." + eerror "" + newins make.conf make.conf.example + fi + + if ! use ppc-macos && ! python_has_lchown; then + cd ${S}/src/python-missingos + ./setup.py install --root ${D} || die "Failed to install missingos module" + fi + + if use x86-fbsd; then + cd ${S}/src/bsd-flags + ./setup.py install --root ${D} || die "Failed to install bsd-chflags module" + fi + + dodir /usr/lib/portage/bin + exeinto /usr/lib/portage/bin + cd ${S}/bin + doexe * + doexe ${S}/src/tbz2tool + dosym newins /usr/lib/portage/bin/donewins + + dodir /usr/lib/portage/pym + insinto /usr/lib/portage/pym + cd ${S}/pym + doins * + + doman ${S}/man/*.[0-9] + dodoc ${S}/ChangeLog + + dodir /usr/bin /usr/sbin + dosym ../lib/portage/bin/emerge /usr/bin/emerge + 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/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 + 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/regenworld /usr/sbin/regenworld + dosym ../lib/portage/bin/emerge-webrsync /usr/sbin/emerge-webrsync +} + +pkg_preinst() { + if has livecvsportage ${FEATURES} && [ "${ROOT}" = "/" ]; then + rm -rf ${IMAGE}/usr/lib/portage/pym/* + mv ${IMAGE}/usr/lib/portage/bin/tbz2tool ${T} + rm -rf ${IMAGE}/usr/lib/portage/bin/* + mv ${T}/tbz2tool ${IMAGE}/usr/lib/portage/bin/ + 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 + + #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" ] && + [ -f ${ROOT}/var/cache/edb/world ] && + [ ! -h ${ROOT}/var/cache/edb/world ]; then + mv ${ROOT}/var/cache/edb/world ${ROOT}/var/lib/portage/world + ln -s ../../lib/portage/world /var/cache/edb/world + fi + + echo + einfo "Feature additions are noted in help and make.conf 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 + ewarn "NOTICE: There have been changes in the location of some internal files" + ewarn " to better match the FHS. The changes do not directly affect users" + ewarn " but please be advised that changing between versions of portage" + ewarn " with and without these changes may introduce some inconsistencies" + ewarn " in package data regarding 'world' and 'virtuals' (provides)." + echo + einfo " /var/cache/edb/world has moved to /var/lib/portage/world" + echo + einfo " /var/cache/edb/virtuals has been deprecated and is now calculated" + einfo " on demand. Strictly _USER_ modifications to virtuals may go into" + einfo " /etc/portage/profile/virtuals and will not be modified by portage." + echo + + for X in ${ROOT}etc/._cfg????_make.globals; do + # Overwrite the globals file automatically. + [ -e "${X}" ] && mv -f "${X}" "${ROOT}etc/make.globals" + done + + einfo "You may run 'emerge metadata' to perform cache updates if you have" + einfo "changed versions of portage. This will provide a fairly dramatic" + einfo "speedup. Alternatively, you may 'emerge sync' if it has been more" + einfo "than 30 minutes since your last sync." +} -- cgit v1.2.3-65-gdbad