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 <gentoo-commits+bounces-390726-garchives=archives.gentoo.org@lists.gentoo.org>)
	id 1RCpuV-0007C0-5v
	for garchives@archives.gentoo.org; Sun, 09 Oct 2011 09:43:07 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 48B3F21C191;
	Sun,  9 Oct 2011 09:43:00 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	by pigeon.gentoo.org (Postfix) with ESMTP id 1538221C191
	for <gentoo-commits@lists.gentoo.org>; Sun,  9 Oct 2011 09:43:00 +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 9F31A1B4017
	for <gentoo-commits@lists.gentoo.org>; Sun,  9 Oct 2011 09:42:59 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by pelican.gentoo.org (Postfix) with ESMTP id 91D4B80042
	for <gentoo-commits@lists.gentoo.org>; Sun,  9 Oct 2011 09:42:58 +0000 (UTC)
From: "Gilles Dartiguelongue" <eva@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Gilles Dartiguelongue" <eva@gentoo.org>
Message-ID: <709082eb22ce92d8da8239b383ae6044c6e6ef35.eva@gentoo>
Subject: [gentoo-commits] proj/gnome:master commit in: games-board/aisleriot/
X-VCS-Repository: proj/gnome
X-VCS-Files: games-board/aisleriot/aisleriot-3.2.0.ebuild games-board/aisleriot/aisleriot-9999.ebuild
X-VCS-Directories: games-board/aisleriot/
X-VCS-Committer: eva
X-VCS-Committer-Name: Gilles Dartiguelongue
X-VCS-Revision: 709082eb22ce92d8da8239b383ae6044c6e6ef35
Date: Sun,  9 Oct 2011 09:42:58 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt: 
X-Archives-Hash: b29501851b4b6e1e224336fc43fef076

commit:     709082eb22ce92d8da8239b383ae6044c6e6ef35
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Oct  9 09:41:52 2011 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Oct  9 09:41:52 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D=
commit;h=3D709082eb

games-board/aisleriot: also available in <gnome-games-3

Add a blocker since all releases previous to the introduction of the USE
flag shipped this game as well. Blocker avoids file-collision on upgrade
from a gnome-2 or gnome-3 with masked gnome-games (hence stuck at 2.28).

---
 games-board/aisleriot/aisleriot-3.2.0.ebuild |    3 ++-
 games-board/aisleriot/aisleriot-9999.ebuild  |    3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/games-board/aisleriot/aisleriot-3.2.0.ebuild b/games-board/a=
isleriot/aisleriot-3.2.0.ebuild
index ec44bd6..07154cf 100644
--- a/games-board/aisleriot/aisleriot-3.2.0.ebuild
+++ b/games-board/aisleriot/aisleriot-3.2.0.ebuild
@@ -37,7 +37,8 @@ COMMON_DEPEND=3D">=3Ddev-libs/glib-2.26.0:2
 	sound? ( >=3Dmedia-libs/libcanberra-0.26[gtk3] )"
 # aisleriot was split off from gnome-games
 RDEPEND=3D"${COMMON_DEPEND}
-	!<gnome-extra/gnome-games-3.1.1[aisleriot]"
+	!<gnome-extra/gnome-games-3.1.1[aisleriot]
+	!<gnome-extra/gnome-games-3"
 DEPEND=3D"${COMMON_DEPEND}
 	>=3Ddev-util/intltool-0.40.4
 	>=3Ddev-util/pkgconfig-0.15

diff --git a/games-board/aisleriot/aisleriot-9999.ebuild b/games-board/ai=
sleriot/aisleriot-9999.ebuild
index ec44bd6..07154cf 100644
--- a/games-board/aisleriot/aisleriot-9999.ebuild
+++ b/games-board/aisleriot/aisleriot-9999.ebuild
@@ -37,7 +37,8 @@ COMMON_DEPEND=3D">=3Ddev-libs/glib-2.26.0:2
 	sound? ( >=3Dmedia-libs/libcanberra-0.26[gtk3] )"
 # aisleriot was split off from gnome-games
 RDEPEND=3D"${COMMON_DEPEND}
-	!<gnome-extra/gnome-games-3.1.1[aisleriot]"
+	!<gnome-extra/gnome-games-3.1.1[aisleriot]
+	!<gnome-extra/gnome-games-3"
 DEPEND=3D"${COMMON_DEPEND}
 	>=3Ddev-util/intltool-0.40.4
 	>=3Ddev-util/pkgconfig-0.15