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 D44A51381F3 for ; Sun, 15 Sep 2013 11:45:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E1AA0E0943; Sun, 15 Sep 2013 11:45:46 +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 5C1DDE0807 for ; Sun, 15 Sep 2013 11:45:46 +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 6420F33E66D for ; Sun, 15 Sep 2013 11:45:45 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 19F6BE530A for ; Sun, 15 Sep 2013 11:45:44 +0000 (UTC) From: "Thomas Sachau" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Sachau" Message-ID: <1379245338.1ae2962517f3dd4c50959eefdb9e698004832ba7.tommy@gentoo> Subject: [gentoo-commits] proj/multilib-portage:master commit in: sys-apps/portage/ X-VCS-Repository: proj/multilib-portage X-VCS-Files: sys-apps/portage/portage-2.2.4-r1.ebuild sys-apps/portage/portage-2.2.5-r1.ebuild X-VCS-Directories: sys-apps/portage/ X-VCS-Committer: tommy X-VCS-Committer-Name: Thomas Sachau X-VCS-Revision: 1ae2962517f3dd4c50959eefdb9e698004832ba7 X-VCS-Branch: master Date: Sun, 15 Sep 2013 11:45:44 +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: c50d6612-3d2e-43c0-9b99-4110ae770b90 X-Archives-Hash: f50975a150a5eb0e51adc567441ff5ea commit: 1ae2962517f3dd4c50959eefdb9e698004832ba7 Author: Thomas Sachau gentoo org> AuthorDate: Sun Sep 15 11:42:18 2013 +0000 Commit: Thomas Sachau gentoo org> CommitDate: Sun Sep 15 11:42:18 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=1ae29625 Sync portage --- .../{portage-2.2.4-r1.ebuild => portage-2.2.5-r1.ebuild} | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/sys-apps/portage/portage-2.2.4-r1.ebuild b/sys-apps/portage/portage-2.2.5-r1.ebuild similarity index 98% rename from sys-apps/portage/portage-2.2.4-r1.ebuild rename to sys-apps/portage/portage-2.2.5-r1.ebuild index 47411ec..402764f 100644 --- a/sys-apps/portage/portage-2.2.4-r1.ebuild +++ b/sys-apps/portage/portage-2.2.5-r1.ebuild @@ -1,20 +1,20 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.0.ebuild,v 1.2 2013/08/13 00:59:44 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.5.ebuild,v 1.1 2013/09/15 11:18:49 zmedico Exp $ # Require EAPI 2 since we now require at least python-2.6 (for python 3 # syntax support) which also requires EAPI 2. EAPI=2 PYTHON_COMPAT=( - pypy1_9 pypy2_0 - python3_1 python3_2 python3_3 python3_4 + pypy2_0 + python3_2 python3_3 python3_4 python2_6 python2_7 ) inherit eutils git-2 multilib EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git" EGIT_BRANCH="multilib" -EGIT_COMMIT="b8889dd3884d43f911ff0d7faffa1fd836ad28b0" +EGIT_COMMIT="64e7d296a0dc87d73bcc9d28b09dae71769e2aa1" DESCRIPTION="Portage is the package management and distribution system for Gentoo" HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml" LICENSE="GPL-2" @@ -40,11 +40,9 @@ python_dep="${python_dep//,ssl}" python_dep="${python_dep//ssl,}" python_dep="${python_dep} - python_targets_pypy1_9? ( virtual/pypy:1.9 ) python_targets_pypy2_0? ( virtual/pypy:2.0 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) - python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) @@ -409,8 +407,8 @@ pkg_preinst() { USERSYNC_UPGRADE=true REPOS_CONF_UPGRADE=true REPOS_CONF_SYNC= - type portageq >/dev/null 2>&1 && \ - REPOS_CONF_SYNC=$(portageq envvar SYNC) + type -P portageq >/dev/null 2>&1 && \ + REPOS_CONF_SYNC=$("$(type -P portageq)" envvar SYNC) else USERPRIV_UPGRADE=false USERSYNC_UPGRADE=false