From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1093887-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by finch.gentoo.org (Postfix) with ESMTPS id 5E13A138334
	for <garchives@archives.gentoo.org>; Sat,  1 Jun 2019 17:21:27 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 5FCCDE07D8;
	Sat,  1 Jun 2019 17:21:26 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 3EE83E07D8
	for <gentoo-commits@lists.gentoo.org>; Sat,  1 Jun 2019 17:21:26 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 765693454F9
	for <gentoo-commits@lists.gentoo.org>; Sat,  1 Jun 2019 17:21:24 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id E89FBA8
	for <gentoo-commits@lists.gentoo.org>; Sat,  1 Jun 2019 17:21:21 +0000 (UTC)
From: "Sergei Trofimovich" <slyfox@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sergei Trofimovich" <slyfox@gentoo.org>
Message-ID: <1559409674.a16067303536e1ead968a4556bbcd1a7f9fb5852.slyfox@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/btrfs-progs/
X-VCS-Repository: repo/gentoo
X-VCS-Files: sys-fs/btrfs-progs/btrfs-progs-5.1-r1.ebuild sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
X-VCS-Directories: sys-fs/btrfs-progs/
X-VCS-Committer: slyfox
X-VCS-Committer-Name: Sergei Trofimovich
X-VCS-Revision: a16067303536e1ead968a4556bbcd1a7f9fb5852
X-VCS-Branch: master
Date: Sat,  1 Jun 2019 17:21:21 +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
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: c88705d6-029a-4e5a-85a2-3908fb4aa795
X-Archives-Hash: 2ed8a816650868b00d0858f294a54401

commit:     a16067303536e1ead968a4556bbcd1a7f9fb5852
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Jun  1 17:05:07 2019 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Jun  1 17:21:14 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1606730

sys-fs/btrfs-progs: allow asciidoc as an alternative to asciidoctor

Reported-by: Ingo Brunberg
Bug: https://bugs.gentoo.org/627418
Package-Manager: Portage-2.3.67, Repoman-2.3.13
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 sys-fs/btrfs-progs/btrfs-progs-5.1-r1.ebuild | 2 +-
 sys-fs/btrfs-progs/btrfs-progs-9999.ebuild   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-fs/btrfs-progs/btrfs-progs-5.1-r1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.1-r1.ebuild
index d8977bdf6b9..572fe0d9fec 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-5.1-r1.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-5.1-r1.ebuild
@@ -63,7 +63,7 @@ DEPEND="${RDEPEND}
 	)
 "
 BDEPEND="
-	>=app-text/asciidoc-8.6.0
+	|| ( >=app-text/asciidoc-8.6.0 dev-ruby/asciidoctor )
 	app-text/docbook-xml-dtd:4.5
 	app-text/xmlto
 "

diff --git a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
index 4076d30d238..35aaf524c91 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
@@ -63,7 +63,7 @@ DEPEND="${RDEPEND}
 	)
 "
 BDEPEND="
-	>=app-text/asciidoc-8.6.0
+	|| ( >=app-text/asciidoc-8.6.0 dev-ruby/asciidoctor )
 	app-text/docbook-xml-dtd:4.5
 	app-text/xmlto
 "