gentoo resync : 09.06.2018

25 files changed, 89 insertions, 74 deletions

diff --git a/dev-php/File_Iterator/File_Iterator-1.3.4.ebuild b/dev-php/File_Iterator/File_Iterator-1.3.4.ebuild
index 46a825640e34..78a56a955c63 100644
--- a/dev-php/File_Iterator/File_Iterator-1.3.4.ebuild
+++ b/dev-php/File_Iterator/File_Iterator-1.3.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,6 +13,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 hppa x86"
 IUSE=""
-HOMEPAGE="https://github.com/sebastianbergmann/php-file-iterator"
+HOMEPAGE="https://github.com/sebastianbergmann/php-file-iterator
+	https://phpunit.de"
 SRC_URI="http://${PHP_PEAR_URI}/get/${PEAR_P}.tgz"
 DOCS=( ChangeLog.markdown README.markdown )
diff --git a/dev-php/File_Iterator/File_Iterator-1.4.2.ebuild b/dev-php/File_Iterator/File_Iterator-1.4.2.ebuild
index 1f1c3decc820..359295e3bba5 100644
--- a/dev-php/File_Iterator/File_Iterator-1.4.2.ebuild
+++ b/dev-php/File_Iterator/File_Iterator-1.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,8 @@ EAPI=6
 MY_PN="php-file-iterator"
 
 DESCRIPTION="FilterIterator implementation that filters files based on criteria"
-HOMEPAGE="http://phpunit.de"
+HOMEPAGE="https://github.com/sebastianbergmann/php-file-iterator
+	https://phpunit.de"
 SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-php/File_Iterator/File_Iterator-1.4.3.ebuild b/dev-php/File_Iterator/File_Iterator-1.4.3.ebuild
index 304b65799f28..ccd2b390476d 100644
--- a/dev-php/File_Iterator/File_Iterator-1.4.3.ebuild
+++ b/dev-php/File_Iterator/File_Iterator-1.4.3.ebuild
@@ -6,7 +6,8 @@ EAPI=6
 MY_PN="php-file-iterator"
 
 DESCRIPTION="FilterIterator implementation that filters files based on criteria"
-HOMEPAGE="https://phpunit.de"
+HOMEPAGE="https://github.com/sebastianbergmann/php-file-iterator
+	https://phpunit.de"
 SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-php/File_Iterator/Manifest b/dev-php/File_Iterator/Manifest
index 2efe7dea2080..fdd9d1a595b4 100644
--- a/dev-php/File_Iterator/Manifest
+++ b/dev-php/File_Iterator/Manifest
@@ -3,7 +3,7 @@ AUX channel.xml 804 BLAKE2B d6a965a41a220f07e3a0d206bc3359e2649b55d186e7975726c1
 DIST File_Iterator-1.3.4.tgz 5199 BLAKE2B 75da70ad638230dd231947e3af26c2570eff367328d2e541fb1228ba531c0f249c931a9185f977dce9e17846e1e9b8b1f9f8d21219291e637b2eaf7805dcf360 SHA512 7117e0e56a9bc533d9f93556366a8026d1e5a9a3894c05551adef6c1e6cd556c1ebf6b96bd98279cb92077b3d8f8d7b7e42f446b39895850e573d0ec511392be
 DIST File_Iterator-1.4.2.tar.gz 4141 BLAKE2B 4c8d9847fa198d444571acdf777020b76e87e09506038c7d7ce732b97c149149bcf22dc25d0af36f041b7930673b05f940df8211c29829e0fed2b3dcfae0ba05 SHA512 295943681853c858e3e1c336c030338c61a74169bd2a619da6fca8c43611e587c6f626fa92799d614bcb0a1f86bbb39895b20f2a389107cedb9660a7e792a243
 DIST File_Iterator-1.4.3.tar.gz 4140 BLAKE2B 89274c6f9b561dbc732d0b81f06b7c34d267ea31d1deb5977eaa16852d87442183221ed6789fd5e09b80ef96811df2ff8ef5da5c764703f5e7a2d5289f582527 SHA512 cea906d6028d9c2dbbb5486198adbecbca87f8b4dcbe12f72b9732ac29cf8eb868a23af7a5bcf2de55e0040a077ab55b016e773d5145f987f7e3f9671ad3ea28
