gentoo resync : 18.08.2019

4 files changed, 3 insertions, 73 deletions

diff --git a/dev-php/symfony-filesystem/Manifest b/dev-php/symfony-filesystem/Manifest
index d3a2ab8b3d44..5f4271aa9789 100644
--- a/dev-php/symfony-filesystem/Manifest
+++ b/dev-php/symfony-filesystem/Manifest
@@ -1,7 +1,4 @@
-AUX annotate-network-tests.patch 865 BLAKE2B ffe8e19500e00493496ab845ec8222356030f2f61167fff3158017d94887e5652a220deefb019b00a4b79d02b1bc027646da4ad775d6e319129d8038fb6d6758 SHA512 feebf037ca0040f828cbbb15c290045dc1f0c533fa418bbe81cc4f1cb2c8080af264982129203a4b2172a05920b8e807b32040f79d60fbc4144ef3fe8c09c436
 AUX autoload.php 280 BLAKE2B f482a272729d9e859d789f38b8ae9179c4e79132019e62c5ab2c215697a99f29f89b80d10cdeb2d3a8cbc130fc5ad15c32ee217c80c1e93390d730254c5e3815 SHA512 27642698b0f10e96c8fb3ba5619c8b230bc830140d87593c61351c43b1eddb10f82770b37899f305587c9187c673f4b8f889ead8d34926c02e99957620693a0a
-DIST symfony-filesystem-3.2.8.tar.gz 17361 BLAKE2B 8ce4fd987ee7e0609433de8428b849645a9c8372029e0a075d3070786441577c5413e1a2f13e1581afc90cb69fe04c2b64e75de3e23ea532dd7ffd63e2bd8ee2 SHA512 b9464dec0c5100877bb7178a118ab34e9893307df371e9a9f8df8d69e59b6e14c9f7143e4eaf5b47662f69dce1b5fa975b6bb78e93a5c7455eb44dacfaab82e8
 DIST symfony-filesystem-3.4.28.tar.gz 19238 BLAKE2B dcb9752a5691834aa87b3866b6c2f53b54d5953cf721547cf3ae8aa03e826bcacb2393f324bf9a767013a2daebcf9654c7ce18822ac40758d96b35b174b8ab6d SHA512 4a2e19bf6df69396e503e11112d9b37e9deaaba5eb4fa95857b7b19e1ce073462d2ca18442b6cc1c30021f925d0878f635aa9bc1c5de55318f0c521a291efcc8
-EBUILD symfony-filesystem-3.2.8.ebuild 981 BLAKE2B 5790c3d693827dcea588a70d4c0cf27b28b050101717170ce1ed8137f8c1bb4ad47c5f4b46d56cff31383cb399f0abd926dfe042ea8ca9a8e0e68c8bdcc721ec SHA512 87e695ed50eed4b9ce39db0a7357edefe935032134adb8f306b7ce02a14131da9e13484d5b0a9c0fb27cc33bab02fc6edf5317d85927424ab9005047cf93699f
-EBUILD symfony-filesystem-3.4.28.ebuild 860 BLAKE2B a93c4f6a5e6e8e0df1f644ad535b38802b528ae1af134749bd7257cb8ddcde6c1ec6858429009dd5b10a6e46eef64f38843ad99bf6799d65e77c6e44d687af6d SHA512 d8e180b18f9ddb36b77c5392b83ddb0e3fec3c125c0f09f5b9d642cb6de7872296d4acc306effe47efd5d77b8c9317bd6a8dac299cb056c814f7f864dfb195a5
+EBUILD symfony-filesystem-3.4.28.ebuild 913 BLAKE2B 391eac0cf1dd4052206b1c23adb2d4ba9135a208ed1aa3eff465df5e6b10afcfe904c13f5e00fb0c460c893bde234eb7de86a23966ca8bf0919e47dbd8ee4807 SHA512 5b83ca824b09e73e5c4e46b4aa5ea27fbad9266a36c95f92f775e2ae93bfbc62b4c71b8a383339bcd2a871aa924d732c91e7f557e2de7c94a13a43f5159eebac
 MISC metadata.xml 671 BLAKE2B 6bac5eae2bf1dcf6ee982be6ee6bddf3c3e0b767b6fc1920f2bc7d7bd3798f6b1567a4ee9fe79c7ebe704572b633d129ea7eef0828a481bfc19fe2d4ae3fc87d SHA512 bbc967795d3f2cac6bca2c94805e8e412cacf7a32699222b27f8f658c54363c1ab49cb0e68b2323ad7d8dd71a5983aeae5e2ad52e23759b3cf9f0ff8662d4e6c
