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 1Q9PYV-0004SG-Bi for garchives@archives.gentoo.org; Mon, 11 Apr 2011 22:25:59 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 890D21C02A; Mon, 11 Apr 2011 22:25:52 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 482A51C02A for ; Mon, 11 Apr 2011 22:25:52 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C397E1B40F2 for ; Mon, 11 Apr 2011 22:25:51 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id F1EA680072 for ; Mon, 11 Apr 2011 22:25:50 +0000 (UTC) From: "Gilles Dartiguelongue" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Gilles Dartiguelongue" Message-ID: <00c396fad87d2e66749ffb6ee73cce0ea8174b9b.eva@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-keyring/ X-VCS-Repository: proj/gnome X-VCS-Files: gnome-base/gnome-keyring/gnome-keyring-3.0.0-r300.ebuild gnome-base/gnome-keyring/gnome-keyring-3.0.0.ebuild gnome-base/gnome-keyring/gnome-keyring-9999.ebuild X-VCS-Directories: gnome-base/gnome-keyring/ X-VCS-Committer: eva X-VCS-Committer-Name: Gilles Dartiguelongue X-VCS-Revision: 00c396fad87d2e66749ffb6ee73cce0ea8174b9b Date: Mon, 11 Apr 2011 22:25:50 +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: 13c70a34b7e2abe38443ec88c8369df8 commit: 00c396fad87d2e66749ffb6ee73cce0ea8174b9b Author: Gilles Dartiguelongue gentoo org> AuthorDate: Mon Apr 11 22:24:11 2011 +0000 Commit: Gilles Dartiguelongue gentoo org> CommitDate: Mon Apr 11 22:24:11 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3D00c396fa gnome-base/gnome-keyring: fix buggy sed expression, bug #363075 --- .../gnome-keyring/gnome-keyring-3.0.0-r300.ebuild | 2 +- .../gnome-keyring/gnome-keyring-3.0.0.ebuild | 2 +- gnome-base/gnome-keyring/gnome-keyring-9999.ebuild | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.0.0-r300.ebuild b/g= nome-base/gnome-keyring/gnome-keyring-3.0.0-r300.ebuild index ee1d720..5b56195 100644 --- a/gnome-base/gnome-keyring/gnome-keyring-3.0.0-r300.ebuild +++ b/gnome-base/gnome-keyring/gnome-keyring-3.0.0-r300.ebuild @@ -74,7 +74,7 @@ src_prepare() { =20 # Disable gcr tests due to weirdness with opensc # ** WARNING **: couldn't load PKCS#11 module: /usr/lib64/pkcs11/gnome-= keyring-pkcs11.so: Couldn't initialize module: The device was removed or = unplugged - sed -e 's/SUBDIRS =3D .*/SUBDIRS =3D/' \ + sed -e '/^SUBDIRS =3D /,+1 c\SUBDIRS =3D\' \ -i gcr/Makefile.am gcr/Makefile.in || die "sed 3 failed" =20 gnome2_src_prepare diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.0.0.ebuild b/gnome-= base/gnome-keyring/gnome-keyring-3.0.0.ebuild index dae8cd3..012522e 100644 --- a/gnome-base/gnome-keyring/gnome-keyring-3.0.0.ebuild +++ b/gnome-base/gnome-keyring/gnome-keyring-3.0.0.ebuild @@ -72,7 +72,7 @@ src_prepare() { =20 # Disable gcr tests due to weirdness with opensc # ** WARNING **: couldn't load PKCS#11 module: /usr/lib64/pkcs11/gnome-= keyring-pkcs11.so: Couldn't initialize module: The device was removed or = unplugged - sed -e 's/SUBDIRS =3D .*/SUBDIRS =3D/' \ + sed -e '/^SUBDIRS =3D /,+1 c\SUBDIRS =3D\' \ -i gcr/Makefile.am gcr/Makefile.in || die "sed 3 failed" =20 gnome2_src_prepare diff --git a/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild b/gnome-b= ase/gnome-keyring/gnome-keyring-9999.ebuild index ee1d720..5b56195 100644 --- a/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild +++ b/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild @@ -74,7 +74,7 @@ src_prepare() { =20 # Disable gcr tests due to weirdness with opensc # ** WARNING **: couldn't load PKCS#11 module: /usr/lib64/pkcs11/gnome-= keyring-pkcs11.so: Couldn't initialize module: The device was removed or = unplugged - sed -e 's/SUBDIRS =3D .*/SUBDIRS =3D/' \ + sed -e '/^SUBDIRS =3D /,+1 c\SUBDIRS =3D\' \ -i gcr/Makefile.am gcr/Makefile.in || die "sed 3 failed" =20 gnome2_src_prepare