-EBUILD File_Iterator-1.3.4.ebuild 557 BLAKE2B c277c509ecf567cf41bd5abce4f3d560871050e9556687a4ed0cc37eb5bf3f75e9270bf0019ef04ce3b7d4959dd9c91183f6a2799198976cf5284099aabae6dc SHA512 c6ba4224d33ec69a60e59fbb5af78d3b3f675b1840e368518fe39e47924f1293ffe6c5e7d3dde425e6270bf5c3da74fdfafc4af59e49238ebaa9821272cac303
-EBUILD File_Iterator-1.4.2.ebuild 800 BLAKE2B 496eb2ba586ab0f241351770927fb6746bcd7a64b8aec73cf4d2de0ed8c0eecf09c693a72e060c5a2384c1feeac608fe7f0484e45a6d089d89a276532a588b3d SHA512 48aaecf18cfd1d75711a39e12b0c3fc4808145ffc3b6915ea6b3cf56532ad1f7056db08b54e0eadfeff20cec409d8890ed037cf57ee5f8c7b88f42c152f89783
-EBUILD File_Iterator-1.4.3.ebuild 810 BLAKE2B 83e4c6bc9c3c06d9cd3a940be376a7918ac02621c81d900252a31108be98acf5ed094be33984da136c863840eebfa4ae53f229d42750f93ea6f5a4336b859506 SHA512 3a162af76adb1fa170c234f0d06d7fcfe278307a5d1686fe1534d86572abcc44d4fe05410ccd04c9182b7465b68345ac6c3f1b83c8810fb72bb567d065edc4b7
+EBUILD File_Iterator-1.3.4.ebuild 577 BLAKE2B 0c98424026c342511d6f73c2fe4d2ccad1e14dd97f97cf1d36bec6e469093bbef5fcdf0ca89c79d3410c1957083150d121587a509ac45689273aa1b34132d848 SHA512 5b389c4cb5c4a939a330347db4281fdc2c0c3ef993cb3f5606fa1a54f7968616c2ae275fb49c810256b84774cca5aa4776bd3a139078e9e4651cb3a47d5b5b57
+EBUILD File_Iterator-1.4.2.ebuild 857 BLAKE2B 35f38333c62934f9db26e34d5c12aaa43175d6bd39907d0d519f68a5620491ad0983969e7256386578f99b9e46b7b98d156b5a71f3f97831ba47b1141085114d SHA512 9e9108633f405935b025aa4cdd957387ae152bbe943435f896fd97fb063dcd2a2cb089e7c1e1e4cfd16fd180ad754565c7709f01faf8a5fb3d1ee930ab469c24
+EBUILD File_Iterator-1.4.3.ebuild 866 BLAKE2B e5e1e0dc5ebe224bbddeab59ee7f2e0be3b06a400af818f7d0045869fdfdddbf60efc405a9aa1e30bad8a9c3310e4a71db866821fea6b4e5486d35001f92a306 SHA512 f45b221200b40f5c10c1d7240b3eb1e459c8784741cd5a0ec594ce7ba382e5383a9f8086aa9e58fbd1d739795b52a11e02ed35a9f18f6a9c4e970f7268cfb6bc
 MISC metadata.xml 349 BLAKE2B ab948322ce2cfa4e40d9b0ac17d435db9e4613000fa05c810860e281615d5b1297f826ec51ed460ba87080508578e2353729843cdd2bf1f4226890413137a911 SHA512 85e7e819b346185575934f4f356d1346534fce0fe1ddcf5e88e855ce40f64c48bf73c1f14085cf0526ee681014943f7524ea79b7d951b66c12e67e6f04c099e8
diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index 1e9be33ad92f..24ea5d6294a8 100644
--- a/dev-php/Manifest.gz
+++ b/dev-php/Manifest.gz
diff --git a/dev-php/PEAR-Crypt_GPG/Manifest b/dev-php/PEAR-Crypt_GPG/Manifest
index 73160f30d294..5d5dc71c0f43 100644
--- a/dev-php/PEAR-Crypt_GPG/Manifest
+++ b/dev-php/PEAR-Crypt_GPG/Manifest
@@ -1,4 +1,6 @@
 AUX fix-unit-tests-with-new-gpg.patch 2090 BLAKE2B 7cc3b79bfd29244eec6e0152130d33d64ff99ddb4da9508affa9a06274d8b888d4e7ea38c2a8e090953b40533b19a5224f803d71199ece8dde70444959fba9eb SHA512 3b6b301d19cde1eebd411caf409dd11add712717a638f2b4d8567114cc065efdc899cb8244412da7b3438850a9bedfafe95e370705fd7439b312f4cb318f4124
 DIST Crypt_GPG-1.6.2.tgz 346709 BLAKE2B abced2fe8c909f06690c38884506ce03df4c5ef3ef460aafce65ea9405c6974f8af320fd5a07a7967b45421a9a67aa27026c28ef7eb1402ffefba527007a33ae SHA512 9d954d96b4e461c75f79ce9bc701d062e3f19671690228e6e0ce5265733ac1de9c06520f9f750348f3c37f01ccb79720574b2d2f371e69c8a25ae6e1bc18aabd
+DIST Crypt_GPG-1.6.3.tgz 346999 BLAKE2B 8402ef382a6393972a3fda7370fbd37dec19d0ebabb6b316d35783538dbc01746476977d7dc3da487876201cd678964d9572dc67a43911319b1b614004a3c909 SHA512 f1ad2560a43a1e8f5a33269bc4ae4067e19e5325fdbd8d2fc55f6cb8aad89258df45fbecedd93a21749f33024c819f07399580b1a4760f5740f26043109dc396
 EBUILD PEAR-Crypt_GPG-1.6.2.ebuild 1143 BLAKE2B 9c3d6abc1c26edce890974074f198ad25c2cdc0994f15f6c1ed87535838a59c3591f1cb07b9bbbc01d52d53bb7831578e3ebeef918df949da6b3f45925994bad SHA512 39411280c81f82f849145f85f3db8752b230f3ecb44b39a1f661bfd946f6ba61b78ad55ebb42d98d15e63864a5d4f70454ff1857ae4fef3052f9e0d1e81663af
+EBUILD PEAR-Crypt_GPG-1.6.3.ebuild 1091 BLAKE2B 0df4468cfb9c0c28ae822ae30595e31c8807d7fec881e3b7faf3d6eaee0aafc55966cf6eabd6ac20c60d8999d48b00d4d3b3ab965acf78d942cdc51edf9bf789 SHA512 edc5ed49b7849fb622c11001a3b774ecbee62127aae73bde8b54b67aa3d89599ce000fe2d7a6f2732eed056c9ce29116969e523a3ff88b573c4eed3404d3ad36
 MISC metadata.xml 377 BLAKE2B d87bdb689ac2ef20b8d02bc7f9db6a3f23fa5bcaae752c4f5b1b0e5bbc67251779c0204b2943d044a1ca287bb07ddac9ef0ae960eb7f543e162ef6cabcbed65e SHA512 df55d57721b34bddab42639c469517c86139d60d4a4536b26b61cb35eb688c9d713cf90f92b2272e189e360042a2322e8f87480f4554a7c3cf9ffa314d053186
