1 |
commit: 312f941b5d25eea09f00aa235c05068ef3d11481 |
2 |
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed May 3 14:01:34 2017 +0000 |
4 |
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed May 3 14:21:27 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=312f941b |
7 |
|
8 |
dev-php/symfony-config: new version 2.8.20. |
9 |
|
10 |
This new version depends (optionally) on a newer version of PHPUnit, |
11 |
which lets us run its test suite. The test suite passes for me, so |
12 |
I've removed the RESTRICT=test. |
13 |
|
14 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
15 |
|
16 |
dev-php/symfony-config/Manifest | 2 +- |
17 |
dev-php/symfony-config/files/autoload.php | 7 ++++++- |
18 |
...ony-config-2.8.19.ebuild => symfony-config-2.8.20.ebuild} | 12 ++++-------- |
19 |
3 files changed, 11 insertions(+), 10 deletions(-) |
20 |
|
21 |
diff --git a/dev-php/symfony-config/Manifest b/dev-php/symfony-config/Manifest |
22 |
index 2ac1c0770ec..e29e8a3ee7a 100644 |
23 |
--- a/dev-php/symfony-config/Manifest |
24 |
+++ b/dev-php/symfony-config/Manifest |
25 |
@@ -1 +1 @@ |
26 |
-DIST symfony-config-2.8.19.tar.gz 52568 SHA256 0804dde6ea36afe5f428f838288e22bb8e02e123b970f2ae2f3fef1f18f0f294 SHA512 00d89ec1c78245429652ed48639fe54188c9cafcb7d3cc7978054d26d2e6be44addc738750575a134644b7b9735e805e95cb2890e9c4063dc7359e3b12da6942 WHIRLPOOL eae0fae487163864017097c3172ae151617818ed363618f0df66b12e4d371240609e39ed4446cf5a94da99a08ed8d0120677fd71d3e49a7f55502a41ad055bfb |
27 |
+DIST symfony-config-2.8.20.tar.gz 52587 SHA256 19f54b4fc33666872ef1e66c0b3269cfc5b634808b61984d791ec399ef1d815e SHA512 f515f9886be8daa85a3cfe70935b4586ee749a62c3c73c6f2c934af16d4a81f9e49445bdae85329f88fa4dacaf87c56b9b599793d7926e712242bd1fc9dc0675 WHIRLPOOL 61ed346ae004c0ce8037e5c4ceb4d519af9fda6f09e2d533672ee0040c13fa15c53b2abe49f3fba32b827af058b6047200b5c812a2dccf56b7bece812bdeb0ed |
28 |
|
29 |
diff --git a/dev-php/symfony-config/files/autoload.php b/dev-php/symfony-config/files/autoload.php |
30 |
index 4cbfc168d79..6c6f5c501be 100644 |
31 |
--- a/dev-php/symfony-config/files/autoload.php |
32 |
+++ b/dev-php/symfony-config/files/autoload.php |
33 |
@@ -9,7 +9,12 @@ if (!class_exists('Fedora\\Autoloader\\Autoload', false)) { |
34 |
|
35 |
\Fedora\Autoloader\Autoload::addPsr4('Symfony\\Component\\Config\\', __DIR__); |
36 |
|
37 |
-// Dependencies |
38 |
+// Required dependencies. |
39 |
\Fedora\Autoloader\Dependencies::required(array( |
40 |
"${vendor_dir}/Symfony/Component/Filesystem/autoload.php" |
41 |
)); |
42 |
+ |
43 |
+// Optional dependencies. |
44 |
+\Fedora\Autoloader\Dependencies::optional(array( |
45 |
+ "${vendor_dir}/PHPUnit/vendor/autoload.php" |
46 |
+)); |
47 |
|
48 |
diff --git a/dev-php/symfony-config/symfony-config-2.8.19.ebuild b/dev-php/symfony-config/symfony-config-2.8.20.ebuild |
49 |
similarity index 66% |
50 |
rename from dev-php/symfony-config/symfony-config-2.8.19.ebuild |
51 |
rename to dev-php/symfony-config/symfony-config-2.8.20.ebuild |
52 |
index b53316b5174..0daa831d25f 100644 |
53 |
--- a/dev-php/symfony-config/symfony-config-2.8.19.ebuild |
54 |
+++ b/dev-php/symfony-config/symfony-config-2.8.20.ebuild |
55 |
@@ -5,29 +5,25 @@ EAPI=6 |
56 |
|
57 |
DESCRIPTION="Symfony Config Component" |
58 |
HOMEPAGE="https://github.com/symfony/config" |
59 |
-SRC_URI="https://github.com/symfony/config/archive/v${PV}.tar.gz -> symfony-config-${PV}.tar.gz" |
60 |
+SRC_URI="https://github.com/symfony/config/archive/v${PV}.tar.gz |
61 |
+ -> symfony-config-${PV}.tar.gz" |
62 |
|
63 |
LICENSE="MIT" |
64 |
SLOT="0" |
65 |
KEYWORDS="~amd64 ~x86" |
66 |
IUSE="test" |
67 |
|
68 |
-# This needs a newer phpunit and a modified autoload.php but should work. |
69 |
-RESTRICT=test |
70 |
- |
71 |
RDEPEND=" |
72 |
dev-lang/php:* |
73 |
dev-php/fedora-autoloader |
74 |
dev-php/symfony-filesystem" |
75 |
-DEPEND="test? ( ${RDEPEND} dev-php/phpunit )" |
76 |
+DEPEND="test? ( ${RDEPEND} >=dev-php/phpunit-5.7.15 )" |
77 |
|
78 |
S="${WORKDIR}/config-${PV}" |
79 |
|
80 |
src_prepare() { |
81 |
default |
82 |
if use test; then |
83 |
- # Not quite right: we need to include PHPUnit's autoload.php as |
84 |
- # part of ours for the test suite to work. |
85 |
cp "${FILESDIR}"/autoload.php "${S}"/autoload-test.php || die |
86 |
fi |
87 |
} |
88 |
@@ -39,5 +35,5 @@ src_install() { |
89 |
} |
90 |
|
91 |
src_test() { |
92 |
- phpunit --bootstrap "${S}"/autoload-test.php || die "test suite failed" |
93 |
+ phpunit --bootstrap "${S}/autoload-test.php" || die 'test suite failed' |
94 |
} |