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 7AA0F1384B4 for ; Thu, 3 Dec 2015 07:42:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5F5F921C00F; Thu, 3 Dec 2015 07:41:58 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D5E1A21C00F for ; Thu, 3 Dec 2015 07:41:57 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 728763407E6 for ; Thu, 3 Dec 2015 07:41:55 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8FFEAB5D for ; Thu, 3 Dec 2015 07:41:53 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1449128495.6445144178aa9c9c2b355ae83d5ed51b6d558b8e.jlec@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: app-admin/eselect/, app-admin/eselect/files/ X-VCS-Repository: proj/sci X-VCS-Files: app-admin/eselect/eselect-1.4.5-r102.ebuild app-admin/eselect/eselect-1.4.5-r103.ebuild app-admin/eselect/files/eselect-1.4.5-alternatives.patch X-VCS-Directories: app-admin/eselect/files/ app-admin/eselect/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: 6445144178aa9c9c2b355ae83d5ed51b6d558b8e X-VCS-Branch: master Date: Thu, 3 Dec 2015 07:41:53 +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: 934da4fd-5392-4715-8845-b9574e08ca63 X-Archives-Hash: ef982fcee8e1edc534cbff94e2ed52b1 commit: 6445144178aa9c9c2b355ae83d5ed51b6d558b8e Author: Justin Lecher gentoo org> AuthorDate: Thu Dec 3 07:41:35 2015 +0000 Commit: Justin Lecher gentoo org> CommitDate: Thu Dec 3 07:41:35 2015 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=64451441 app-admin/eselect: Update to latest alternatives patch Github: closes gentoo-science/sci#453 Package-Manager: portage-2.2.25 Signed-off-by: Justin Lecher gentoo.org> ...select-1.4.5-r102.ebuild => eselect-1.4.5-r103.ebuild} | 0 app-admin/eselect/files/eselect-1.4.5-alternatives.patch | 15 ++++++++------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/app-admin/eselect/eselect-1.4.5-r102.ebuild b/app-admin/eselect/eselect-1.4.5-r103.ebuild similarity index 100% rename from app-admin/eselect/eselect-1.4.5-r102.ebuild rename to app-admin/eselect/eselect-1.4.5-r103.ebuild diff --git a/app-admin/eselect/files/eselect-1.4.5-alternatives.patch b/app-admin/eselect/files/eselect-1.4.5-alternatives.patch index 8296aa1..699f17b 100644 --- a/app-admin/eselect/files/eselect-1.4.5-alternatives.patch +++ b/app-admin/eselect/files/eselect-1.4.5-alternatives.patch @@ -1,12 +1,12 @@ bin/Makefile.am | 1 + bin/eselect.in | 150 +++++++++++- libs/Makefile.am | 7 +- - libs/alternatives-common.bash.in | 509 +++++++++++++++++++++++++++++++++++++++ + libs/alternatives-common.bash.in | 510 +++++++++++++++++++++++++++++++++++++++ libs/alternatives.bash.in | 316 ++++++++++++++++++++++++ modules/Makefile.am | 1 + modules/alternatives.eselect | 178 ++++++++++++++ modules/modules.eselect | 288 ++++++++++++++-------- - 8 files changed, 1342 insertions(+), 108 deletions(-) + 8 files changed, 1343 insertions(+), 108 deletions(-) diff --git a/bin/Makefile.am b/bin/Makefile.am index 20902c1..ad08867 100644 @@ -251,10 +251,10 @@ index 027ef73..a5fe373 100644 @$(dosed) $< > $@ diff --git a/libs/alternatives-common.bash.in b/libs/alternatives-common.bash.in new file mode 100644 -index 0000000..024d41e +index 0000000..10d6616 --- /dev/null +++ b/libs/alternatives-common.bash.in -@@ -0,0 +1,509 @@ +@@ -0,0 +1,510 @@ +# Copyright (c) 2005-2015 Gentoo Foundation +# Copyright (c) 2008 Mike Kelly +# Copyright (c) 2009-2013 David Leverton @@ -277,7 +277,8 @@ index 0000000..024d41e +inherit config output path-manipulation tests + +: "${ALTERNATIVESDIR_ROOTLESS:=@sysconfdir@/env.d/alternatives}" -+ALTERNATIVESDIR="${EROOT%/}${ALTERNATIVESDIR_ROOTLESS}" ++: "${ALTERNATIVESDIR_ROOT:=${ROOT%/}}" ++ALTERNATIVESDIR="${ALTERNATIVESDIR_ROOT}${ALTERNATIVESDIR_ROOTLESS}" + +get_current_provider() { + local dieprefix="Could not determine current provider for ${ALTERNATIVE}" @@ -467,7 +468,7 @@ index 0000000..024d41e + old_i+=1 + + else -+ local target=${ALTERNATIVESDIR_ROOTLESS#/}/${ALTERNATIVE}/_current${newsymlinks[new_i]} dir=${newsymlinks[new_i]%/*} ++ local target=${ALTERNATIVESDIR_ROOTLESS#${EPREFIX}/}/${ALTERNATIVE}/_current${newsymlinks[new_i]} dir=${newsymlinks[new_i]%/*} + while [[ -n ${dir} ]]; do + target=../${target} + dir=${dir%/*} @@ -563,7 +564,7 @@ index 0000000..024d41e + if [[ ${src} != /* ]]; then + die "Source path must be absolute, but got ${src}" + else -+ local reltarget= dir=${provider_dir}${src%/*} ++ local reltarget= dir=${provider_dir#${ALTERNATIVESDIR_ROOT}${EPREFIX}}${src%/*} + while [[ -n ${dir} ]]; do + reltarget+=../ + dir=${dir%/*}