diff --git a/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.3.ebuild b/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.3.ebuild
new file mode 100644
index 000000000000..f40428e9b276
--- /dev/null
+++ b/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="${PN/PEAR-/}"
+MY_PV="${PV/_/}"
+MY_P="${MY_PN}-${MY_PV}"
+
+DESCRIPTION="PHP interface to the GNU Privacy Guard (GnuPG)"
+HOMEPAGE="http://pear.php.net/package/${MY_PN}"
+SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+
+RDEPEND="app-crypt/gnupg
+	dev-lang/php:*[posix,unicode]
+	dev-php/PEAR-Console_CommandLine
+	dev-php/PEAR-Exception"
+BDEPEND="test? ( ${RDEPEND} dev-php/phpunit )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+	sed -i "s|@bin-dir@|${EPREFIX}/usr/bin|" Crypt/GPG/Engine.php || die
+	sed -i "s|@package-name@|${MY_PN}|" Crypt/GPG/PinEntry.php || die
+	sed -i "s|@data-dir@|${EPREFIX}/usr/share|" Crypt/GPG/PinEntry.php || die
+}
+
+src_install() {
+	dodoc README.md
+	dobin scripts/crypt-gpg-pinentry
+
+	insinto "/usr/share/${MY_PN}"
+	doins -r data
+
+	insinto /usr/share/php
+	doins -r Crypt
+}
+
+src_test() {
+	phpunit tests/ || die "test suite failed"
+}
diff --git a/dev-php/PEAR-HTTP/Manifest b/dev-php/PEAR-HTTP/Manifest
index 3fcf85056715..101aac17ff16 100644
--- a/dev-php/PEAR-HTTP/Manifest
+++ b/dev-php/PEAR-HTTP/Manifest
@@ -1,4 +1,3 @@
 DIST HTTP-1.4.1.tgz 8635 BLAKE2B 2d834adcd5f5f2123f0d477bcb1b8189312d7fd8e2ff8e23f23a12ce762dbcda359ac61b192b58f60749c527c0545c3ef321a9610f3fbb0eacd3545e42f86e6b SHA512 60f9ef88eea358e83942213c9643ed7a635822c0963b79221eabb1000e126e5a79e4c6b3901c83c53ad1734ac6b774d355328a8d94087faee544af9bdc20f71c
-EBUILD PEAR-HTTP-1.4.1-r2.ebuild 338 BLAKE2B c984568acc2db99309ed09476a952f9f2d168e04257612f39ffc350fb9aae5eed5a8aad8e80e6da319e6ba9410c4ff1813032d92d6669499c4e6e250719fd469 SHA512 cb8a997c78b8cb26c81d0e2fc240ca614aad0b462cdfb4036fd1e05a169310569785915c83a90374f0fa2c602a2dc2e017517af626a31cfcd77ce83b49286f4b
-EBUILD PEAR-HTTP-1.4.1-r3.ebuild 456 BLAKE2B c8ab9d3d6c2a0eea7c3aefa56f2bccd93e748471cfeb340a290fc004d09e0662a14f42ae527b94fdf04ada63446f08864daa1b4a5eaf3dc8f8c653290af75221 SHA512 ed05ac3a36f79ba61dec79d50b645a86dc4694c57b47cd92f6bc32aadef6fefb52bf0c517289e883137589d2191f1a0445fc92aeb0b09e0264028712b5a966a1
+EBUILD PEAR-HTTP-1.4.1-r3.ebuild 448 BLAKE2B 98c5fbd3219712339ac07f33d32d0da1447cc549d420f67acd13e7a16f13c7a4f30412674b297d3fb1e680b633ea50f61edc8a4898cfb6ff87fbcfe27a1619d0 SHA512 aa4299d80aaa657ceb422291d8e7a254d92238d7d946bb92f02669b6cf0631366c9cc90cfa4a34c5e07339884701c7943b3aa48366645cdec53d8f27db340d44
 MISC metadata.xml 235 BLAKE2B 5b10304feea18aae1822be7d29bcce06c8715193b14a3dd2c4d79eb75e2767670352e2ca11e06b9a10ec04b63020a18254cd167e6d6be9072f4a200ca5d11ec4 SHA512 0b3e95bbf68eddf74289dad50f8828cffce2d904ff6f9bd5468177de979677cac11da84d1e0302c52b72085915b9d1b3496107172e5726520d51dad1981daf64
diff --git a/dev-php/PEAR-HTTP/PEAR-HTTP-1.4.1-r2.ebuild b/dev-php/PEAR-HTTP/PEAR-HTTP-1.4.1-r2.ebuild
deleted file mode 100644
index 0965173e4b80..000000000000
--- a/dev-php/PEAR-HTTP/PEAR-HTTP-1.4.1-r2.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit php-pear-r1 eutils
-
-DESCRIPTION="Miscellaneous HTTP utilities"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-src_prepare() {
-	# fix nasty DOS linebreaks
-	edos2unix HTTP.php
-}
diff --git a/dev-php/PEAR-HTTP/PEAR-HTTP-1.4.1-r3.ebuild b/dev-php/PEAR-HTTP/PEAR-HTTP-1.4.1-r3.ebuild
index 93359ae15479..504e8f98f275 100644
--- a/dev-php/PEAR-HTTP/PEAR-HTTP-1.4.1-r3.ebuild
+++ b/dev-php/PEAR-HTTP/PEAR-HTTP-1.4.1-r3.ebuild
@@ -8,7 +8,7 @@ inherit php-pear-r2 eutils
 DESCRIPTION="Miscellaneous HTTP utilities"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
 IUSE="test"
 DEPEND="test? ( dev-php/PEAR-PEAR )"
 
