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 60B2E1381F3 for ; Thu, 21 Apr 2016 05:32:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6B4DA21C054; Thu, 21 Apr 2016 05:32:55 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0C4D021C054 for ; Thu, 21 Apr 2016 05:32:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 21E51340B79 for ; Thu, 21 Apr 2016 05:32:54 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6DC2D16C5 for ; Thu, 21 Apr 2016 05:32:49 +0000 (UTC) From: "Matt Thode" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Thode" Message-ID: <1461216729.11204367fd2819bb10de0c05d319ff6bcb86c4ae.prometheanfire@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/rtslib-fb/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/rtslib-fb/rtslib-fb-2.1.47.ebuild dev-python/rtslib-fb/rtslib-fb-2.1.57.ebuild X-VCS-Directories: dev-python/rtslib-fb/ X-VCS-Committer: prometheanfire X-VCS-Committer-Name: Matt Thode X-VCS-Revision: 11204367fd2819bb10de0c05d319ff6bcb86c4ae X-VCS-Branch: master Date: Thu, 21 Apr 2016 05:32:49 +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: ab187ee0-e2c1-4828-96ae-4f994ee2e97e X-Archives-Hash: 26af7c9980d08cb1042508c5aaecd617 commit: 11204367fd2819bb10de0c05d319ff6bcb86c4ae Author: Matthew Thode gentoo org> AuthorDate: Thu Apr 21 05:31:27 2016 +0000 Commit: Matt Thode gentoo org> CommitDate: Thu Apr 21 05:32:09 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11204367 dev-python/rtslib-fb: add conflict with rtslib for bug 580378 Package-Manager: portage-2.2.26 dev-python/rtslib-fb/rtslib-fb-2.1.47.ebuild | 3 ++- dev-python/rtslib-fb/rtslib-fb-2.1.57.ebuild | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dev-python/rtslib-fb/rtslib-fb-2.1.47.ebuild b/dev-python/rtslib-fb/rtslib-fb-2.1.47.ebuild index c660de9..1831cb5 100644 --- a/dev-python/rtslib-fb/rtslib-fb-2.1.47.ebuild +++ b/dev-python/rtslib-fb/rtslib-fb-2.1.47.ebuild @@ -16,5 +16,6 @@ SLOT="0" KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" IUSE="" -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" +DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] + !dev-python/rtslib[${PYTHON_USEDEP}]" RDEPEND="" diff --git a/dev-python/rtslib-fb/rtslib-fb-2.1.57.ebuild b/dev-python/rtslib-fb/rtslib-fb-2.1.57.ebuild index e3a86e3..cbf4288 100644 --- a/dev-python/rtslib-fb/rtslib-fb-2.1.57.ebuild +++ b/dev-python/rtslib-fb/rtslib-fb-2.1.57.ebuild @@ -16,5 +16,6 @@ SLOT="0" KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux" IUSE="" -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" +DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] + !dev-python/rtslib[${PYTHON_USEDEP}]" RDEPEND=""