diff options
| -rw-r--r-- | sys-apps/portage/Manifest | 8 | ||||
| -rw-r--r-- | sys-apps/portage/files/digest-portage-2.0.51-r15 | 1 | ||||
| -rw-r--r-- | sys-apps/portage/portage-2.0.51-r15.ebuild | 418 |
3 files changed, 424 insertions, 3 deletions
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest index 3e1a12f4d62b..5714aeebfb9b 100644 --- a/sys-apps/portage/Manifest +++ b/sys-apps/portage/Manifest @@ -3,6 +3,7 @@ Hash: SHA1 MD5 ca72ba7dfc1dbdfca358a5bed495785f portage-2.0.51-r13.ebuild 13055 MD5 838be491686bbc8355f44e91020e425c portage-2.0.51-r3.ebuild 12549 +MD5 3372e938b3aa69073a6a677617e168b4 portage-2.0.51-r15.ebuild 14022 MD5 6b6502688f9b9b676e8a524f3a846d72 portage-2.0.51-r10.ebuild 13050 MD5 8c0de8f88d1caaf30287a2042fc2ad24 portage-2.0.51-r12.ebuild 13050 MD5 33b2fdd15b3fb5ce8973e4bd702ca6d8 portage-2.0.51-r14.ebuild 14011 @@ -14,13 +15,14 @@ MD5 7ce81e80c07f03c034055c586114b750 files/digest-portage-2.0.51-r11 71 MD5 ded45fee9effe9096a69c8be02263a7a files/digest-portage-2.0.51-r12 71 MD5 d2e4e3afe0e6ca9708931542fb71cb17 files/digest-portage-2.0.51-r13 71 MD5 720ac5e9cff2265fb89a747b97231911 files/digest-portage-2.0.51-r14 71 +MD5 09fddae109c2b39ee5342f1f56de54c2 files/digest-portage-2.0.51-r15 71 MD5 5ea5d3ffe4a24cd1c719420cd0a2de11 files/digest-portage-2.0.51-r3 70 MD5 a754ca9e2eea9f8484bf5f93d339043a files/README.RESCUE 1911 MD5 8c6ba58bbfddca72824b15dacbed69ec files/gcc-2.95-libsandbox.patch 1163 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) -iD8DBQFB8Ly7BDOEqLMd+jQRAkIyAJ0XFrci6XH1YM0nG3fI5EVNVhbGqwCeNL1U -4J25tgGTu5+6HWQjyM/gFV4= -=I/1X +iD8DBQFB9QR3BDOEqLMd+jQRAoTZAKDULlO0VVuP+mRCQ407+9HwPt2/awCfZpHi ++ufaZHzsdGM2/H+ssFgERDU= +=orUn -----END PGP SIGNATURE----- diff --git a/sys-apps/portage/files/digest-portage-2.0.51-r15 b/sys-apps/portage/files/digest-portage-2.0.51-r15 new file mode 100644 index 000000000000..acde7cbb6b00 --- /dev/null +++ b/sys-apps/portage/files/digest-portage-2.0.51-r15 @@ -0,0 +1 @@ +MD5 d05392625fe6532abe8133721739c5ea portage-2.0.51-r15.tar.bz2 277444 diff --git a/sys-apps/portage/portage-2.0.51-r15.ebuild b/sys-apps/portage/portage-2.0.51-r15.ebuild new file mode 100644 index 000000000000..1ad222161622 --- /dev/null +++ b/sys-apps/portage/portage-2.0.51-r15.ebuild @@ -0,0 +1,418 @@ +# 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-r15.ebuild,v 1.1 2005/01/24 14:21:22 carpaski Exp $ + +inherit flag-o-matic eutils toolchain-funcs + +# 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} +DESCRIPTION="The Portage Package Management System (Similar to BSD's ports). The primary package management and distribution system for Gentoo." +HOMEPAGE="http://www.gentoo.org/" +SRC_URI="http://zarquon.twobit.net/gentoo/portage/${PF}.tar.bz2 http://gentoo.twobit.net/portage/${PF}.tar.bz2 mirror://gentoo/${PF}.tar.bz2" +RESTRICT="nosandbox sandbox primaryuri multilib-pkg-force" + +# Contact carpaski with a reason before you modify any of these please. +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" + +LICENSE="GPL-2" +SLOT="0" +IUSE="build selinux" + +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-2.15 )" + +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}" +} + +check_multilib() { + has_m32 + if [ "$?" == 0 ]; then + einfo "Found valid multilib environment." + einfo "Building with multilib support." + export MULTILIB="1" + else + ewarn "No valid multilib environment found!" + ewarn "Building without multilib support. If" + ewarn "you want to have multilib support," + ewarn "emerge gcc with \"multilib\" in your" + ewarn "useflags." + sleep 5 + fi +} + +src_unpack() { + unpack ${A} + cd ${S} + sed -i 's:hasq maketest:hasq test:g' bin/ebuild.sh + patch pym/portage.py <<END_OF_PATCH_END_OF_PATCH_END_OF_PATCH +--- portage.py 17 Jan 2005 16:38:22 -0000 1.524.2.33 ++++ portage.py 21 Jan 2005 05:19:30 -0000 +@@ -1156,6 +1156,10 @@ + self["PORTDIR_OVERLAY"] = string.join(new_ov) + self.backup_changes("PORTDIR_OVERLAY") + ++ if os.environ.get("PORTAGE_CALLER", "") == "repoman": ++ self["PORTDIR_OVERLAY"] = "" ++ self.backup_changes("PORTDIR_OVERLAY") ++ + self.regenerate() + + +@@ -1170,9 +1170,11 @@ + self["FEATURES"] = string.join(self.features, " ") + self.backup_changes("FEATURES") + +- if "maketest" in features: +- features.append("test") +- features.sort() ++ if "maketest" in self.features: ++ self.features.append("test") ++ self.features.sort() ++ self["FEATURES"] = string.join(self.features, " ") ++ self.backup_changes("FEATURES") + + if mycpv: + self.setcpv(mycpv) +END_OF_PATCH_END_OF_PATCH_END_OF_PATCH + true +} + +src_compile() { + export CC="$(tc-getCC)" + cd ${S}/src; ${CC} ${CFLAGS} tbz2tool.c -o tbz2tool + + cd ${S}/src/sandbox-1.1 + if use ppc-macos || use x86-fbsd; then + ewarn "NOT BUILDING SANDBOX ON ${ARCH}" + elif [ -n "${MULTILIB_ABIS}" ]; then + OABI="${ABI}" + for ABI in $(get_abi_order); do + export ABI + make clean + make CFLAGS="-O1 -pipe -DSB_HAVE_64BIT_ARCH" libsandbox.so || die + mv libsandbox.so libsandbox.so.${ABI} + done + make clean + export ABI="${DEFAULT_ABI}" + make CFLAGS="-O1 -pipe -DSB_HAVE_64BIT_ARCH" sandbox || die + ABI="${OABI}" + elif [ "${ARCH}" == "amd64" ]; then + check_multilib + make CFLAGS="-O1 -pipe" HAVE_64BIT_ARCH="${MULTILIB}" || die + elif [ "${ARCH}" == "x86" ]; then + make CFLAGS="-march=i386 -O1 -pipe" || die + else + make CFLAGS="-O1 -pipe" || die + fi + + cd ${S}/bin +} + +src_install() { + #config files + cd ${S}/cnf + insinto /etc + if [ -f "make.globals.${ARCH}" ]; then + newins make.globals.${ARCH} make.globals + 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 "" + sleep 3 + doins make.globals + newins make.conf make.conf.example + fi + + 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 + if [ -x "$(type -p python2.3)" ]; then + ./setup.py install --root ${D} || eerror "Failed to install missingos module -- python2.2 broken?" + else + ./setup.py install --root ${D} || die "Failed to install missingos module" + fi + fi + + + dodir /usr/lib/portage/pym + cd ${S}/pym + insinto /usr/lib/portage/pym + doins *.py + + #binaries, libraries and scripts + dodir /usr/lib/portage/bin + cd ${S}/bin + exeinto /usr/lib/portage/bin + doexe * + doexe ${S}/src/tbz2tool + + #install sandbox + cd ${S}/src/sandbox-1.1 + if use ppc-macos || use x86-fbsd; then + ewarn "Not installing sandbox on ${ARCH}" + elif [ -n "${MULTILIB_ABIS}" ]; then + into / + OABI="${ABI}" + for ABI in ${MULTILIB_ABIS}; do + newlib.so libsandbox.so.${ABI} libsandbox.so + done + into /usr + + exeinto /usr/lib/portage/bin + doexe sandbox + + insinto /usr/lib/portage/lib + doins sandbox.bashrc + + ABI="${OABI}" + elif [ "${ARCH}" == "amd64" -a -z "${MULTILIB_ABIS}" ]; then + check_multilib + make DESTDIR="${D}" HAVE_64BIT_ARCH="${MULTILIB}" install || \ + die "Failed to install sandbox" + else + make DESTDIR="${D}" install || \ + die "Failed to install sandbox" + fi + + #symlinks + dodir /usr/bin /usr/sbin + dosym ../lib/portage/bin/emerge /usr/bin/emerge + dosym ../lib/portage/bin/ebuild /usr/bin/ebuild + dosym ../lib/portage/bin/ebuild /usr/sbin/ebuild + + dosym ../lib/portage/bin/pkgmerge /usr/sbin/pkgmerge + 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/*.[0-9] + + # 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 + + # If we return true, then we don't have HIGHEST_PROTOCOL. + # We need to modify the source for this case. + if python -c "import cPickle,sys; sys.exit('HIGHEST_PROTOCOL' in dir(cPickle))"; then + sed -i "s:cPickle.HIGHEST_PROTOCOL:-1:" "${IMAGE}"/usr/lib/portage/pym/*.py + 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 + + install -o root -g portage -m 0755 -d "${ROOT}/etc/portage" + install -o root -g portage -m 2775 -d "${ROOT}/etc/portage/sets" + # u+rwx,g+srwx --- This is a secure directory for temp files. + + install -o root -g portage -m 2770 -d "${ROOT}/var/lib/portage" + einfo "Checking ${ROOT}/var/lib/portage for bad/illegal files:" + find "${ROOT}/var/lib/portage" ! -group portage -o -perm -002 -print0 | ${XARGS} -0n 500 rm -Rvf + + OLDWORLD="${ROOT}/var/cache/edb/world" + NEWWORLD="${ROOT}/var/lib/portage/world" + + if [ ! -f "${NEWWORLD}" ]; then + cp "${OLDWORLD}" "${NEWWORLD}" && \ + rm -f "${OLDWORLD}" && \ + ln ../../lib/portage/world "${NEWWORLD}" + fi + + if [ ! -f "/etc/portage/package.mask" ]; then + if [ -f "/etc/portage/profile/package.mask" ]; then + ln /etc/portage/profile/package.mask /etc/portage/package.mask + einfo "/etc/portage/profile/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 "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 + + if [ -z "$PORTAGE_TEST" ]; then + #for TICKER in 1 2 3 4 5 6 7 8 9 10; do + # echo -ne "\a" ; sleep 0.$(( $RANDOM % 9 + 1)) &>/dev/null ; sleep 0,$(( $RANDOM % 9 + 1)) &>/dev/null + #done + sleep 3 + + # 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." + ls -l /var/cache/edb/counter.old + 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 -m2755 ${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] + + # we gotta re-compile these modules and deal with systems with clock skew (stale compiled files) + einfo "Compiling python modules..." + python -c 'import compileall; compileall.compile_path()' &> /dev/null + python -c "import compileall; compileall.compile_dir('${ROOT}usr/lib/portage/pym')" &> /dev/null + + 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 + + if [ -d "${ROOT}usr/portage/distfiles" ]; then + find "${ROOT}usr/portage/distfiles" -type f -maxdepth 1 -print0 2>/dev/null | \ + ${XARGS} -0 -n 500 chgrp portage &> /dev/null + + find "${ROOT}usr/portage/distfiles" -type f -maxdepth 1 -print0 2>/dev/null | \ + ${XARGS} -0 -n 500 chmod 0644 &> /dev/null + + find "${ROOT}usr/portage/distfiles/cvs-src" -type f -maxdepth 1 -print0 2>/dev/null | \ + ${XARGS} -0 -n 500 chown portage &> /dev/null + + find "${ROOT}usr/portage/distfiles/cvs-src" -type f -maxdepth 1 -print0 2>/dev/null | \ + ${XARGS} -0 -n 500 chmod u+w &> /dev/null + + chmod 2775 "${ROOT}usr/portage/distfiles" + chmod 2775 "${ROOT}usr/portage/distfiles/cvs-src" + fi + if [ -d "${ROOT}/${PORTDIR}/distfiles" ]; then + find "${ROOT}/${PORTDIR}/distfiles" -type f -maxdepth 1 -print0 2>/dev/null | \ + ${XARGS} -0 -n 500 chgrp portage &> /dev/null + + find "${ROOT}/${PORTDIR}/distfiles" -type f -maxdepth 1 -print0 2>/dev/null | \ + ${XARGS} -0 -n 500 chmod 0644 &> /dev/null + + find "${ROOT}/${PORTDIR}/distfiles/cvs-src" -type f -maxdepth 1 -print0 2>/dev/null | \ + ${XARGS} -0 -n 500 chown portage &> /dev/null + + find "${ROOT}/${PORTDIR}/distfiles/cvs-src" -type f -maxdepth 1 -print0 2>/dev/null | \ + ${XARGS} -0 -n 500 chmod u+w &> /dev/null + + chmod 2775 "${ROOT}/${PORTDIR}/distfiles" + chmod 2775 "${ROOT}/${PORTDIR}/distfiles/cvs-src" + fi + + chown -R root:portage ${ROOT}var/cache/edb + find ${ROOT}var/cache/edb -type f -print0 | ${XARGS} -0 -n 500 chmod 664 + + 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." +} + |