From: Jason Stubbs Date: Sun, 2 Oct 2005 07:11:55 +0000 (+0000) Subject: 2.0.53_rc2 ~arch release X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5e20014a2c6898890b1ffe21e8fd4e42aef48cad;p=gentoo.git 2.0.53_rc2 ~arch release Package-Manager: portage-1.524.2.76-cvs --- diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest index 729cb5220e26..1f3cddbeeba8 100644 --- a/sys-apps/portage/Manifest +++ b/sys-apps/portage/Manifest @@ -4,23 +4,18 @@ Hash: SHA1 MD5 fc0f2ec6f18f9744037a47705057b9d1 ChangeLog 1108 MD5 d5d5b818347fd87b290ecb0b17516b34 files/05portage.envd 34 MD5 f29e1e5ab80c7078b004e60002173ccb files/2.0.51.22-fixes.patch 9339 -MD5 7e8e000ab445e5860a8dae291ea2dfe7 files/2.0.52-fixes.patch 1420 MD5 a754ca9e2eea9f8484bf5f93d339043a files/README.RESCUE 1911 -MD5 f8627c17a73d8568e94f92ea15c69360 files/digest-portage-2.0.51.19 70 MD5 159e3519c10187285ab4b0a536b2a1d3 files/digest-portage-2.0.51.22-r2 70 -MD5 635a143e3d0587687c2f43209de5c53e files/digest-portage-2.0.52-r1 67 -MD5 c0bbeeb302bc22a9e0e6e91c76526dcc files/digest-portage-2.0.53_rc1 71 +MD5 b295a36d15f82fa34eeb24929920b0ab files/digest-portage-2.0.53_rc2 71 MD5 87eff9b432487777e55298413c33ab4a files/digest-portage-2.1.0_alpha20050718 80 MD5 e57748276505fab96a2ab4e64de45366 metadata.xml 220 -MD5 8acf56587de4c66daf1cfed2cc8be000 portage-2.0.51.19.ebuild 13221 MD5 a4921b091c6057013549c33f933bfd40 portage-2.0.51.22-r2.ebuild 5708 -MD5 d84a1f0f9b6dad85ff874923647de011 portage-2.0.52-r1.ebuild 3640 -MD5 e631056f084ca2e3c8b56aaa1fa99885 portage-2.0.53_rc1.ebuild 3731 +MD5 fb71edf86a44d8a79da19c49bfe60fbe portage-2.0.53_rc2.ebuild 3653 MD5 7c109f64a1b96c1134ac490d0233fa3b portage-2.1.0_alpha20050718.ebuild 2566 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2 (GNU/Linux) -iD8DBQFDPrYqxvWNPsk/ZP4RAmCgAKCQMes0TTDeQel8NzVY9E8HjtoRdACgsLNP -6YQNHwDVbmUBQ8LD2oPUNWY= -=yl2P +iD8DBQFDP4hkxvWNPsk/ZP4RAiOSAKCSg463Md8x1dQLBRNt6uCJsk+vyQCfU8qL +SJebyc56D8OKjIRmkZxkA7o= +=2G5C -----END PGP SIGNATURE----- diff --git a/sys-apps/portage/files/2.0.52-fixes.patch b/sys-apps/portage/files/2.0.52-fixes.patch deleted file mode 100644 index 70e519e09a62..000000000000 --- a/sys-apps/portage/files/2.0.52-fixes.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff -uNr portage-2.0.52/bin/ebuild.sh portage-2.0.52-r1/bin/ebuild.sh ---- portage-2.0.52/bin/ebuild.sh 2005-09-08 20:39:50.000000000 +0900 -+++ portage-2.0.52-r1/bin/ebuild.sh 2005-09-09 08:46:44.452389888 +0900 -@@ -365,10 +365,10 @@ - myfail="failure unpacking ${x}" - case "${x##*.}" in - tar) -- tar ${tarvars} xf "${srcdir}${x}" || die "$myfail" -+ tar ${tarvars} -xf "${srcdir}${x}" || die "$myfail" - ;; - tgz) -- tar ${tarvars} xzf "${srcdir}${x}" || die "$myfail" -+ tar ${tarvars} -xzf "${srcdir}${x}" || die "$myfail" - ;; - tbz2) - bzip2 -dc "${srcdir}${x}" | tar xf - ${tarvars} -@@ -379,7 +379,7 @@ - ;; - gz|Z|z) - if [ "${y}" == "tar" ]; then -- tar ${tarvars} xzf "${srcdir}${x}" || die "$myfail" -+ tar ${tarvars} -xzf "${srcdir}${x}" || die "$myfail" - else - gzip -dc "${srcdir}${x}" > ${x%.*} || die "$myfail" - fi -diff -uNr portage-2.0.52/pym/portage.py portage-2.0.52-r1/pym/portage.py ---- portage-2.0.52/pym/portage.py 2005-09-09 00:21:09.080009560 +0900 -+++ portage-2.0.52-r1/pym/portage.py 2005-09-09 08:47:34.006856464 +0900 -@@ -4,7 +4,7 @@ - # $Id: /var/cvsroot/gentoo-src/portage/pym/portage.py,v 1.524.2.76 2005/05/29 12:40:08 jstubbs Exp $ - - --VERSION="2.0.52" -+VERSION="2.0.52-r1" - - # =========================================================================== - # START OF IMPORTS -- START OF IMPORTS -- START OF IMPORTS -- START OF IMPORT diff --git a/sys-apps/portage/files/digest-portage-2.0.51.19 b/sys-apps/portage/files/digest-portage-2.0.51.19 deleted file mode 100644 index 7bfc7f96d649..000000000000 --- a/sys-apps/portage/files/digest-portage-2.0.51.19 +++ /dev/null @@ -1 +0,0 @@ -MD5 2f1093b5a91848bf45f2325b583629b9 portage-2.0.51.19.tar.bz2 284502 diff --git a/sys-apps/portage/files/digest-portage-2.0.52-r1 b/sys-apps/portage/files/digest-portage-2.0.52-r1 deleted file mode 100644 index fc872d3ff32a..000000000000 --- a/sys-apps/portage/files/digest-portage-2.0.52-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 2ce8c438bfcd2a966ba95da7aa0c1bf5 portage-2.0.52.tar.bz2 242934 diff --git a/sys-apps/portage/files/digest-portage-2.0.53_rc1 b/sys-apps/portage/files/digest-portage-2.0.53_rc1 deleted file mode 100644 index 29badf3531a6..000000000000 --- a/sys-apps/portage/files/digest-portage-2.0.53_rc1 +++ /dev/null @@ -1 +0,0 @@ -MD5 518311aa869a280c402c68145eec61ff portage-2.0.53_rc1.tar.bz2 235611 diff --git a/sys-apps/portage/files/digest-portage-2.0.53_rc2 b/sys-apps/portage/files/digest-portage-2.0.53_rc2 new file mode 100644 index 000000000000..ac48d55e01bf --- /dev/null +++ b/sys-apps/portage/files/digest-portage-2.0.53_rc2 @@ -0,0 +1 @@ +MD5 9338825bb76a3db100107d5bfd9bd523 portage-2.0.53_rc2.tar.bz2 235762 diff --git a/sys-apps/portage/portage-2.0.51.19.ebuild b/sys-apps/portage/portage-2.0.51.19.ebuild deleted file mode 100644 index 5a6a56d98455..000000000000 --- a/sys-apps/portage/portage-2.0.51.19.ebuild +++ /dev/null @@ -1,391 +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.19.ebuild,v 1.3 2005/05/29 08:32:32 vapier Exp $ - -inherit flag-o-matic eutils toolchain-funcs multilib - -# 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 m68k mips ppc ppc-macos ppc64 s390 sh sparc x86" -#KEYWORDS=" ~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~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} -} - -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 has_multilib_profile; then - OABI="${ABI}" - for ABI in $(get_install_abis); 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 - - if [[ $ARCH == "x86-fbsd" ]]; then - cd ${S}/src/bsd-flags - chmod +x setup.py - ./setup.py install --root ${D} || eerror "Failed to install bsd-chflags modules" - 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 has_multilib_profile; then - into / - OABI="${ABI}" - for ABI in $(get_install_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" ] && ! has_multilib_profile; 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 - ln ../../cache/edb/world "${NEWWORLD}" || \ - cp "${OLDWORLD}" "${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." -} - diff --git a/sys-apps/portage/portage-2.0.53_rc1.ebuild b/sys-apps/portage/portage-2.0.53_rc1.ebuild deleted file mode 100644 index 63ceec0aac02..000000000000 --- a/sys-apps/portage/portage-2.0.53_rc1.ebuild +++ /dev/null @@ -1,128 +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.53_rc1.ebuild,v 1.3 2005/10/01 16:14:51 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" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86" - -SLOT="0" -IUSE="build selinux" -DEPEND=">=dev-lang/python-2.2.1" -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} - - -src_unpack() { - unpack ${A} -} - -src_compile() { - python -O -c "import compileall; compileall.compile_dir('${S}/pym')" - - cd "${S}"/src - $(tc-getCC) ${CFLAGS} -o tbz2tool tbz2tool.c - - #Removing until next rc as the compile script points to python-2.2 - #if ! use ppc-macos; then - # cd "${S}"/src/python-missingos - # chmod +x setup.py - # ./setup.py build || die "Failed to build missingos module" - #fi - - if use x86-fbsd; then - cd "${S}"/src/bsd-flags - chmod +x setup.py - ./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 - - #Removing until next rc as the compile script points to python-2.2 - #if ! use ppc-macos; 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 - for x in ebuild emerge portageq repoman tbz2tool xpak; do - dosym ../lib/portage/bin/${x} /usr/bin/${x} - done - - dodir /usr/sbin - for x in archive-conf dispatch-conf emerge-webrsync env-update etc-update fixpackages quickpkg regenworld; do - dosym ../lib/portage/bin/${x} /usr/sbin/${x} - done - - dodir /etc/portage - keepdir /etc/portage - - doenvd ${FILESDIR}/05portage.envd -} - -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/ - else - rm /usr/lib/portage/pym/*.pyc >& /dev/null - rm /usr/lib/portage/pym/*.pyo >& /dev/null - fi -} - -pkg_postinst() { - local x - - 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 - - for x in ${ROOT}etc/._cfg????_make.globals; do - # Overwrite the globals file automatically. - [ -e "${x}" ] && mv -f "${x}" "${ROOT}etc/make.globals" - done -} diff --git a/sys-apps/portage/portage-2.0.52-r1.ebuild b/sys-apps/portage/portage-2.0.53_rc2.ebuild similarity index 95% rename from sys-apps/portage/portage-2.0.52-r1.ebuild rename to sys-apps/portage/portage-2.0.53_rc2.ebuild index de1952cc9db0..65db2c5a51b2 100644 --- a/sys-apps/portage/portage-2.0.52-r1.ebuild +++ b/sys-apps/portage/portage-2.0.53_rc2.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.52-r1.ebuild,v 1.1 2005/09/08 23:57:44 jstubbs Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.53_rc2.ebuild,v 1.1 2005/10/02 07:11:55 jstubbs Exp $ inherit toolchain-funcs @@ -21,8 +21,6 @@ S=${WORKDIR}/${PN}-${PV} src_unpack() { unpack ${A} - cd "${S}" - patch -p1 < ${FILESDIR}/2.0.52-fixes.patch } src_compile() { @@ -58,6 +56,7 @@ src_install() { newins make.conf make.conf.example fi + Removing until next rc as the compile script points to python-2.2 if ! use ppc-macos; then cd "${S}"/src/python-missingos ./setup.py install --root ${D} || die "Failed to install missingos module" @@ -123,6 +122,6 @@ pkg_postinst() { for x in ${ROOT}etc/._cfg????_make.globals; do # Overwrite the globals file automatically. - [ -e "${X}" ] && mv -f "${X}" "${ROOT}etc/make.globals" + [ -e "${x}" ] && mv -f "${x}" "${ROOT}etc/make.globals" done }