From 38b7258d086dd5e263c3bbe3880c8c956676bc71 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Fri, 26 Jan 2018 15:48:02 +0000
Subject: gentoo resync : 25.01.2018

---
 dev-php/spdx-licenses/Manifest                     |  5 ++---
 .../files/spdx-licenses-change-res-path.patch      | 22 ------------------
 dev-php/spdx-licenses/spdx-licenses-1.0.0.ebuild   | 26 ----------------------
 dev-php/spdx-licenses/spdx-licenses-1.2.0.ebuild   | 22 ++++++++++++++++++
 4 files changed, 24 insertions(+), 51 deletions(-)
 delete mode 100644 dev-php/spdx-licenses/files/spdx-licenses-change-res-path.patch
 delete mode 100644 dev-php/spdx-licenses/spdx-licenses-1.0.0.ebuild
 create mode 100644 dev-php/spdx-licenses/spdx-licenses-1.2.0.ebuild

(limited to 'dev-php/spdx-licenses')

diff --git a/dev-php/spdx-licenses/Manifest b/dev-php/spdx-licenses/Manifest
index de0bcca1e94d..b0c57258a277 100644
--- a/dev-php/spdx-licenses/Manifest
+++ b/dev-php/spdx-licenses/Manifest
@@ -1,5 +1,4 @@
 AUX autoload.php 264 BLAKE2B f5084534435d4e00c9a97ff6a068ff94b32b5e533095046357d7a1565c4e2422f6985c0b66ac73ce706c4cb53261d05abf3b6e5f0724bdc34e497fa2e1abc959 SHA512 6dd28dc205943fa5fa8fb7577a88926573533d553e86577ec2d2e34045ea744731ea08c9dfee277dd1550cac033ac53d1648aa8b28fc78eaa73d0613371aaaa7
-AUX spdx-licenses-change-res-path.patch 872 BLAKE2B 35831d2ff12abe26ca750bb630ca43e9af783152887d704b0c16ad01882fc9c8ce2fc8346ec426b630c5642b979c85170d6729ef667ff004249773ba54ad7fbf SHA512 9050ac3f4ab33172a8edee04434f3e0c3b38d53a51c590d2c65c4ba0bfb0b718c702275cfd448bf6b850549589569c5a8d15d2f82fcb35c36efd9cac9e6deb1e
-DIST spdx-licenses-1.0.0.tar.gz 8244 BLAKE2B 57ef1ccb7f4165293c8daca0fe3e04322658a06a10e82b10ee0603974572c51fd005de7a530fce280d8ab3fa78fe18ac3bd64babdf2565eacb1c61a3f3df9ce4 SHA512 1ef19555f252c5e03fe3b0376442f47bd50d894effa04bca58e7644e18fcc2a905239086d1aaf31277ce5928a7f9743e123c767e197c0fa063c015ad14851a14
-EBUILD spdx-licenses-1.0.0.ebuild 596 BLAKE2B 80be834d56272bbea11f40fee8b9f2f7615f04c9a9748bbca27f46b6933e6f8507117e4a0d007efc7679dd35ac9ee96e4dceeaca2c5c5dda9176775a146a9189 SHA512 1ed43a022d3c0ff5c714cb278e68dcfba9ed7f8adfc78de1eac93fd7aaccdfb5197f42604cf0b9616b6bea07558c79a08c1f39f88012bb20e6d5575d76f4043d
+DIST spdx-licenses-1.2.0.tar.gz 10974 BLAKE2B 52cba9837202b1ae598b6d3b36f4ef67ec27988fa5911f2dfff92d39515d0401f5636922a3d205413489d21fd1dfacbf68f72c907503807317c7c9e51392e016 SHA512 fdb63dd29a099afbc116b30d1deec3d2b46be998a55fd741126f1bc393c5037a9a7477e55f7e030585d826be7d72db26be5ce0b5bb57dd536137cc45890ea9c9
+EBUILD spdx-licenses-1.2.0.ebuild 540 BLAKE2B 5408ae142e124053f36c38f211f8cbd7cd4cd37cf34d4a6bdf9049458107d9b3fc1c9b7f70168e67eaf2bcb0ad8b62b382f3312928bb013e2dfac1748a9203e7 SHA512 61e9ef062aec32f723ce485dd5f1b0dd84355894571f78f38c13dca00756d9bbb8de0703b2fd5466e806efb0b7e5e147d87061e95d003c81fc2b4f0cd789c3b3
 MISC metadata.xml 675 BLAKE2B 6ae4ff5df27e2d6334deee789bf253f71f6b55999e2cd9f0c4a1be6358c63c74f668624025f0d8fedb24dea3ccb36ad7d97972f1f627979b7c40e5ca1c389eeb SHA512 f660171c2d2bf3582a91e72a9a92b8f1270a1339c8f68d47c3d6abc2d642027873b8c6a4b2ec7c8bf968cfc37de208c3505899bc2d4fd472cfd403b73dd9fefa
