Gentoo Archives: gentoo-commits

From: Andrew Ammerlaan <andrewammerlaan@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/sci:master commit in: dev-perl/BTLib/
Date: Tue, 25 May 2021 11:18:09
Message-Id: 1621941482.7dc48772f20ace430c94de7342e59858e8091a53.andrewammerlaan@gentoo
1 commit: 7dc48772f20ace430c94de7342e59858e8091a53
2 Author: Lucas Mitrak <lucas <AT> lucasmitrak <DOT> com>
3 AuthorDate: Tue May 25 08:22:19 2021 +0000
4 Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
5 CommitDate: Tue May 25 11:18:02 2021 +0000
6 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=7dc48772
7
8 dev-perl/BTLib: add blocker
9
10 * add blocker against app-misc/sphinx.
11 * added for both versions 0.19 and 0.20.
12
13 Currently, the package dev-perl/BTLib has file collisions with
14 app-misc/sphinx; therefore, they cannot be merged at on the same
15 system.
16 This commit adds blockers to all versions of dev-perl/BTLib
17 against app-misc/sphinx.
18 With this commit, they will not be able to be installed on the same
19 system, which solves the file collision problem.
20 Without this commit, a file collision detection will occur during
21 emerge.
22 This bug is similar to and was solved in the same method to
23 Bug: https://bugs.gentoo.org/756865.
24 This commit was tested locally within a docker w/ ebuildtester.
25 This commit was tested, written, and submitted by Lucas Mitrak.
26
27 Closes: https://bugs.gentoo.org/756796
28 Signed-off-by: Lucas Mitrak <lucas <AT> lucasmitrak.com>
29 Closes: https://github.com/gentoo/sci/pull/1081
30 Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
31
32 dev-perl/BTLib/BTLib-0.19.ebuild | 3 +++
33 dev-perl/BTLib/BTLib-0.20.ebuild | 3 +++
34 2 files changed, 6 insertions(+)
35
36 diff --git a/dev-perl/BTLib/BTLib-0.19.ebuild b/dev-perl/BTLib/BTLib-0.19.ebuild
37 index 4205eca9e..6fa1072fb 100644
38 --- a/dev-perl/BTLib/BTLib-0.19.ebuild
39 +++ b/dev-perl/BTLib/BTLib-0.19.ebuild
40 @@ -13,4 +13,7 @@ LICENSE="|| ( Artistic GPL-1 GPL-2 GPL-3 )"
41 SLOT="0"
42 KEYWORDS="~amd64 ~x86"
43
44 +RDEPEND="
45 + !app-misc/sphinx"
46 +
47 SRC_TEST="do"
48
49 diff --git a/dev-perl/BTLib/BTLib-0.20.ebuild b/dev-perl/BTLib/BTLib-0.20.ebuild
50 index 4205eca9e..6fa1072fb 100644
51 --- a/dev-perl/BTLib/BTLib-0.20.ebuild
52 +++ b/dev-perl/BTLib/BTLib-0.20.ebuild
53 @@ -13,4 +13,7 @@ LICENSE="|| ( Artistic GPL-1 GPL-2 GPL-3 )"
54 SLOT="0"
55 KEYWORDS="~amd64 ~x86"
56
57 +RDEPEND="
58 + !app-misc/sphinx"
59 +
60 SRC_TEST="do"