diff --git a/dev-php/PEAR-HTTP_Request2/Manifest b/dev-php/PEAR-HTTP_Request2/Manifest
index d908bf539e9b..f28674ec6937 100644
--- a/dev-php/PEAR-HTTP_Request2/Manifest
+++ b/dev-php/PEAR-HTTP_Request2/Manifest
@@ -1,5 +1,3 @@
-DIST HTTP_Request2-2.2.1.tgz 107339 BLAKE2B fa9d997c7ea59aeb8c4133944d57af3dca79e937b271ad862f8ada26631a14992f204566dc2059cd19a0169f7d89ef1b302ec9fe2b4e370a8e715a0004b474f8 SHA512 377421f521184b3dc4f28b1d37a1f673ee2b40b8786e39c3803ed6c60f57a2aa8353018ea588598b7ef23a1345227a41481519932998dd01958df623d00dcd82
 DIST HTTP_Request2-2.3.0.tgz 119717 BLAKE2B f12972b2423258016f4f4ef8888b5aa1d56bb47146cc6e21f74edfd2e3cd8ae69a1830b4a203990e1346554f2a6e9538e8d5feae27cceadc8465b018dd34ff37 SHA512 52fc2768f3c5afe6fd4505d427255e467b5b7cac8a4116cbabc3f1c0ffe6f1bd061a9c9b31de2ebbd4a7844ae73085ab0d52adf905dce28eb31197117657d77b
-EBUILD PEAR-HTTP_Request2-2.2.1.ebuild 407 BLAKE2B 410311e2b925c6ad7b61ad6a7a672b961985a7a54fa4d81fc2d4b8e92e081a4c29826e65cbf29bf7b2b1f4c4816cb2857089984ec78193663e465eddf31b3fc7 SHA512 6523a40db4a3e29b0880e4ff99de81704ebc674a9dbb3658f1bd276cdb9679932c3bd8786b8a7801b00a6e7796feab6a640b7d1834980382963a1efd8ace1e4e
-EBUILD PEAR-HTTP_Request2-2.3.0-r1.ebuild 731 BLAKE2B 753e629af80fd656fcf083a594932d2a99c921937957d318227df261a4de3f9055b1e2edac82ea94f7655a0c440fc49a22b1f8fa72ea395719b9e415efe0d8bf SHA512 75e9477773dd68dbb333aed62ab4cc84b520765f1b87d53da0733080219a41b41230f529084d538764394405d78c67ed56cfa3febb6221ac93ef6092d031046f
+EBUILD PEAR-HTTP_Request2-2.3.0-r1.ebuild 725 BLAKE2B a5533442eb441637032dfdad3db8cafb609d3b83556067c2d8f93bbff6c251b84e51cab28be839cbb6f1d19a5de1ef34de85e97a2b6f4614a0ebae4fe0871e1a SHA512 811125065ccdd15b4e9b989bdece6d6429a495e968b97aa385f5883d3e2b22108556405e5f7878eb90f593752ffb07eaff68d4dd37e4ca67895aae43b5174dfb
 MISC metadata.xml 719 BLAKE2B 82195b1905bf7b954b7a62502ef524628a05a509e551bdeae9dec1d157579ca6520a8173dd5cfe2eb677f8d26b5fce9195d9312027f6a50d063f0a77acc6152f SHA512 38a38b6d73d885e7222812f54cc4bb67fae6d05c5647b123c00c7676a3feb8fc2cf33a2d308058431e00865a1dc198fd978614c652e614a1058e0319abe72704
diff --git a/dev-php/PEAR-HTTP_Request2/PEAR-HTTP_Request2-2.2.1.ebuild b/dev-php/PEAR-HTTP_Request2/PEAR-HTTP_Request2-2.2.1.ebuild
deleted file mode 100644
index 4c76658dc5c9..000000000000
--- a/dev-php/PEAR-HTTP_Request2/PEAR-HTTP_Request2-2.2.1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit php-pear-r1
-
-DESCRIPTION="Provides an easy way to perform HTTP requests"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~ppc ~ppc64 ~s390 ~sh sparc x86"
-IUSE="+curl +fileinfo +ssl +zlib"
-
-RDEPEND="dev-lang/php[curl?,fileinfo?,ssl?,zlib?]
->=dev-php/PEAR-Net_URL2-2.0.0"
diff --git a/dev-php/PEAR-HTTP_Request2/PEAR-HTTP_Request2-2.3.0-r1.ebuild b/dev-php/PEAR-HTTP_Request2/PEAR-HTTP_Request2-2.3.0-r1.ebuild
index 99f16b6faf11..6242b76006eb 100644
--- a/dev-php/PEAR-HTTP_Request2/PEAR-HTTP_Request2-2.3.0-r1.ebuild
+++ b/dev-php/PEAR-HTTP_Request2/PEAR-HTTP_Request2-2.3.0-r1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Provides an easy way to perform HTTP requests"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~ppc ~ppc64 ~s390 ~sh sparc x86"
 IUSE="+curl +fileinfo +ssl test +zlib"
 
 RDEPEND="dev-lang/php:*[curl?,fileinfo?,ssl?,zlib?]