diff --git a/dev-php/spdx-licenses/files/spdx-licenses-change-res-path.patch b/dev-php/spdx-licenses/files/spdx-licenses-change-res-path.patch
deleted file mode 100644
index 284cdddda95e..000000000000
--- a/dev-php/spdx-licenses/files/spdx-licenses-change-res-path.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-# Fix the path of res/
-
---- ./src/SpdxLicenses.php        2015-07-15 19:38:14.000000000 +0200
-+++ ./src/SpdxLicenses.php        2016-11-13 19:24:17.659442468 +0100
-@@ -170,7 +170,7 @@
-     private function loadLicenses()
-     {
-         if (null === $this->licenses) {
--            $jsonFile = file_get_contents(__DIR__ . '/../res/spdx-licenses.json');
-+            $jsonFile = file_get_contents(__DIR__ . '/res/spdx-licenses.json');
-             $this->licenses = json_decode($jsonFile, true);
-         }
-     }
-@@ -178,7 +178,7 @@
-     private function loadExceptions()
-     {
-         if (null === $this->exceptions) {
--            $jsonFile = file_get_contents(__DIR__ . '/../res/spdx-exceptions.json');
-+            $jsonFile = file_get_contents(__DIR__ . '/res/spdx-exceptions.json');
-             $this->exceptions = json_decode($jsonFile, true);
-         }
-     }
diff --git a/dev-php/spdx-licenses/spdx-licenses-1.0.0.ebuild b/dev-php/spdx-licenses/spdx-licenses-1.0.0.ebuild
deleted file mode 100644
index 099ed89b2b7e..000000000000
--- a/dev-php/spdx-licenses/spdx-licenses-1.0.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Tools for working with and validating SPDX licenses"
-HOMEPAGE="https://github.com/composer/spdx-licenses"
-SRC_URI="https://github.com/composer/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-lang/php:*
-	dev-php/fedora-autoloader"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-change-res-path.patch"
-)
-
-src_install() {
-	insinto "/usr/share/php/Composer/Spdx"
-	doins -r src/. res "${FILESDIR}"/autoload.php
-	dodoc README.md
-}
diff --git a/dev-php/spdx-licenses/spdx-licenses-1.2.0.ebuild b/dev-php/spdx-licenses/spdx-licenses-1.2.0.ebuild
new file mode 100644
index 000000000000..c23832e1773c
--- /dev/null
+++ b/dev-php/spdx-licenses/spdx-licenses-1.2.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Tools for working with and validating SPDX licenses"
+HOMEPAGE="https://github.com/composer/spdx-licenses"
+SRC_URI="https://github.com/composer/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-lang/php:*
+	dev-php/fedora-autoloader"
+
+src_install() {
+	insinto "/usr/share/php/Composer/Spdx"
+	doins -r src/. res "${FILESDIR}"/autoload.php
+	dodoc README.md
+}
-- 
cgit v1.2.3