public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-php/composer/, dev-php/composer/files/
@ 2017-04-27 12:16 Michael Orlitzky
  0 siblings, 0 replies; 3+ messages in thread
From: Michael Orlitzky @ 2017-04-27 12:16 UTC (permalink / raw
  To: gentoo-commits

commit:     f8beab2f41f763b95f33ad2f8478c2291cbc00f8
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 27 01:23:37 2017 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Thu Apr 27 12:16:31 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8beab2f

dev-php/composer: version bump 1.3.1 -> 1.4.1.

This commit adds composer-1.4.1 and removes the old composer-1.3.1 at
the same time, allowing me to mess with the autoload.php in-flight. We
had one patch that was giving us trouble with v1.4.1, and this new
ebuild is an experiment to see if we can do away with it. Instead of
installing to /usr/share/php/Composer, the new v1.4.1 will install to
/usr/share/composer, and only create a symlink from /usr/bin/composer
to the "real" executable under /usr/share.

Since the executable loads everything via relative paths, having the
"real" executable under /usr/share (with the rest of its stuff) allows
composer to find what it's looking for out-of-the box, without us
having to point it towards our particular install location. As a
result, I've removed the one patch that did so, and I've updated
autoload.php with the new path.

Thanks are due to Guillaume Seren who did most of the prerequisite
work and stayed on top of the pull request and bug.

Gentoo-Bug: 613898
Closes: https://github.com/gentoo/gentoo/pull/4364

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 dev-php/composer/Manifest                          |  2 +-
 ...composer-1.3.1.ebuild => composer-1.4.1.ebuild} | 22 ++++++-----
 dev-php/composer/files/autoload.php                |  5 ++-
 dev-php/composer/files/composer-update-paths.patch | 46 ----------------------
 4 files changed, 18 insertions(+), 57 deletions(-)

diff --git a/dev-php/composer/Manifest b/dev-php/composer/Manifest
index 623786d0634..aaf64094054 100644
--- a/dev-php/composer/Manifest
+++ b/dev-php/composer/Manifest
@@ -1 +1 @@
-DIST composer-1.3.1.tar.gz 1081862 SHA256 af40d800c8120c802f80c28cbd80824212111e62e3ef8b96a73ae639cff8f620 SHA512 3b8c4c708cd3b88b49574c691605ef42c2c083b300f910be3b897350c9c35d9f923f47cbcfa64e19d89c28079f0631350f30db747d89808183d20cb779895afb WHIRLPOOL 6545c1f38e11e4233c4ee6f257a8e0c090c2de2981ea9e00a7de54fe3d4337aaa16e1e873da7db2009ad355e3c6da4d7eb12eec81992233840b26bc2b1a0f373
+DIST composer-1.4.1.tar.gz 1090505 SHA256 27c0c134d6a151de8e552f4da98a2100973a64a33c462b14bd5cb463cee254dc SHA512 8fc1e53666151c2b029544216dfc842379763bd3e5085c15c118dfa8ca0da8559a48909cb5ee29f37f6ed07b7572375354a09bd160b9c0828fe40e809defd8a9 WHIRLPOOL 3104bbffc6e5241d052454169e88a0a167acf0229f1ed2fbf184eef9ccb5cd4ab00021be431b84389b40fe895fb1e560e8ecc2f7dd99f457c7190877a0fe107e

diff --git a/dev-php/composer/composer-1.3.1.ebuild b/dev-php/composer/composer-1.4.1.ebuild
similarity index 69%
rename from dev-php/composer/composer-1.3.1.ebuild
rename to dev-php/composer/composer-1.4.1.ebuild
index 366cc6ed80a..90d53510da0 100644
--- a/dev-php/composer/composer-1.3.1.ebuild
+++ b/dev-php/composer/composer-1.4.1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Dependency Manager for PHP"
 HOMEPAGE="https://github.com/composer/composer"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
@@ -27,16 +27,20 @@ RDEPEND="
 	>=dev-php/symfony-finder-2.7.20
 	>=dev-php/symfony-process-2.8.12"
 