diff --git a/dev-php/doctrine/Manifest b/dev-php/doctrine/Manifest
index 3db6f2f6c211..769dd9a6908e 100644
--- a/dev-php/doctrine/Manifest
+++ b/dev-php/doctrine/Manifest
@@ -1,7 +1,7 @@
 DIST doctrine-1.2.5.tar.gz 659173 BLAKE2B fd703eb52d209548dd44950cdb23c2e3298e044f9387acadb2edc67bba79dd9b0a60fdf9a98d46e8078415c1e0ff21976323a6df1ab9f798ee475690ce50d4d8 SHA512 c72f4e829a92b011af0bd96d2f8a780c3106afb57a9677a21aed683473ff00aebdf7143a276c7cc70f1b142196968b5e2e5e1f744dba5c8ae1267b867b4e0310
 DIST doctrine-2.4.6.tar.gz 456426 BLAKE2B 775c14750954ced8728c220dee6ca41cbfa66a7c34b00476f6941d5681302b1f10cc8dfa5e206780bb3b4b5d0e591b0e770de182340c6e7a881d3c4ca3f5795c SHA512 d7aeb58e8c76df384a472df08618a058b70f2b8499de6a3157c36bde125ab32c7bf4f80d1e6d880502ccfed2db704f3218a6f1f1ecbf603cc828e2a757c366b5
 DIST doctrine-2.6.1.tar.gz 554462 BLAKE2B 3481a1e7c8acfb0de5c4aa64aa32d583e8f01b2175b2957ec8aa0ae29c962e7482ae1d36217aa765fc38198dc851cbecb5e8ee24829f9e335ad4d18bec3bb1f5 SHA512 f2ca1df4a1da814a0047d2da76da0df64ef704e8f5b2464f2a546e61e615d40de9508c72543ae5574188882dd2a3917d8205ec194c63d7b264257443cdfd47c8
-EBUILD doctrine-1.2.5.ebuild 554 BLAKE2B 03013de408e92ee015d63b9e822c9d0d86a35283b4a8c956e8419c1110addb5cd80a7f00b773aa94865262879fe52317c6ca5d771307b3b2ebe0729310c80963 SHA512 dcc2d0fe9989f65594acac7e6434a7283e3ee508671af784a52ca7d288b6fe3387198ae5fa9ab1e054dad99f581e865f7471fecc371426d110f80dc062e30134
-EBUILD doctrine-2.4.6.ebuild 530 BLAKE2B 90907972a6eaaecf10d395ff3949698fca3d4241baced39c7a3454f501cc996ed300a614f9acd378559d2ed7cc4a4857b6daf614f54f3a6f68076d9ef2fe9bb1 SHA512 6061717df6e2855b3001c44ca31dcc5c2071fd349aedb0f58d03ff6f93c557a0d56018201e28fbd33b70427247602a05f0604f16258bd3aebd44f95192cf3a86
-EBUILD doctrine-2.6.1.ebuild 671 BLAKE2B 83913b194988708e0cfbc021979c287514cd41ee59a4bcc0f93be3259faff7cad40c34160e6fe97058cf93a141f265644a0f7d8b2964f3e4751356632499b0f0 SHA512 85b19e202a3d3d0d8a0c5ce0a09638f0e9df03e017023b23d5505a8b86f568ba7945dd0d4fd8440e6c8b6a21b8653273c8fd6311c486ce6d7ebf82d38a4a3120
+EBUILD doctrine-1.2.5.ebuild 555 BLAKE2B 1f4aca307534c7d6d1154fc072e8a41ee7784b616454caac7f7d76002fc441a6e9214c9a51a95e6c0c4f6530b1a1fa5d8f3fdd9ec29877e4e612a2899b105c79 SHA512 2fe2c0712b7591360e004d952deea9fd9946d027cf10e00ae2f180772c505d055a7e7bc9c1e7010c6af87196ac58a7dbd1387141a9eff8fe33cd933791fabc9b
+EBUILD doctrine-2.4.6.ebuild 531 BLAKE2B 7a4b5fbe31fd84083473455ce554f4f60252b383e517428a6c268e84c2646434ea5f933e38e9c2da17edc2206331da72d933874ece96f47a6a8df98315f58a0c SHA512 7d4f306bd2978ae62ca4b0d1746ea33d3bc5f39f01e031b352fc723e2ae77180a3ad7ddf7682f546ce6e0f38d1352ecec171d4cb2c7bc451f9d297868f8cca8f
+EBUILD doctrine-2.6.1.ebuild 672 BLAKE2B 288f877b15cf75273ce1de0df0d64030ff17f5a68da6ec74808ded7b1f98e8b6c42326b0be0285e5f21413b72a6091ccfe6427ca0fbe4e92b55c131680924c0d SHA512 67ac1a18dc3e145497acb0ac6e7ad95c7806d22feac227d7111cfaa2923d761594eb57daa731e2cfdbc86195dad17d469fa9881e703d5a2d041194ffb12e14ad
 MISC metadata.xml 332 BLAKE2B 34b5c4879dbbabaf08883df45cc3fbed8c8c9e4af84defb70af64a25863914320e637f2fe0d388c21066b55921edf68cec06d0fb24de4464bb785a63d7cdcc72 SHA512 44f05e8196f20572f12f8ced92fdc76a78198ada035dd4eff11d37fea991aefd35364b07beb3abb213b63c900e7b9ed2b3e23f4d32fa0680928a342e0a5df8db
