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 1QyphN-0007VA-HV for garchives@archives.gentoo.org; Wed, 31 Aug 2011 18:39:41 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3F1B521C2EC; Wed, 31 Aug 2011 18:39:34 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 0C74F21C2EC for ; Wed, 31 Aug 2011 18:39:33 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8EC1A1B4016 for ; Wed, 31 Aug 2011 18:39:33 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id E998280040 for ; Wed, 31 Aug 2011 18:39:32 +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: <3b74444f6684d7696e549cbdb76b8d1a0795fe2d.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: 3b74444f6684d7696e549cbdb76b8d1a0795fe2d Date: Wed, 31 Aug 2011 18:39:32 +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: 92002b5cf684b96ff2b1bc91daccf59e commit: 3b74444f6684d7696e549cbdb76b8d1a0795fe2d Author: Fabian Groffen gentoo org> AuthorDate: Wed Aug 31 18:39:04 2011 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Wed Aug 31 18:39:04 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D3b74444f Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix bin/repoman | 5 +- cnf/make.globals | 3 + man/make.conf.5 | 15 ++++++- man/repoman.1 | 3 +- pym/_emerge/EbuildBuild.py | 2 +- pym/_emerge/actions.py | 3 + pym/_emerge/main.py | 43 ++++++++++++++= +++-- pym/portage/const.py | 3 +- .../package/ebuild/_config/special_env_vars.py | 2 +- pym/portage/package/ebuild/doebuild.py | 4 +- pym/portage/tests/emerge/test_simple.py | 7 +-- pym/portage/tests/repoman/test_simple.py | 7 ++- pym/portage/util/env_update.py | 1 + 13 files changed, 77 insertions(+), 21 deletions(-) diff --cc cnf/make.globals index ae98d16,fcd0b41..7aaec5e --- a/cnf/make.globals +++ b/cnf/make.globals @@@ -101,9 -101,10 +101,12 @@@ PORTAGE_RSYNC_OPTS=3D"--recursive --link # message should be produced. PORTAGE_SYNC_STALE=3D"30" =20 + # Executed before emerge exit if FEATURES=3Dclean-logs is enabled. + PORT_LOGDIR_CLEAN=3D"find \"\${PORT_LOGDIR}\" -type f ! -name \"summary= .log*\" -mtime +7 -delete" +=20 # Minimal CONFIG_PROTECT +# NOTE: in Prefix, these are NOT prefixed on purpose, because the +# profiles define them too CONFIG_PROTECT=3D"/etc" CONFIG_PROTECT_MASK=3D"/etc/env.d" =20