From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 8FFB7138010 for ; Tue, 2 Apr 2013 16:57:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1BE6AE0716; Tue, 2 Apr 2013 16:57:52 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A607BE0716 for ; Tue, 2 Apr 2013 16:57:51 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9B37E33DC5C for ; Tue, 2 Apr 2013 16:57:50 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 319E1E4073 for ; Tue, 2 Apr 2013 16:57:49 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1364921849.136b887caa911c44899cfeff6a3383bd77ebb98f.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: 136b887caa911c44899cfeff6a3383bd77ebb98f X-VCS-Branch: prefix Date: Tue, 2 Apr 2013 16:57:49 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: b58a7ad9-4bc9-4c79-8a51-f93a3f196dee X-Archives-Hash: 630054149956aa857af2d0ecc62b1df2 commit: 136b887caa911c44899cfeff6a3383bd77ebb98f Author: Fabian Groffen gentoo org> AuthorDate: Tue Apr 2 16:57:29 2013 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Tue Apr 2 16:57:29 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=136b887c Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix Conflicts: bin/ebuild-helpers/ecompressdir bin/ebuild-helpers/ecompressdir | 4 ++-- bin/egencache | 11 ++++++++--- pym/portage/_emirrordist/main.py | 12 ++++++++---- pym/portage/dbapi/bintree.py | 19 +++++++++++++++++++ 4 files changed, 37 insertions(+), 9 deletions(-) diff --cc bin/ebuild-helpers/ecompressdir index da2d001,40079c0..310981a --- a/bin/ebuild-helpers/ecompressdir +++ b/bin/ebuild-helpers/ecompressdir @@@ -1,8 -1,8 +1,8 @@@ -#!/bin/bash +#!@PORTAGE_BASH@ - # Copyright 1999-2012 Gentoo Foundation + # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/helper-functions.sh +source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/helper-functions.sh if [[ -z $1 ]] ; then __helpers_die "${0##*/}: at least one argument needed"