From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1PtRUZ-0008Rg-1W for garchives@archives.gentoo.org; Sat, 26 Feb 2011 21:15:55 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8AB3D1C016; Sat, 26 Feb 2011 21:15:47 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 437E61C016 for ; Sat, 26 Feb 2011 21:15:47 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8F11B1B416D for ; Sat, 26 Feb 2011 21:15:46 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id F1D218006A for ; Sat, 26 Feb 2011 21:15:45 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <2c30998a168fbb2f0ebca7d5e409be000793e816.grobian@gentoo> Subject: [gentoo-commits] proj/portage:prefix commit in: / X-VCS-Repository: proj/portage X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 2c30998a168fbb2f0ebca7d5e409be000793e816 Date: Sat, 26 Feb 2011 21:15:45 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: dd061fe580705b9e24244f7a0fa247cc commit: 2c30998a168fbb2f0ebca7d5e409be000793e816 Author: Fabian Groffen gentoo org> AuthorDate: Sat Feb 26 21:13:21 2011 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Sat Feb 26 21:13:21 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D2c30998a Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix Conflicts: bin/ebuild-helpers/4/dodoc bin/ebuild-helpers/doins bin/ebuild.sh bin/isolated-functions.sh bin/misc-functions.sh bin/ebuild-helpers/4/dodoc | 49 +------ bin/ebuild-helpers/dodoc | 6 +- bin/ebuild-helpers/doins | 17 ++- bin/ebuild.sh | 14 +-- bin/egencache | 45 +++++- bin/isolated-functions.sh | 4 +- bin/misc-functions.sh | 4 +- bin/repoman | 3 + cnf/sets/portage.conf | 2 +- doc/package/ebuild/eapi/4.docbook | 2 +- man/ebuild.1 | 6 +- man/ebuild.5 | 2 +- man/emerge.1 | 30 +++- man/repoman.1 | 3 + pym/_emerge/BinpkgVerifier.py | 6 +- pym/_emerge/EbuildExecuter.py | 3 +- pym/_emerge/Scheduler.py | 4 +- pym/_emerge/SubProcess.py | 3 +- pym/_emerge/actions.py | 36 ++++- pym/_emerge/create_depgraph_params.py | 16 ++- pym/_emerge/depgraph.py | 256 +++++++++++++++++++++++-= ------ pym/_emerge/help.py | 22 ++- pym/_emerge/main.py | 43 +++++- pym/_emerge/resolver/output.py | 10 +- pym/_emerge/unmerge.py | 4 +- pym/portage/dbapi/bintree.py | 16 ++- pym/portage/dbapi/vartree.py | 14 ++- pym/portage/dep/__init__.py | 6 +- pym/portage/dep/dep_check.py | 35 +++-- pym/portage/getbinpkg.py | 8 +- pym/portage/mail.py | 38 +++-- pym/portage/tests/resolver/test_depth.py | 248 ++++++++++++++++++++++++= +++++ pym/repoman/checks.py | 14 ++- runtests.sh | 2 +- 34 files changed, 758 insertions(+), 213 deletions(-) diff --cc bin/ebuild-helpers/doins index 882e19c,0aedcb9..e354ee4 --- a/bin/ebuild-helpers/doins +++ b/bin/ebuild-helpers/doins @@@ -1,9 -1,20 +1,20 @@@ -#!/bin/bash +#!@PORTAGE_BASH@ - # Copyright 1999-2010 Gentoo Foundation + # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 =20 -source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.s= h +source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh =20 + if [[ ${0##*/} =3D=3D dodoc ]] ; then + if [ $# -eq 0 ] ; then + # default_src_install may call dodoc with no arguments + # when DOC is defined but empty, so simply return + # sucessfully in this case. + exit 0 + fi + export INSOPTIONS=3D-m0644 + export INSDESTTREE=3Dusr/share/doc/${PF}/${_E_DOCDESTTREE_} + fi +=20 if [ $# -lt 1 ] ; then helpers_die "${0##*/}: at least one argument needed" exit 1 diff --cc bin/ebuild.sh index 629942d,59bf46e..81af747 --- a/bin/ebuild.sh +++ b/bin/ebuild.sh @@@ -1,9 -1,9 +1,9 @@@ -#!/bin/bash +#!@PORTAGE_BASH@ - # Copyright 1999-2010 Gentoo Foundation + # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 =20 -PORTAGE_BIN_PATH=3D"${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}" -PORTAGE_PYM_PATH=3D"${PORTAGE_PYM_PATH:-/usr/lib/portage/pym}" +PORTAGE_BIN_PATH=3D"${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}" +PORTAGE_PYM_PATH=3D"${PORTAGE_PYM_PATH:-@PORTAGE_BASE@/pym}" =20 if [[ $PORTAGE_SANDBOX_COMPAT_LEVEL -lt 22 ]] ; then # Ensure that /dev/std* streams have appropriate sandbox permission fo= r @@@ -1154,15 -1148,10 +1154,12 @@@ dyn_install()=20 fi =20 vecho - vecho ">>> Install ${PF} into ${D} category ${CATEGORY}" + vecho ">>> Install ${PF} into ${ED} category ${CATEGORY}" #our custom version of libtool uses $S and $D to fix #invalid paths in .la files + # PREFIX: I think this is very old, and all patches (both to + # libtool and in ELT-patches) that did this are gone export S D - #some packages uses an alternative to $S to build in, cause - #our libtool to create problematic .la files - export PWORKDIR=3D"$WORKDIR" =20 # Reset exeinto(), docinto(), insinto(), and into() state variables # in case the user is running the install phase multiple times diff --cc bin/isolated-functions.sh index 5200827,2f144a0..def1a54 --- a/bin/isolated-functions.sh +++ b/bin/isolated-functions.sh @@@ -1,5 -1,5 +1,5 @@@ -#!/bin/bash +#!@PORTAGE_BASH@ - # Copyright 1999-2010 Gentoo Foundation + # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 =20 # We need this next line for "die" and "assert". It expands diff --cc bin/misc-functions.sh index 4174f15,ae4cc9e..59cc9d4 mode 100644,100755..100644 --- a/bin/misc-functions.sh +++ b/bin/misc-functions.sh @@@ -1,5 -1,5 +1,5 @@@ -#!/bin/bash +#!@PORTAGE_BASH@ - # Copyright 1999-2010 Gentoo Foundation + # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # # Miscellaneous shell functions that make use of the ebuild env but don= 't need diff --cc pym/_emerge/actions.py index 21f0d10,20220fc..37a9b4a --- a/pym/_emerge/actions.py +++ b/pym/_emerge/actions.py @@@ -2401,56 -2412,10 +2412,58 @@@ def action_sync(settings, trees, mtime= d "cd %s; exec cvs -z0 -q update -dP" % \ (portage._shell_quote(myportdir),), **spawn_kwargs) if retval !=3D os.EX_OK: + writemsg_level("!!! cvs update error; exiting.\n", + noiselevel=3D-1, level=3Dlogging.ERROR) sys.exit(retval) dosyncuri =3D syncuri + elif syncuri[:11]=3D=3D"svn+http://" or syncuri[:6]=3D=3D"svn://" or s= yncuri[:12]=3D=3D"svn+https://": + # Gentoo Prefix hardcoded SVN support + if not os.path.exists(EPREFIX + "/usr/bin/svn"): + print("!!! " + EPREFIX + "/usr/bin/svn does not exist, so SVN suppor= t is disabled.") + print("!!! Type \"emerge dev-util/subversion\" to enable SVN support= .") + sys.exit(1) + svndir=3Dos.path.dirname(myportdir) + if not os.path.exists(myportdir+"/.svn"): + #initial checkout + if syncuri[:4] =3D=3D "svn+": + syncuri =3D syncuri[4:] + print(">>> Starting initial svn checkout with "+syncuri+"...") + if os.path.exists(svndir+"/prefix-overlay"): + print("!!! existing",svndir+"/prefix-overlay directory; exiting.") + sys.exit(1) + try: + os.rmdir(myportdir) + except OSError, e: + if e.errno !=3D errno.ENOENT: + sys.stderr.write( + "!!! existing '%s' directory; exiting.\n" % myportdir) + sys.exit(1) + del e + if portage.spawn("cd "+svndir+"; svn checkout "+syncuri,settings,fre= e=3D1): + print("!!! svn checkout error; exiting.") + sys.exit(1) + os.rename(os.path.join(svndir, "prefix-overlay"), myportdir) + else: + #svn update + print(">>> Starting svn update...") + retval =3D portage.spawn("cd '%s'; svn update" % myportdir, \ + settings, free=3D1) + if retval !=3D os.EX_OK: + sys.exit(retval) + + # write timestamp.chk + try: + if not os.path.exists(os.path.join(myportdir, "metadata")): + os.mkdir(os.path.join(myportdir, "metadata")) + f =3D open(os.path.join(myportdir, "metadata", "timestamp.chk"), 'w'= ) + f.write(time.strftime("%a, %d %b %Y %H:%M:%S +0000", time.gmtime())) + f.write('\n') + f.close() + except IOError, e: + # too bad, next time better luck! + pass + + dosyncuri =3D syncuri else: writemsg_level("!!! Unrecognized protocol: SYNC=3D'%s'\n" % (syncuri,= ), noiselevel=3D-1, level=3Dlogging.ERROR) diff --cc runtests.sh index f3d91a9,6c00ce5..0ae4931 --- a/runtests.sh +++ b/runtests.sh @@@ -1,6 -1,6 +1,6 @@@ -#!/bin/bash +#!@PORTAGE_BASH@ =20 - PYTHON_VERSIONS=3D"2.6 2.7 3.1 3.2" + PYTHON_VERSIONS=3D"2.6 2.7 3.1 3.2 3.3" =20 case "${NOCOLOR:-false}" in yes|true)