diff --git a/dev-php/symfony-filesystem/files/annotate-network-tests.patch b/dev-php/symfony-filesystem/files/annotate-network-tests.patch
deleted file mode 100644
index 38c83753195f..000000000000
--- a/dev-php/symfony-filesystem/files/annotate-network-tests.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From cda6fa8801d04b149592c5789c0d060c4ca4e9db Mon Sep 17 00:00:00 2001
-From: Michael Orlitzky <michael@orlitzky.com>
-Date: Wed, 3 May 2017 18:33:56 -0400
-Subject: [PATCH 1/1] Annotate the one network test as being a part of the
- "network" group.
-
----
- Tests/FilesystemTest.php | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/Tests/FilesystemTest.php b/Tests/FilesystemTest.php
-index 1341392..a862fa8 100644
---- a/Tests/FilesystemTest.php
-+++ b/Tests/FilesystemTest.php
-@@ -156,6 +156,9 @@ class FilesystemTest extends FilesystemTestCase
-         $this->assertEquals('SOURCE FILE', file_get_contents($targetFilePath));
-     }
- 
-+    /**
-+     * @group network
-+     */
-     public function testCopyForOriginUrlsAndExistingLocalFileDefaultsToCopy()
-     {
-         $sourceFilePath = 'http://symfony.com/images/common/logo/logo_symfony_header.png';
--- 
-2.10.2
-
diff --git a/dev-php/symfony-filesystem/symfony-filesystem-3.2.8.ebuild b/dev-php/symfony-filesystem/symfony-filesystem-3.2.8.ebuild
deleted file mode 100644
index 942c49c4b135..000000000000
--- a/dev-php/symfony-filesystem/symfony-filesystem-3.2.8.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Symfony Filesystem Component"
-HOMEPAGE="https://github.com/symfony/filesystem"
-SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="dev-lang/php:*
-	dev-php/fedora-autoloader"
-DEPEND="test? ( ${RDEPEND} >=dev-php/phpunit-5.7.15 )"
-
-S="${WORKDIR}/filesystem-${PV}"
-
-# This patch is https://github.com/symfony/symfony/pull/22630
-PATCHES=( "${FILESDIR}/annotate-network-tests.patch" )
-
-src_prepare() {
-	default
-	if use test; then
-		cp "${FILESDIR}/autoload.php" "${S}/autoload-test.php" || die
-	fi
-}
-
-src_install() {
-	insinto "/usr/share/php/Symfony/Component/Filesystem"
-	doins -r Exception
-	doins *.php "${FILESDIR}/autoload.php"
-	dodoc CHANGELOG.md README.md
-}
-
-src_test() {
-	phpunit --bootstrap "${S}/autoload-test.php" \
-		--exclude-group network || die 'test suite failed'
-}
diff --git a/dev-php/symfony-filesystem/symfony-filesystem-3.4.28.ebuild b/dev-php/symfony-filesystem/symfony-filesystem-3.4.28.ebuild
index 24314726ed60..f9398c26fd35 100644
--- a/dev-php/symfony-filesystem/symfony-filesystem-3.4.28.ebuild
+++ b/dev-php/symfony-filesystem/symfony-filesystem-3.4.28.ebuild
@@ -5,12 +5,13 @@ EAPI=7
 
 DESCRIPTION="Symfony Filesystem Component"
 HOMEPAGE="https://github.com/symfony/filesystem"
-SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/symfony/filesystem/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-lang/php:*
 	dev-php/fedora-autoloader"