-PATCHES=(
-	"${FILESDIR}/${PN}-update-paths.patch"
-)
-
 src_install() {
-	insinto "/usr/share/php/Composer/Composer"
+	insinto "/usr/share/${PN}"
 
 	# Composer expects the LICENSE file to be there, and the
 	# easiest thing to do is to give it what it wants.
-	doins -r src/Composer/. res LICENSE "${FILESDIR}"/autoload.php
-	dobin bin/composer
-	dodoc README.md
+	doins -r src res LICENSE
+
+	insinto "/usr/share/${PN}/vendor"
+	doins "${FILESDIR}"/autoload.php
+
+	exeinto "/usr/share/${PN}/bin"
+	doexe "bin/${PN}"
+	dosym "/usr/share/${PN}/bin/${PN}" "/usr/bin/${PN}"
+
+	dodoc CHANGELOG.md README.md doc/*.md
+	dodoc -r doc/articles doc/faqs
 }

diff --git a/dev-php/composer/files/autoload.php b/dev-php/composer/files/autoload.php
index 5be766d60f4..30d8495a454 100644
--- a/dev-php/composer/files/autoload.php
+++ b/dev-php/composer/files/autoload.php
@@ -6,7 +6,10 @@ if (!class_exists('Fedora\\Autoloader\\Autoload', false)) {
     require_once '/usr/share/php/Fedora/Autoloader/autoload.php';
 }
 
-\Fedora\Autoloader\Autoload::addPsr4('Composer\\', __DIR__);
+\Fedora\Autoloader\Autoload::addPsr4(
+  'Composer\\',
+  __DIR__ . '/../src/Composer'
+);
 
 // Dependencies
 \Fedora\Autoloader\Dependencies::required(array(

diff --git a/dev-php/composer/files/composer-update-paths.patch b/dev-php/composer/files/composer-update-paths.patch
deleted file mode 100644
index 754cbabcbcf..00000000000
--- a/dev-php/composer/files/composer-update-paths.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- ./src/Composer/Autoload/AutoloadGenerator.php       2016-11-03 17:43:15.000000000 +0100
-+++ ./src/Composer/Autoload/AutoloadGenerator.php       2016-11-18 16:54:55.664985847 +0100
-@@ -291,7 +291,7 @@
-         file_put_contents($targetDir.'/autoload_real.php', $this->getAutoloadRealFile(true, (bool) $includePathFileContents, $targetDirLoader, (bool) $includeFilesFileContents, $vendorPathCode, $appBaseDirCode, $suffix, $useGlobalIncludePath, $prependAutoloader, $staticPhpVersion));
-
-         $this->safeCopy(__DIR__.'/ClassLoader.php', $targetDir.'/ClassLoader.php');
--        $this->safeCopy(__DIR__.'/../../../LICENSE', $targetDir.'/LICENSE');
-+        $this->safeCopy('/usr/share/php/Composer/Composer/LICENSE', $targetDir.'/LICENSE');
-
-         if ($this->runScripts) {
-             $this->eventDispatcher->dispatchScript(ScriptEvents::POST_AUTOLOAD_DUMP, $this->devMode, array(), array(
-
---- ./tests/Composer/Test/Json/ComposerSchemaTest.php   2016-11-03 17:43:15.000000000 +0100
-+++ ./tests/Composer/Test/Json/ComposerSchemaTest.php   2016-11-20 18:27:43.169665101 +0100
-@@ -87,7 +87,7 @@
-
-     private function check($json)
-     {
--        $schema = json_decode(file_get_contents(__DIR__ . '/../../../../res/composer-schema.json'));
-+        $schema = json_decode(file_get_contents('/usr/share/php/Composer/Composer/res/composer-schema.json'));
-         $validator = new Validator();
-         $validator->check(json_decode($json), $schema);
-
---- ./src/Composer/Json/JsonFile.php    2016-11-04 02:51:03.844719014 +0100
-+++ ./src/Composer/Json/JsonFile.php    2016-11-18 16:44:06.065969630 +0100
-@@ -156,7 +156,7 @@
-             self::validateSyntax($content, $this->path);
-         }
- 
--        $schemaFile = __DIR__ . '/../../../res/composer-schema.json';
-+        $schemaFile = '/usr/share/php/Composer/Composer/res/composer-schema.json';
-         $schemaData = json_decode(file_get_contents($schemaFile));
- 
-         if ($schema === self::LAX_SCHEMA) {
-
---- ./bin/composer      2016-11-18 15:56:40.615898592 +0100
-+++ ./bin/composer      2016-11-18 16:06:05.348912690 +0100
-@@ -5,7 +5,7 @@
-     echo 'Warning: Composer should be invoked via the CLI version of PHP, not the '.PHP_SAPI.' SAPI'.PHP_EOL;
- }
-
--require __DIR__.'/../src/bootstrap.php';
-+require '/usr/share/php/Composer/Composer/autoload.php';
- 
- use Composer\Console\Application;
-


^ permalink raw reply related	[flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-php/composer/, dev-php/composer/files/
@ 2019-08-16 14:17 Brian Evans
  0 siblings, 0 replies; 3+ messages in thread
From: Brian Evans @ 2019-08-16 14:17 UTC (permalink / raw
  To: gentoo-commits

commit:     a5803c8fe33f8fbac21ed1fd114197f8f4978ffb
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 16 13:20:43 2019 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Fri Aug 16 14:17:23 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5803c8f

dev-php/composer: Drop old

Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Brian Evans <grknight <AT> gentoo.org>

 dev-php/composer/Manifest              |  7 -----
 dev-php/composer/composer-1.6.3.ebuild | 46 ---------------------------------
 dev-php/composer/composer-1.6.5.ebuild | 46 ---------------------------------
 dev-php/composer/composer-1.7.2.ebuild | 46 ---------------------------------
 dev-php/composer/composer-1.7.3.ebuild | 46 ---------------------------------
 dev-php/composer/composer-1.8.0.ebuild | 46 ---------------------------------
 dev-php/composer/composer-1.8.3.ebuild | 47 ----------------------------------
 dev-php/composer/composer-1.8.4.ebuild | 47 ----------------------------------
 dev-php/composer/files/autoload.php    | 28 --------------------
 9 files changed, 359 deletions(-)

diff --git a/dev-php/composer/Manifest b/dev-php/composer/Manifest
index 1f0adaeaa3f..7b7890d9a3d 100644
--- a/dev-php/composer/Manifest
+++ b/dev-php/composer/Manifest
@@ -1,8 +1 @@
-DIST composer-1.6.3.tar.gz 396955 BLAKE2B ee455c8ff7446fe2b51180c1c719a28a5efd30b24ba0f521ce07b02007bfaad15aea4d45b2a381d4a3abef123ce67077f8bf0bc3bee447752f3ab87bb6a5d46b SHA512 d373afe1bf8a5572f1d0bf3451d29ef1ea41f96a5fe54789e906601229d9366536ff0abdc7e0afa7cd14b22ccecf9ddf8b32fec14d4cd6fb308b878034af374c
-DIST composer-1.6.5.tar.gz 398169 BLAKE2B e89fb8805a58d031d4ba1e9694fb45eefa734d5ed79e1bd7c6aef02bf8a52ace19ed7fa109270d67af973f6892a45122017bc42bbd115245dc521e4720b5a549 SHA512 5f18a43af0b94006f4d553f03574347c7f279c409e3467ee65dfff12dad810d625a06452208e2024479faa0b1608ce122a293810e69b826667072171de7d905a
-DIST composer-1.7.2.tar.gz 401211 BLAKE2B b3470a45dcffe8758c3e498a6298f726928a03d297eefa182b823c5c263aca3492f2b3514528c3bb252100cd2f2b64d5a46a74c91cba76823d75433d1ae5c762 SHA512 c6cdb3c122c78383ea5f133bf54d44474c13e343e25e8ac4992e8d213f7645221009b20def194de8d91217f3f9105a7a3b601ab86206ce4c376b028dcb181151
-DIST composer-1.7.3.tar.gz 402233 BLAKE2B b9ae601e5710f12acd6da189a64217fee0198a0eb14227d905b3faab1dd5a4e6b573c4be89968f3b66b4e5612189fc7c284c2aa7d63c2247bce1cc56913acc5f SHA512 7dd6200abdae845e71bc9cb9d329547ee82a3186db93b535af92bdf01d5e0fecc1d7f7ddcbce54c05e60cf75dea9aba0f27ad86746b61b2301effe8d4c115949
-DIST composer-1.8.0.tar.gz 404169 BLAKE2B 977d04d3477e0660eb33e4cb746a5f7cf1cc15544b0afdc48ce7dc7774750b685c36db7796280dd825e2b5b5d310f65521a6c12ca92ca9d2b15c2213c64bec4f SHA512 d8589c75174fd36f5ce10c8f4e18045b8c86167ccc7d6cadb4eed8828d4d7b4b44b0b477b6bd0ebf6d0981a381b35f662205d6b4324c92c86ea3fbc8c3aeb6e4
-DIST composer-1.8.3.tar.gz 405927 BLAKE2B 00be1624fb96212edffd7059b718e74ed69643810de2ddfd6ffa1fb16ac689d2298d420452e7461bb427cc2e8186f4d2c9be072054fe7310bc74c32b80a1a497 SHA512 bb3ddcddcd30c211deae5a75fdfb178c39f0714efd59cb2a4abebdcdc9e18cf9437cae26ed21881fe06278472c150de2935f70b48c3f3c5d7e2a1ea92ee26605
-DIST composer-1.8.4.tar.gz 406561 BLAKE2B 2521da6a50371102c2a8bf61aeeba0c5846692dcbaaa13e83d09a42480c518f91889bd6d6461aef60958d1f68801f77a646c7940c5992a8da25adf050550050b SHA512 b1061fd190b05d2fc309ff76bf246f6d02547249fe52c347715c2dc2e4f5149b3c4e4f43f255874749caeb44ce05cfcbdb8da1d96a9f88a2213a9601e123ef9c
 DIST composer-1.8.6.tar.gz 409002 BLAKE2B 15d9621e062646b81518aff816a3e0b187bf1d9cd617c32e3a19167ba0c89b9ee8f55503e7d2e6d3515939f7d50131c5be0786fc04518409584960290eb32118 SHA512 97ab93acba24307897fe64b3762e77ebca9fa794c5eb476a9d774feb124dbd53b090c36b0fa9d1da38ea26d13af8bf13d7bc733c9c465fba6b908e590ea96dbc

diff --git a/dev-php/composer/composer-1.6.3.ebuild b/dev-php/composer/composer-1.6.3.ebuild
deleted file mode 100644
index 4edcaf35368..00000000000
--- a/dev-php/composer/composer-1.6.3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Dependency Manager for PHP"
-HOMEPAGE="https://github.com/composer/composer"
-SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-lang/php:*[curl]
-	>=dev-php/ca-bundle-1.0.0
-	>=dev-php/cli-prompt-1.0.0
-	>=dev-php/psr-log-1.0.2
-	dev-php/fedora-autoloader
-	>=dev-php/json-schema-3.0.0
-	>=dev-php/jsonlint-1.4.0
-	>=dev-php/phar-utils-1.0.0
-	>=dev-php/semver-1.0.0
-	>=dev-php/spdx-licenses-1.2.0
-	>=dev-php/symfony-console-2.7.9
-	>=dev-php/symfony-filesystem-2.7.20
-	>=dev-php/symfony-finder-2.7.20
-	>=dev-php/symfony-process-2.8.12"
-
-src_install() {
-	insinto "/usr/share/${PN}"
-
-	# Composer expects the LICENSE file to be there, and the
-	# easiest thing to do is to give it what it wants.
-	doins -r src res LICENSE
-
-	insinto "/usr/share/${PN}/vendor"
-	doins "${FILESDIR}"/autoload.php
-
-	exeinto "/usr/share/${PN}/bin"
-	doexe "bin/${PN}"
-	dosym "../share/${PN}/bin/${PN}" "/usr/bin/${PN}"
-
-	dodoc CHANGELOG.md README.md doc/*.md
-	dodoc -r doc/articles doc/faqs
-}

diff --git a/dev-php/composer/composer-1.6.5.ebuild b/dev-php/composer/composer-1.6.5.ebuild
deleted file mode 100644
index 4edcaf35368..00000000000
--- a/dev-php/composer/composer-1.6.5.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Dependency Manager for PHP"
-HOMEPAGE="https://github.com/composer/composer"
-SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-lang/php:*[curl]
-	>=dev-php/ca-bundle-1.0.0
-	>=dev-php/cli-prompt-1.0.0
-	>=dev-php/psr-log-1.0.2
-	dev-php/fedora-autoloader
-	>=dev-php/json-schema-3.0.0
-	>=dev-php/jsonlint-1.4.0
-	>=dev-php/phar-utils-1.0.0
-	>=dev-php/semver-1.0.0
-	>=dev-php/spdx-licenses-1.2.0
-	>=dev-php/symfony-console-2.7.9
-	>=dev-php/symfony-filesystem-2.7.20
-	>=dev-php/symfony-finder-2.7.20
-	>=dev-php/symfony-process-2.8.12"
-
-src_install() {
-	insinto "/usr/share/${PN}"
-
-	# Composer expects the LICENSE file to be there, and the
-	# easiest thing to do is to give it what it wants.
-	doins -r src res LICENSE
-
-	insinto "/usr/share/${PN}/vendor"
-	doins "${FILESDIR}"/autoload.php
-
-	exeinto "/usr/share/${PN}/bin"
-	doexe "bin/${PN}"
-	dosym "../share/${PN}/bin/${PN}" "/usr/bin/${PN}"
-
-	dodoc CHANGELOG.md README.md doc/*.md
-	dodoc -r doc/articles doc/faqs
-}

diff --git a/dev-php/composer/composer-1.7.2.ebuild b/dev-php/composer/composer-1.7.2.ebuild
deleted file mode 100644
index 7b2ac373938..00000000000
--- a/dev-php/composer/composer-1.7.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Dependency Manager for PHP"
-HOMEPAGE="https://github.com/composer/composer"
-SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-lang/php:*[curl]
-	>=dev-php/ca-bundle-1.1.2
-	>=dev-php/psr-log-1.0.2
-	dev-php/fedora-autoloader
-	>=dev-php/json-schema-5.2.7
-	>=dev-php/jsonlint-1.7.1
-	>=dev-php/phar-utils-1.0.1
-	>=dev-php/semver-1.4.2
-	>=dev-php/spdx-licenses-1.4.0
-	>=dev-php/symfony-console-2.8.43
-	>=dev-php/symfony-filesystem-2.8.43
-	>=dev-php/symfony-finder-2.7.20
-	>=dev-php/symfony-process-2.8.43
-	>=dev-php/xdebug-handler-1.2.0"
-
-src_install() {
-	insinto "/usr/share/${PN}"
-
-	# Composer expects the LICENSE file to be there, and the
-	# easiest thing to do is to give it what it wants.
-	doins -r src res LICENSE
-
-	insinto "/usr/share/${PN}/vendor"
-	newins "${FILESDIR}"/autoload-r1.php autoload.php
-
-	exeinto "/usr/share/${PN}/bin"
-	doexe "bin/${PN}"
-	dosym "../share/${PN}/bin/${PN}" "/usr/bin/${PN}"
-
-	dodoc CHANGELOG.md README.md doc/*.md
-	dodoc -r doc/articles doc/faqs
-}

diff --git a/dev-php/composer/composer-1.7.3.ebuild b/dev-php/composer/composer-1.7.3.ebuild
deleted file mode 100644
index 1e07fc80822..00000000000
--- a/dev-php/composer/composer-1.7.3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Dependency Manager for PHP"
-HOMEPAGE="https://github.com/composer/composer"
-SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-lang/php:*[curl]
-	>=dev-php/ca-bundle-1.1.2
-	>=dev-php/psr-log-1.0.2
-	dev-php/fedora-autoloader
-	>=dev-php/json-schema-5.2.7
-	>=dev-php/jsonlint-1.7.1
-	>=dev-php/phar-utils-1.0.1
-	>=dev-php/semver-1.4.2
-	>=dev-php/spdx-licenses-1.4.0
-	>=dev-php/symfony-console-2.8.43
-	>=dev-php/symfony-filesystem-2.8.43
-	>=dev-php/symfony-finder-2.7.20
-	>=dev-php/symfony-process-2.8.43
-	>=dev-php/xdebug-handler-1.2.0"
-
-src_install() {
-	insinto "/usr/share/${PN}"
-
-	# Composer expects the LICENSE file to be there, and the
-	# easiest thing to do is to give it what it wants.
-	doins -r src res LICENSE
-
-	insinto "/usr/share/${PN}/vendor"
-	newins "${FILESDIR}"/autoload-r1.php autoload.php
-
-	exeinto "/usr/share/${PN}/bin"
-	doexe "bin/${PN}"
-	dosym "../share/${PN}/bin/${PN}" "/usr/bin/${PN}"
-
-	dodoc CHANGELOG.md README.md doc/*.md
-	dodoc -r doc/articles doc/faqs
-}

diff --git a/dev-php/composer/composer-1.8.0.ebuild b/dev-php/composer/composer-1.8.0.ebuild
deleted file mode 100644
index 7e07fce8b85..00000000000
--- a/dev-php/composer/composer-1.8.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Dependency Manager for PHP"
-HOMEPAGE="https://github.com/composer/composer"
-SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-lang/php:*[curl]
-	>=dev-php/ca-bundle-1.1.3
-	>=dev-php/psr-log-1.1.0
-	dev-php/fedora-autoloader
-	>=dev-php/json-schema-5.2.7
-	>=dev-php/jsonlint-1.7.1
-	>=dev-php/phar-utils-1.0.1
-	>=dev-php/semver-1.4.2
-	>=dev-php/spdx-licenses-1.5.0
-	>=dev-php/symfony-console-2.8.48
-	>=dev-php/symfony-filesystem-2.8.48
-	>=dev-php/symfony-finder-2.8.49
-	>=dev-php/symfony-process-2.8.48
-	>=dev-php/xdebug-handler-1.3.1"
-
-src_install() {
-	insinto "/usr/share/${PN}"
-
-	# Composer expects the LICENSE file to be there, and the
-	# easiest thing to do is to give it what it wants.
-	doins -r src res LICENSE
-
-	insinto "/usr/share/${PN}/vendor"
-	newins "${FILESDIR}"/autoload-r1.php autoload.php
-
-	exeinto "/usr/share/${PN}/bin"
-	doexe "bin/${PN}"
-	dosym "../share/${PN}/bin/${PN}" "/usr/bin/${PN}"
-
-	dodoc CHANGELOG.md README.md doc/*.md
-	dodoc -r doc/articles doc/faqs
-}

diff --git a/dev-php/composer/composer-1.8.3.ebuild b/dev-php/composer/composer-1.8.3.ebuild
deleted file mode 100644
index d72e21b002f..00000000000
--- a/dev-php/composer/composer-1.8.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Dependency Manager for PHP"
-HOMEPAGE="https://github.com/composer/composer"
-SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="
-	dev-lang/php:*[curl]
-	>=dev-php/ca-bundle-1.1.3
-	>=dev-php/psr-log-1.1.0
-	dev-php/fedora-autoloader
-	>=dev-php/json-schema-5.2.7
-	>=dev-php/jsonlint-1.7.1
-	>=dev-php/phar-utils-1.0.1
-	>=dev-php/semver-1.4.2
-	>=dev-php/spdx-licenses-1.5.0
-	>=dev-php/symfony-console-2.8.48
-	>=dev-php/symfony-filesystem-2.8.48
-	>=dev-php/symfony-finder-2.8.49
-	>=dev-php/symfony-process-2.8.48
-	>=dev-php/xdebug-handler-1.3.1"
-
-src_install() {
-	insinto "/usr/share/${PN}"
-
-	# Composer expects the LICENSE file to be there, and the
-	# easiest thing to do is to give it what it wants.
-	doins -r src res LICENSE
-
-	insinto "/usr/share/${PN}/vendor"
-	newins "${FILESDIR}"/autoload-r1.php autoload.php
-
-	exeinto "/usr/share/${PN}/bin"
-	doexe "bin/${PN}"
-	dosym "../share/${PN}/bin/${PN}" "/usr/bin/${PN}"
-
-	dodoc CHANGELOG.md README.md doc/*.md
-	dodoc -r doc/articles doc/faqs
-}

diff --git a/dev-php/composer/composer-1.8.4.ebuild b/dev-php/composer/composer-1.8.4.ebuild
deleted file mode 100644
index 2c139b8b882..00000000000
--- a/dev-php/composer/composer-1.8.4.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Dependency Manager for PHP"
-HOMEPAGE="https://github.com/composer/composer"
-SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="
-	dev-lang/php:*[curl]
-	>=dev-php/ca-bundle-1.1.3
-	>=dev-php/psr-log-1.1.0
-	dev-php/fedora-autoloader
-	>=dev-php/json-schema-5.2.7
-	>=dev-php/jsonlint-1.7.1
-	>=dev-php/phar-utils-1.0.1
-	>=dev-php/semver-1.4.2
-	>=dev-php/spdx-licenses-1.5.0
-	>=dev-php/symfony-console-2.8.48
-	>=dev-php/symfony-filesystem-2.8.48
-	>=dev-php/symfony-finder-2.8.49
-	>=dev-php/symfony-process-2.8.48
-	>=dev-php/xdebug-handler-1.3.1"
-
-src_install() {
-	insinto "/usr/share/${PN}"
-
-	# Composer expects the LICENSE file to be there, and the
-	# easiest thing to do is to give it what it wants.
-	doins -r src res LICENSE
-
-	insinto "/usr/share/${PN}/vendor"
-	newins "${FILESDIR}"/autoload-r1.php autoload.php
-
-	exeinto "/usr/share/${PN}/bin"
-	doexe "bin/${PN}"
-	dosym "../share/${PN}/bin/${PN}" "/usr/bin/${PN}"
-
-	dodoc CHANGELOG.md README.md doc/*.md
-	dodoc -r doc/articles doc/faqs
-}

diff --git a/dev-php/composer/files/autoload.php b/dev-php/composer/files/autoload.php
deleted file mode 100644
index 30d8495a454..00000000000
--- a/dev-php/composer/files/autoload.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/* Autoloader for composer and its dependencies */
-
-$vendorDir = '/usr/share/php';
-if (!class_exists('Fedora\\Autoloader\\Autoload', false)) {
-    require_once '/usr/share/php/Fedora/Autoloader/autoload.php';
-}
-
-\Fedora\Autoloader\Autoload::addPsr4(
-  'Composer\\',
-  __DIR__ . '/../src/Composer'
-);
-
-// Dependencies
-\Fedora\Autoloader\Dependencies::required(array(
-	$vendorDir . '/JsonSchema/autoload.php',
-	$vendorDir . '/Composer/CaBundle/autoload.php',
-	$vendorDir . '/Composer/Semver/autoload.php',
-	$vendorDir . '/Composer/Spdx/autoload.php',
-	$vendorDir . '/Seld/JsonLint/autoload.php',
-	$vendorDir . '/Symfony/Component/Console/autoload.php',
-	$vendorDir . '/Symfony/Component/Finder/autoload.php',
-	$vendorDir . '/Symfony/Component/Process/autoload.php',
-	$vendorDir . '/Symfony/Component/Filesystem/autoload.php',
-	$vendorDir . '/Seld/PharUtils/autoload.php',
-	$vendorDir . '/Seld/CliPrompt/autoload.php',
-	$vendorDir . '/Psr/Log/autoload.php',
-));


^ permalink raw reply related	[flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-php/composer/, dev-php/composer/files/
@ 2021-02-01 19:15 Thomas Deutschmann
  0 siblings, 0 replies; 3+ messages in thread
From: Thomas Deutschmann @ 2021-02-01 19:15 UTC (permalink / raw
  To: gentoo-commits

commit:     110f7ca5828a08980e8fa472e30149536e382084
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Feb  1 19:11:34 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Feb  1 19:15:51 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=110f7ca5

dev-php/composer: bump to v2.0.9

Closes: https://github.com/gentoo/gentoo/pull/18047
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 dev-php/composer/Manifest               |  1 +
 dev-php/composer/composer-2.0.9.ebuild  | 76 +++++++++++++++++++++++++++++++++
 dev-php/composer/files/autoload.php.tpl | 12 ++++++
 3 files changed, 89 insertions(+)

diff --git a/dev-php/composer/Manifest b/dev-php/composer/Manifest
index 3ad3f0177a3..c77db10c384 100644
--- a/dev-php/composer/Manifest
+++ b/dev-php/composer/Manifest
@@ -1,2 +1,3 @@
 DIST composer-1.10.15.tar.gz 427919 BLAKE2B 38d2e1c795385dd13bedbf5283cf76b04efb54db8dc72eff05370b9505382e2e43f10e1528f148186edb759a098b948d1fee36ac99ab6a5591858723100a27aa SHA512 f8544632e00a08ec75b327e6eac2c96bff60ba78c238863c8ab6b4d82239997f11140a049df0d6c0338bb7523b52fc3ea6f767b9418f75b51535ccfde44fa68c
 DIST composer-1.10.20.tar.gz 429016 BLAKE2B 29dcf1e32974230075e56c9b11e53316a1bada9a6ccf43f3357fc39577abadde566df962bb9bf92cc9806a012fbd70c18aba5daee87090fd10de273643d92ce7 SHA512 5b85ebc6a0612c01bd2dd6f6a57526581a821c1a45163ef85511bd0e629b10dc464776b56fe33be192b2a3f07ce818dc40cf2305d9f65ee10287b2265e198cca
+DIST composer-2.0.9.tar.gz 493134 BLAKE2B f08818ec05aeebd79501e221b9cef10425c7dd60b9aca17ca8dad2f6967258d6b1a8d0d1b383b0c7dd1214ce6416f666bc30785bcb5978c66051ef2e03d17304 SHA512 4953bcc0d2e9ae61ebbb3615c262ac05762fa0165db2114118eb5c2bb014bc4341b07c3b8739575feacaad92d2460b89486b49f4eb49b80ce4a9de36a1152b48

diff --git a/dev-php/composer/composer-2.0.9.ebuild b/dev-php/composer/composer-2.0.9.ebuild
new file mode 100644
index 00000000000..dfdecde74be
--- /dev/null
+++ b/dev-php/composer/composer-2.0.9.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+DESCRIPTION="Dependency Manager for PHP"
+HOMEPAGE="https://github.com/composer/composer"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-lang/php:*[curl]
+	>=dev-php/ca-bundle-1.0
+	dev-php/fedora-autoloader
+	>=dev-php/jsonlint-1.4
+	>=dev-php/json-schema-5.2.10
+	>=dev-php/phar-utils-1.0
+	>=dev-php/psr-log-1.0
+	>=dev-php/reactphp-promise-2.7
+	>=dev-php/semver-3.0
+	>=dev-php/spdx-licenses-1.2
+	>=dev-php/symfony-console-2.8.52
+	>=dev-php/symfony-filesystem-2.8.52
+	>=dev-php/symfony-finder-2.8.52
+	>=dev-php/symfony-process-2.8.52
+	>=dev-php/xdebug-handler-1.1"
+
+src_prepare() {
+	default
+
+	mkdir vendor || die
+
+	phpab \
+		--output vendor/autoload.php \
+		--template "${FILESDIR}"/autoload.php.tpl \
+		--basedir src \
+		src \
+		|| die
+
+	cat >> vendor/autoload.php <<EOF || die "failed to extend autoload.php"
+
+// Dependencies
+\Fedora\Autoloader\Dependencies::required([
+	'/usr/share/php/Composer/CaBundle/autoload.php',
+	'/usr/share/php/Composer/Semver/autoload.php',
+	'/usr/share/php/Composer/Spdx/autoload.php',
+	'/usr/share/php/Composer/XdebugHandler/autoload.php',
+	'/usr/share/php/JsonSchema/autoload.php',
+	'/usr/share/php/Psr/Log/autoload.php',
+	'/usr/share/php/Seld/JsonLint/autoload.php',
+	'/usr/share/php/Seld/PharUtils/autoload.php',
+	'/usr/share/php/Symfony/Component/Console/autoload.php',
+	'/usr/share/php/Symfony/Component/Filesystem/autoload.php',
+	'/usr/share/php/Symfony/Component/Finder/autoload.php',
+	'/usr/share/php/Symfony/Component/Process/autoload.php',
+	'/usr/share/php/React/Promise/autoload.php'
+]);
+EOF
+}
+
+src_install() {
+	insinto "/usr/share/${PN}"
+
+	# Composer expects the LICENSE file to be there, and the
+	# easiest thing to do is to give it what it wants.
+	doins -r LICENSE res src vendor
+
+	exeinto "/usr/share/${PN}/bin"
+	doexe "bin/${PN}"
+	dosym "../share/${PN}/bin/${PN}" "/usr/bin/${PN}"
+
+	dodoc CHANGELOG.md README.md doc/*.md
+	dodoc -r doc/articles doc/faqs
+}

diff --git a/dev-php/composer/files/autoload.php.tpl b/dev-php/composer/files/autoload.php.tpl
new file mode 100644
index 00000000000..b740c5593c2
--- /dev/null
+++ b/dev-php/composer/files/autoload.php.tpl
@@ -0,0 +1,12 @@
+<?php
+// @codingStandardsIgnoreFile
+// @codeCoverageIgnoreStart
+require_once 'Fedora/Autoloader'.'/autoload.php';
+
+\Fedora\Autoloader\Autoload::addClassMap(
+    array(
+        ___CLASSLIST___,
+    ),
+    __DIR__ . '/../src'
+);
+// @codeCoverageIgnoreEnd


^ permalink raw reply related	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-02-01 19:15 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-08-16 14:17 [gentoo-commits] repo/gentoo:master commit in: dev-php/composer/, dev-php/composer/files/ Brian Evans
  -- strict thread matches above, loose matches on Subject: below --
2021-02-01 19:15 Thomas Deutschmann
2017-04-27 12:16 Michael Orlitzky

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox