From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 2E2161382C5 for ; Sun, 24 May 2020 04:14:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0109DE0896; Sun, 24 May 2020 04:14:11 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 DED52E0895 for ; Sun, 24 May 2020 04:14:10 +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 F35E434F07D for ; Sun, 24 May 2020 04:14:09 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 29FB525E for ; Sun, 24 May 2020 04:14:07 +0000 (UTC) From: "Hans de Graaff" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Hans de Graaff" Message-ID: <1590293599.52697fe117287ef9e3386a8377cbb9a718782115.graaff@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ruby/marcel/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-ruby/marcel/marcel-0.3.3-r1.ebuild X-VCS-Directories: dev-ruby/marcel/ X-VCS-Committer: graaff X-VCS-Committer-Name: Hans de Graaff X-VCS-Revision: 52697fe117287ef9e3386a8377cbb9a718782115 X-VCS-Branch: master Date: Sun, 24 May 2020 04:14:07 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: fc48be4b-0f81-4033-916b-5016b2f9deb7 X-Archives-Hash: 4c4fd7749799304afffcf0288019fe74 commit: 52697fe117287ef9e3386a8377cbb9a718782115 Author: Hans de Graaff gentoo org> AuthorDate: Sun May 24 03:39:22 2020 +0000 Commit: Hans de Graaff gentoo org> CommitDate: Sun May 24 04:13:19 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52697fe1 dev-ruby/marcel: avoid bundler dependency Closes: https://bugs.gentoo.org/723850 Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Hans de Graaff gentoo.org> dev-ruby/marcel/marcel-0.3.3-r1.ebuild | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dev-ruby/marcel/marcel-0.3.3-r1.ebuild b/dev-ruby/marcel/marcel-0.3.3-r1.ebuild index 40fae2ec8e9..27849fa36df 100644 --- a/dev-ruby/marcel/marcel-0.3.3-r1.ebuild +++ b/dev-ruby/marcel/marcel-0.3.3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -25,6 +25,8 @@ ruby_add_rdepend ">=dev-ruby/mimemagic-0.3.2:0" all_ruby_prepare() { sed -i -e '2irequire "pathname"' test/test_helper.rb || die + sed -i -e '/bundler/ s:^:#:' Rakefile || die + # Account for changes in shared-mime-info 1.10 mkdir test/fixtures/{magic,name}/font || die mv test/fixtures/magic/application/x-font-ttf.ttf test/fixtures/magic/font/ttf.ttf || die