Gentoo Archives: gentoo-commits

From: Brian Evans <grknight@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-php/phpunit/
Date: Thu, 07 Jan 2021 20:15:12
Message-Id: 1610050483.60fd7cd07a8db587b809e1f84da3246130371906.grknight@gentoo
1 commit: 60fd7cd07a8db587b809e1f84da3246130371906
2 Author: Brian Evans <grknight <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jan 7 20:14:43 2021 +0000
4 Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
5 CommitDate: Thu Jan 7 20:14:43 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60fd7cd0
7
8 dev-php/phpunit: Block phpunit-mock-objects on 8.5 for collision
9
10 Signed-off-by: Brian Evans <grknight <AT> gentoo.org>
11
12 dev-php/phpunit/phpunit-8.5.11.ebuild | 4 +++-
13 1 file changed, 3 insertions(+), 1 deletion(-)
14
15 diff --git a/dev-php/phpunit/phpunit-8.5.11.ebuild b/dev-php/phpunit/phpunit-8.5.11.ebuild
16 index 25b445056d3..5d87e351797 100644
17 --- a/dev-php/phpunit/phpunit-8.5.11.ebuild
18 +++ b/dev-php/phpunit/phpunit-8.5.11.ebuild
19 @@ -36,7 +36,9 @@ RDEPEND="dev-php/fedora-autoloader
20 dev-lang/php:7.4[cli(-),json(-),unicode(-),xml(-),xmlwriter(-)]
21 dev-lang/php:7.3[cli(-),json(-),unicode(-),xml(-),xmlwriter(-)]
22 dev-lang/php:7.2[cli(-),json(-),unicode(-),xml(-),xmlwriter(-)]
23 - )"
24 + )
25 + !dev-php/phpunit-mock-objects
26 +"
27
28 src_prepare() {
29 default