diff --git a/dev-php/doctrine/doctrine-1.2.5.ebuild b/dev-php/doctrine/doctrine-1.2.5.ebuild
index 30e0303f6c6a..bf2faae0288f 100644
--- a/dev-php/doctrine/doctrine-1.2.5.ebuild
+++ b/dev-php/doctrine/doctrine-1.2.5.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
 MY_P="${PN}1-${PV}"
 DESCRIPTION="An object relational mapper for PHP5"
-HOMEPAGE="http://www.doctrine-project.org/"
+HOMEPAGE="https://www.doctrine-project.org/"
 SRC_URI="https://github.com/${PN}/${PN}1/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1 MIT BSD"
diff --git a/dev-php/doctrine/doctrine-2.4.6.ebuild b/dev-php/doctrine/doctrine-2.4.6.ebuild
index c2ea8a6947ba..5184f5a1812f 100644
--- a/dev-php/doctrine/doctrine-2.4.6.ebuild
+++ b/dev-php/doctrine/doctrine-2.4.6.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
 MY_P="${PN}2-${PV}"
 DESCRIPTION="An object relational mapper for PHP5"
-HOMEPAGE="http://www.doctrine-project.org/"
+HOMEPAGE="https://www.doctrine-project.org/"
 SRC_URI="https://github.com/${PN}/${PN}2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1 MIT BSD"
diff --git a/dev-php/doctrine/doctrine-2.6.1.ebuild b/dev-php/doctrine/doctrine-2.6.1.ebuild
index c716c1274c2c..edd7e6575055 100644
--- a/dev-php/doctrine/doctrine-2.6.1.ebuild
+++ b/dev-php/doctrine/doctrine-2.6.1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 MY_P="${PN}2-${PV}"
 DESCRIPTION="An object relational mapper for PHP"
-HOMEPAGE="http://www.doctrine-project.org/"
+HOMEPAGE="https://www.doctrine-project.org/"
 SRC_URI="https://github.com/${PN}/${PN}2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-php/phing/Manifest b/dev-php/phing/Manifest
index 0a467d51d83c..f46f095785ac 100644
--- a/dev-php/phing/Manifest
+++ b/dev-php/phing/Manifest
@@ -1,4 +1,4 @@
 AUX autoload.php 418 BLAKE2B 8999ecee030a7d3eab49102bea8bf3aedff8c0e35021947279fee65ed9c0fa2f6bdc923a5e48437f314623cfed7545b3f4e30e8eb19610091c13a897c93278ca SHA512 81a22775a38d08e681e0f0a97fd6f125065be86fb491894f397cb25cc8240a7038b6cf061c77cc0c4837cc5a68aef909fe3a94ae84165a5f358050fac0164cd1
 DIST phing-2.16.1.tgz 4149013 BLAKE2B 266c124237d437361e9e18a42c9358fc18cfacfaa798a3a92a31858b7c1af847cde2cac43e0fcfe3759e8291639de9ec564f977fe00939316dbacdfd266e4e92 SHA512 e0832396dac9fbd43680f01acfa55f3ed2819726ace1db4ec9addf18c9c023c4f63143c6a63bbe1b16c2bd19dba54f503efdc77d772a3239bc8f9efe0ab375bb
-EBUILD phing-2.16.1.ebuild 1550 BLAKE2B 7a9530d3c029429b13f055a271f26e57424d12dbacf10362d44ba2f35515d0ef74339d30ff155c5d5861595c4d34404d8a34df1429ef805cedaf9ebfafd516f6 SHA512 91510f112880ede6bda907181bd21b5ba79457b9f006448e8faa6bca4fad0bd8700d0e37dbdab5df2264aed5f665f8a6e197b3ee7debaebcbe2a9ce66eaaf53b
+EBUILD phing-2.16.1.ebuild 1552 BLAKE2B 4ebbe638f537094ae2fc898f9fa9f3d1d6fa3955a4b0ba7f2da50cf03efc24e42917ccb02caed1855858ea8dea7885a0e5b7142848c42cec3cd35cfcc1842cbd SHA512 3e10a755f846b85b70e405839537c237c373b4c1a3428157077d2621ce023e4d0d59573e81d706a8cf85e505329b7511153bbc8e92292b7475db813a5ca55773
 MISC metadata.xml 471 BLAKE2B eed7a2c37fef52fce309821dbeb3dd30276d438cdd3b00b709b8fd5c5814f2e25c48465eaa1abd7aef190f3a3b1c502be1066e6b8479761001c71ffd94f91999 SHA512 a0b77b3717c96c2aa8807f967c5c5a61dbcaa543ac7467a6f36bfdb9a74897b975d543ea2515180718cd016d7ec72989e985ce45c87cec04923f9226a2c97254
diff --git a/dev-php/phing/phing-2.16.1.ebuild b/dev-php/phing/phing-2.16.1.ebuild
index 5fda22fb029e..30583fdb8fe3 100644
--- a/dev-php/phing/phing-2.16.1.ebuild
+++ b/dev-php/phing/phing-2.16.1.ebuild
@@ -4,8 +4,8 @@
 EAPI=6
 
 DESCRIPTION="PHP project build system based on Apache Ant"
-HOMEPAGE="http://www.phing.info/"
-SRC_URI="http://www.phing.info/get/${P}.tgz"
+HOMEPAGE="https://www.phing.info/"
+SRC_URI="https://www.phing.info/get/${P}.tgz"
 
 LICENSE="FDL-1.3 LGPL-2.1"
 SLOT="0"
