Gentoo Archives: gentoo-commits

From: Thomas Deutschmann <whissi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-php/spdx-licenses/
Date: Thu, 20 Sep 2018 14:54:39
Message-Id: 1537455267.85df4f93ee31ec4074958cde9f41c4e718f0eb4b.whissi@gentoo
1 commit: 85df4f93ee31ec4074958cde9f41c4e718f0eb4b
2 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
3 AuthorDate: Thu Sep 20 14:53:30 2018 +0000
4 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
5 CommitDate: Thu Sep 20 14:54:27 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85df4f93
7
8 dev-php/spdx-licenses: fix spdx-{exceptions,licenses}.json install location
9
10 spdx-{exceptions,licenses}.json files must be installed into Composer/res
11 or `composer validate` will throw the following error:
12
13 > [ErrorException]
14 > file_get_contents(/usr/share/php/Composer/res/spdx-licenses.json): failed to open stream: No such file or directory
15
16 Package-Manager: Portage-2.3.49, Repoman-2.3.10
17
18 .../{spdx-licenses-1.4.0.ebuild => spdx-licenses-1.4.0-r1.ebuild} | 5 ++++-
19 1 file changed, 4 insertions(+), 1 deletion(-)
20
21 diff --git a/dev-php/spdx-licenses/spdx-licenses-1.4.0.ebuild b/dev-php/spdx-licenses/spdx-licenses-1.4.0-r1.ebuild
22 similarity index 83%
23 rename from dev-php/spdx-licenses/spdx-licenses-1.4.0.ebuild
24 rename to dev-php/spdx-licenses/spdx-licenses-1.4.0-r1.ebuild
25 index 5d0d6554466..57236bd1ba3 100644
26 --- a/dev-php/spdx-licenses/spdx-licenses-1.4.0.ebuild
27 +++ b/dev-php/spdx-licenses/spdx-licenses-1.4.0-r1.ebuild
28 @@ -16,7 +16,10 @@ RDEPEND="
29 dev-php/fedora-autoloader"
30
31 src_install() {
32 + insinto "/usr/share/php/Composer/res"
33 + doins -r res/.
34 +
35 insinto "/usr/share/php/Composer/Spdx"
36 - doins -r src/. res "${FILESDIR}"/autoload.php
37 + doins -r src/. "${FILESDIR}"/autoload.php
38 dodoc README.md
39 }