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 1RCVjH-0001ez-Pp for garchives@archives.gentoo.org; Sat, 08 Oct 2011 12:10:12 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D5A4121C037; Sat, 8 Oct 2011 12:10:02 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id A2E7F21C037 for ; Sat, 8 Oct 2011 12:10:02 +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 EC0E31B4021 for ; Sat, 8 Oct 2011 12:10:01 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 07B5380042 for ; Sat, 8 Oct 2011 12:10:01 +0000 (UTC) From: "Markus Meier" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Markus Meier" Message-ID: <99f831322ceee439ea2ffc6b5d278ea013958847.maekke@gentoo> Subject: [gentoo-commits] dev/maekke:master commit in: scripts/ X-VCS-Repository: dev/maekke X-VCS-Files: scripts/rdep X-VCS-Directories: scripts/ X-VCS-Committer: maekke X-VCS-Committer-Name: Markus Meier X-VCS-Revision: 99f831322ceee439ea2ffc6b5d278ea013958847 Date: Sat, 8 Oct 2011 12:10:01 +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: 23bc6d9134243fa2eb67eca2c863d8a0 commit: 99f831322ceee439ea2ffc6b5d278ea013958847 Author: Markus Meier gentoo org> AuthorDate: Sat Oct 8 12:10:57 2011 +0000 Commit: Markus Meier gentoo org> CommitDate: Sat Oct 8 12:10:57 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Ddev/maekke.git;a=3D= commit;h=3D99f83132 use slots instead of versions (right now it's quite slow because of porta= geq usage for reading SLOT from metadata) --- scripts/rdep | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/rdep b/scripts/rdep index 936176a..8013181 100755 --- a/scripts/rdep +++ b/scripts/rdep @@ -42,9 +42,8 @@ tmp=3D"$(mktemp)" wget -o /dev/null -O "${tmp}" "${BASE_URL}/${pkg}" =20 last_pn=3D"" -# we sort it reverse, that we have the latest version in most cases the = first and -# not print the "older ones". this has some room for improvement -for p in $(grep -v '^[B]' ${tmp} | sort -r); do + +for p in $(grep -v '^[B]' ${tmp}); do cpv=3D"${p/:*/}" use=3D"${p/*:/}" [[ ${use} =3D=3D ${p} ]] && use=3D"" @@ -72,10 +71,11 @@ for p in $(grep -v '^[B]' ${tmp} | sort -r); do || expr=3D"KEYWORDS=3D.*( |\")\<${arch}\>" if [[ -e ${ebuild} && $(egrep -H "${expr}" \ ${ebuild} | wc -l) =3D=3D 1 ]]; then - if [[ ${last_pn} !=3D ${category}/${pn} ]]; then - [[ -z ${use} ]] && echo "=3D${cpv}" || echo "=3D${cpv}[${use}]" + slot=3D$(portageq metadata / ebuild ${cpv} SLOT) + if [[ ${last_pn} !=3D ${category}/${pn}:${slot} ]]; then + [[ -z ${use} ]] && echo "=3D${category}/${pn}:${slot}" || echo "=3D${= category}/${pn}:${slot}[${use}]" fi - last_pn=3D"${category}/${pn}" + last_pn=3D"${category}/${pn}:${slot}" fi done rm "${tmp}"