diff --git a/dev-php/smarty/Manifest b/dev-php/smarty/Manifest
index 07d0ade03f8e..4aeea542c64d 100644
--- a/dev-php/smarty/Manifest
+++ b/dev-php/smarty/Manifest
@@ -2,7 +2,7 @@ DIST manual-en.3.1.14.zip 408414 BLAKE2B 03d4e7a386eb3bd5b19e5c555ec34b86812838a
 DIST smarty-3.1.30.tar.gz 255464 BLAKE2B 8378e6336f271e3c41e16b8fbb70356827ff4a9a61e3cf2a23fdbd0617155ec9dca6a5b6372327d4b35a5c6f7c3b58e807afe7403b7ed929ebacfb3c36e124d0 SHA512 6ad9a6cf10b81fecbdc4daa4acbd9724db5f1c2a014e35039b36b0bf00ba000946a2126f7da5899e587a79419f451aafcd1ee14597a32cf290bbd0bf13a877d0
 DIST smarty-3.1.31.tar.gz 244196 BLAKE2B 695bd40d337e8f2d4a44a7b30b743ab4e5b6a7b024a514de956cd513dd6639ac6f9ae464f0d3b4cfcaf7de17994837a866cdd4945780bd3a96ff32df300302a3 SHA512 807343e4229413ea0f5219a828d4e91603fb5454f4abe8aa2d41f0a6fe32fa476e791340e1e95178ded3774d1524e98489c104c6fa391e70a8225de28fdcca18
 DIST smarty-3.1.32.tar.gz 250680 BLAKE2B 92d4942f2d3d802b18082f5f6079c8b6945abadd8ef2c87ea217b106eeeedfbde7f1bd00c6fced67b73fc3cf328ec91fc1fb61c7f991b992167fa9d2fb1f2ad2 SHA512 07c95177172718158b9b562c6d8ff79566f4bd8e07ba394cc82c52dec7ec869935fd03ce523115c08472159adf68b902d1db5f8543201a35adf22027c5978080
-EBUILD smarty-3.1.30.ebuild 1329 BLAKE2B daf072ce974a2c555f63513608900b2065191cf7d95871ad09fa9b623e15fa5d21a4fc87f1ba8e8cf3dbc700632fb6fb3bca32586d5ebc7f98484da6f128a7cd SHA512 44dc07bf8992493879cfc7a343c8dc2b41d64d75121d3e8cfeeabd0b10e57bb04ba7fde15fc067dbfeb276d39c835007cca114152d7d6ba4538c59bc19203e8e
-EBUILD smarty-3.1.31.ebuild 1337 BLAKE2B 829ce42871c7a271301ba3fe16fa84db9bae6dce4ba499948074459e20f7658039770c27712f82a497dd0520957262dc8e2cc7c404cd0979af5f1bc843f2a181 SHA512 8f678139dc0899166b13c2c1a860dadddb4d79fb29cdb9e8bbb4a2feb0a417526772d5fe3a7e4db4185a0a07ffb36191116c2bfdfb780ec483b22e225acc71e0
-EBUILD smarty-3.1.32.ebuild 1337 BLAKE2B 46f304fcadd8eaceaf8f3d92a4ae4a8041ff68870fd6f21f029ec0b2b20657aea27eed71ab45f77b3da5f340f9baebd851edbfe09323bf9b0276c8d35deabb10 SHA512 85faa8feb80bfd0598bb43f53ece923563cc56ab3d733fa66f8e5147759069d69ae1ac180a9e47a30d41645c5301e7a842a363d49681a3a83e1975d7657a9ffe
+EBUILD smarty-3.1.30.ebuild 1331 BLAKE2B 59393ee7db8482c6af06ce4430e638ce02ca1ea3f9dbc1264f867bd94aa5b55a3b9321f90f6fc4a1a8c9e7c6bfdeb64342b67e2117e1b3b5586258d8b692bb22 SHA512 e79707cc1e841806d654a597c7b7c2e0e3465a5bd6354652247d6e697bf8e6b3727ff52cf441aa72abb470d0ff1c325526489e3169062ee537ca80b98685e7dd
+EBUILD smarty-3.1.31.ebuild 1339 BLAKE2B b64063186aaac934f8604f67ebe1b53cf171d024db96388eac4950508ec9278f3f85e61df1147bb395ea9d84447281860e2d9994a21d06de36ec59d26900c228 SHA512 fb0c063f295956b275023751ca12cdc7110de17430214a42020840221697892ffc5045f16fa09cbd4b19b409188e9607adcf640f824c668395e8b62d560d7b1e
+EBUILD smarty-3.1.32.ebuild 1339 BLAKE2B b64063186aaac934f8604f67ebe1b53cf171d024db96388eac4950508ec9278f3f85e61df1147bb395ea9d84447281860e2d9994a21d06de36ec59d26900c228 SHA512 fb0c063f295956b275023751ca12cdc7110de17430214a42020840221697892ffc5045f16fa09cbd4b19b409188e9607adcf640f824c668395e8b62d560d7b1e
 MISC metadata.xml 581 BLAKE2B c8e02efefe221a4cea961b32c448d3a69f2dbec795a1a012c727777dfc4a448fd0bb23816564843f0a3fe6eb67453175ee84417e7ffe0e72aa48f8f131b72aaa SHA512 1bf0fea8d62a06b1b67ee417eeb44dbb476ba590b35808f7c7bc1b40a6758b2c3f931e8290c2908a14828f8e2789eb8e2c6d5a26e106f97359f45a476fd31401
diff --git a/dev-php/smarty/smarty-3.1.30.ebuild b/dev-php/smarty/smarty-3.1.30.ebuild
index 77b161474216..8d68f8465a42 100644
--- a/dev-php/smarty/smarty-3.1.30.ebuild
+++ b/dev-php/smarty/smarty-3.1.30.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,9 +6,9 @@ EAPI=6
 DOC_PV="3.1.14"
 
 DESCRIPTION="A template engine for PHP"
-HOMEPAGE="http://www.smarty.net/"
+HOMEPAGE="https://www.smarty.net/"
 SRC_URI="https://github.com/smarty-php/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	doc? ( http://www.smarty.net/files/docs/manual-en.${DOC_PV}.zip )"
+	doc? ( https://www.smarty.net/files/docs/manual-en.${DOC_PV}.zip )"
 
 LICENSE="LGPL-3"
 SLOT="0"
diff --git a/dev-php/smarty/smarty-3.1.31.ebuild b/dev-php/smarty/smarty-3.1.31.ebuild
index d0f0c4c87fc3..c1b265f15ead 100644
--- a/dev-php/smarty/smarty-3.1.31.ebuild
+++ b/dev-php/smarty/smarty-3.1.31.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,9 +6,9 @@ EAPI=6
 DOC_PV="3.1.14"
 
 DESCRIPTION="A template engine for PHP"
-HOMEPAGE="http://www.smarty.net/"
+HOMEPAGE="https://www.smarty.net/"
 SRC_URI="https://github.com/smarty-php/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	doc? ( http://www.smarty.net/files/docs/manual-en.${DOC_PV}.zip )"
+	doc? ( https://www.smarty.net/files/docs/manual-en.${DOC_PV}.zip )"
 
 LICENSE="LGPL-3"
 SLOT="0"
diff --git a/dev-php/smarty/smarty-3.1.32.ebuild b/dev-php/smarty/smarty-3.1.32.ebuild
index d1a7a62bef98..c1b265f15ead 100644
--- a/dev-php/smarty/smarty-3.1.32.ebuild
+++ b/dev-php/smarty/smarty-3.1.32.ebuild
@@ -6,9 +6,9 @@ EAPI=6
 DOC_PV="3.1.14"
 
 DESCRIPTION="A template engine for PHP"
-HOMEPAGE="http://www.smarty.net/"
+HOMEPAGE="https://www.smarty.net/"
 SRC_URI="https://github.com/smarty-php/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	doc? ( http://www.smarty.net/files/docs/manual-en.${DOC_PV}.zip )"
+	doc? ( https://www.smarty.net/files/docs/manual-en.${DOC_PV}.zip )"
 
 LICENSE="LGPL-3"
 SLOT="0"
diff --git a/dev-php/suhosin/Manifest b/dev-php/suhosin/Manifest
index 2ebf3d1b9b5d..489e1ffd4a84 100644
--- a/dev-php/suhosin/Manifest
+++ b/dev-php/suhosin/Manifest
@@ -1,4 +1,4 @@
 AUX suhosin-0.9.38-libcrypt.patch 590 BLAKE2B db02346c66f348fd0be16fea1647deb1a6e44c2b10077f410ab919e7800e160439780d7b1c807f455cd3efb115765288c869cd96d719f4315150edfd73693085 SHA512 fa834f26803e2f623a269bc1cc81e305e081397717e0058315cac8087f04c33ff7f2eeee2052dada75559e5b35dc85c55499d74635dacd0f08fcc226ec3d0de3
 DIST suhosin-0.9.38.tar.gz 122800 BLAKE2B e016091e370bbcfdaad91d10858541cd730951be1032e95b4d372b5a77fce719e300cfa0638bf3ebde68e91d76b95c94ca56ce239997da69fc7ce5068b26ab49 SHA512 cc4eb38b5d6673cc3f2dc395e5a8b5461d3221019ac9849b747b6d5bae423cd5bd01a75b9432414dc7c26c78bab9f2381a5414712a6906a999f3ec9dc77ebc45
-EBUILD suhosin-0.9.38-r1.ebuild 1328 BLAKE2B 8867b930e6b24687e68351494f456e130ebc24d1bcc3a7adb66695eedb722f76c3e3716d4ecd5b40cc2c6246e52d70255dbf7a33b0fd2c9ead04a427871d68ac SHA512 1c52f907a7653564ee353c7aa942a3583208205f174bd802c54bbac5976569a6090c5c796c34ca10fef99f3f6206ff3ae4958e9d33df18840ae5d4e50c21909c
+EBUILD suhosin-0.9.38-r1.ebuild 1330 BLAKE2B bee0345e89d02138a9d79b5c91cf4c75fad99626e42a503034c2047910bf96f00941a066518633e4c84f6cede39bff9fe3414ede6c38ceb3dcec944b75e68058 SHA512 79341927c5c6351514d9ef257be38884c27beab3a91b3d873d52b2b1c34b6977296a499fc226c0b3ecbe5b7ef49d1d3f1e5f00acd834d1372babca6b7f9ef53f
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/suhosin/suhosin-0.9.38-r1.ebuild b/dev-php/suhosin/suhosin-0.9.38-r1.ebuild
index 226549ab6ffe..3372f3abe755 100644
--- a/dev-php/suhosin/suhosin-0.9.38-r1.ebuild
+++ b/dev-php/suhosin/suhosin-0.9.38-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -13,8 +13,8 @@ inherit php-ext-source-r3
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 
 DESCRIPTION="Suhosin is an advanced protection system for PHP installations"
-HOMEPAGE="http://www.suhosin.org/"
-SRC_URI="http://download.suhosin.org/${P}.tar.gz"
+HOMEPAGE="https://www.suhosin.org/"
+SRC_URI="https://download.suhosin.org/${P}.tar.gz"
 LICENSE="PHP-3.01"
 SLOT="0"
 IUSE=""