gentoo resync : 03.11.2018

18 files changed, 167 insertions, 26 deletions

diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index 1bd33eef39ba..75b4abcaffbe 100644
--- a/dev-php/Manifest.gz
+++ b/dev-php/Manifest.gz
diff --git a/dev-php/PEAR-Console_Table/Manifest b/dev-php/PEAR-Console_Table/Manifest
index 8082f561e2c0..85c422abcdb6 100644
--- a/dev-php/PEAR-Console_Table/Manifest
+++ b/dev-php/PEAR-Console_Table/Manifest
@@ -1,3 +1,5 @@
 DIST Console_Table-1.3.0.tgz 11391 BLAKE2B 25cbb72f2fa23026320840eb3e3b85f08dfc6a90ae9a613ec3e7251b407fc971c0a8aad3ac6bccbb9cd99066aca30249373539b8758fed58b0d1fc53898fc71b SHA512 83227ce8e55ae38cdf91b7097879a3406898064d1c047c5a94c6cadc46cbeeea51c43d135e6aadfbdb38fa080a1b27a1d4cea1c36ff9eb3e14dc4b04de334c11
+DIST Console_Table-1.3.1.tgz 11492 BLAKE2B bff94b2ae1b6d23eaf9a60deee4e78ee3467eff9d53c1d6ac8330347647b54700d4b3cf30be84c071afc34a4517b3135f6b18011418ea5dfc0e2841da1a30874 SHA512 abac68c20bb670b29f405625edff0330ce5af51763a50ee7482c3ab9d39c7335134d77c0f1a94ce4914c2f454d493a685841e07628eb2aa58cc66617521b6a65
 EBUILD PEAR-Console_Table-1.3.0-r1.ebuild 390 BLAKE2B 1e6b4a96a56fd39abc2fa6c4f5c4019febb0eb66e0f9682b8d17185a1984b1708000954a3b6cea049fa667c261790ffc18bfeeba4ba03595386572ed8581c4f5 SHA512 b98c6d04e5ade6bcb5622c78b9909d7703c754eee25b945d58cb172efa713efe0c380b7daca3cf35ff105dc5a521cba2f00342e1aab13e7b942b391a3e298605
+EBUILD PEAR-Console_Table-1.3.1.ebuild 492 BLAKE2B 27786247992c3f49c0bc2506c899c08d526d1327f6616c7acb6fd32dcfad6a4ab8b2bfc273f7eab0adac13a71283ce76b6e4a45fa2e6f4f1f57fb39a1ff552af SHA512 8adda02e118a1097aa4356ee5fdfb37805552a169183a1a9096bc8f16b746ac3900594bb5e40686db0addc64e833a3657be043a0f50bd8b271f9c1085e707b13
 MISC metadata.xml 315 BLAKE2B 82168e43ddcd8fbbff59b6a83fab3b4abbf540c4c486819da9ccf39b282f4b45c2bab6bedc97bcbcaae1656fd2fd1ebcee0d43b7ae0f5021eaa9767460a75dfc SHA512 8fdf28a135ca48c1d377bd355924214fbad506e853a6e9c85ba1956ea587e84bdcecb21aee700cff77031b37945a0143bbe98ea55e226934d6a7119ba367265b
diff --git a/dev-php/PEAR-Console_Table/PEAR-Console_Table-1.3.1.ebuild b/dev-php/PEAR-Console_Table/PEAR-Console_Table-1.3.1.ebuild
new file mode 100644
index 000000000000..b49bca76c897
--- /dev/null
+++ b/dev-php/PEAR-Console_Table/PEAR-Console_Table-1.3.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit php-pear-r2
+
+DESCRIPTION="Class that makes it easy to build console style tables"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+BDEPEND="test? ( dev-php/pear )"
+
+src_install() {
+	insinto /usr/share/php/Console
+	doins Table.php
+	php-pear-r2_install_packagexml
+}
+
+src_test() {
+	pear run-tests tests || die "Tests failed"
+}
diff --git a/dev-php/PEAR-Net_IPv6/Manifest b/dev-php/PEAR-Net_IPv6/Manifest
index 72a9fa4ac1d5..a46ad8c8911c 100644
--- a/dev-php/PEAR-Net_IPv6/Manifest
+++ b/dev-php/PEAR-Net_IPv6/Manifest
@@ -1,3 +1,3 @@
-DIST Net_IPv6-1.3.0b3.tgz 11030 BLAKE2B aefeac440451ea3a37c84dcbae52d9d068bed57d0e2e113683b48414b31d9d77bb28ab2fe89d482e377fbe987411ba836e65ffb00c91eb5060bd5d4945c899dc SHA512 77d30c18c00aa03207b58dc7e54553e4cb3f424dcc831c67ab1081cfbc0dee121998866e995bf0e0029e9de1a6e28acb57aed63c837e894beb6cf4a5d3f39231
-EBUILD PEAR-Net_IPv6-1.3.0_beta3.ebuild 390 BLAKE2B 3073333acebe97df33d864d7677e76653466733fd7dc5f2d54ab7298b9d8bf8c9bd28d8787b1bc381578777150b67eb1cc57710c82aff34e56bcfed1c1e762b7 SHA512 8c904528531141c83c72b4a84c25e15158fd71947d8bf4c2811e0fd5236d3f17cd1edbf88a3e37002d6aaa14096a29687bc4e931b8cc5f9c083bc1d15e7e4ac3
+DIST Net_IPv6-1.3.0b4.tgz 11437 BLAKE2B 535bb88e650e0985ef18e9415c1be827798d28fe30cae8afa7bf352d3a30e0ac51499662925e2c389e04bf872d240651d671c94a25584df9f3537db4d4695646 SHA512 aabf31e062ff4b3994ec8f5278556ff7e06c01b0cc86de2e57f4a994c71a182663e720a33b312d7e2874008c04ac9c493bb855b9b7ee5d0f008d5c517cb11fbc
+EBUILD PEAR-Net_IPv6-1.3.0_beta4.ebuild 395 BLAKE2B 1796424cb09497330bc537a644ad69813fbdf82dbeaa58a8643d4c65643a0a3e7de50094ad20700033673a471eef0860ce241f7f67e1e8816bd6ab10a38d7559 SHA512 3caed4bfe7a539aa750b95062710c3de95665f2c82d41d54ff2d8715f78a0a178e1933cc65454740c26eacac8cf44889b7cfa52ef61d7b5a9191e661bb2c5827
 MISC metadata.xml 310 BLAKE2B 1c437565e34cf4adbe817fee0039663e05c7e81dd2da8f133650503320040b0878e769bdf6c2ca010384c67fd6af547a9a7665cc15a6ee98caf0dc066ee0f920 SHA512 910fafc59d42416e896901f965523d543520e1967b24d90a54e84b7c9f7d5b8a46e02fe571c67d96a606361dbeb1952f82804ab90e9311de3fa7b7313776bfc6
diff --git a/dev-php/PEAR-Net_IPv6/PEAR-Net_IPv6-1.3.0_beta3.ebuild b/dev-php/PEAR-Net_IPv6/PEAR-Net_IPv6-1.3.0_beta4.ebuild
index 8c14b64e0406..7c48ab81b3ca 100644
--- a/dev-php/PEAR-Net_IPv6/PEAR-Net_IPv6-1.3.0_beta3.ebuild
+++ b/dev-php/PEAR-Net_IPv6/PEAR-Net_IPv6-1.3.0_beta4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PEAR_PV="${PV/_beta/b}"
 
@@ -9,12 +9,12 @@ inherit php-pear-r2
 
 DESCRIPTION="PEAR class for IP v6 calculations"
 
-LICENSE="PHP-3.01"
+LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
 
-DEPEND="test? ( dev-php/phpunit )"
+BDEPEND="test? ( dev-php/phpunit ${RDEPEND})"
 
 src_test() {
 	phpunit "--include-path=${S}" "${S}/tests/AllTests.php" || die
diff --git a/dev-php/PEAR-Net_SMTP/Manifest b/dev-php/PEAR-Net_SMTP/Manifest
index 85d9360075e7..023d53913ac7 100644
--- a/dev-php/PEAR-Net_SMTP/Manifest
+++ b/dev-php/PEAR-Net_SMTP/Manifest
@@ -1,5 +1,7 @@
 DIST Net_SMTP-1.7.2.tgz 14795 BLAKE2B e7be5c595e5eb9cd98c0cb82899545b02399ce3aedd35e419a451ad1aa3f4c3c36a10c212508795bc39a044c99206db5ad700f6e7c110eec3b68cb623af4e457 SHA512 06ab00a033709c5f4adc01fabe100ee0033b07e1c5633f995a672bf463484622a5bd976ada9932ee741ff593d739bd1172566f0a8446060bbccde71ea5b0160d
 DIST Net_SMTP-1.7.3.tgz 14855 BLAKE2B b6891196a6871adc3936c89507e3aef1f7d9af045acab09aba5f145a9d1e1da5cee2608873f7a42ebc1d00f99ec733823afe94e15c283245ed1bc035858d94a7 SHA512 b1c2be95c50151e91c2dcc7b9d98233504cc2389c01e4e42e752cba606355da616e570ca86042b68498aad63aaad14ea048b0a0e4e2baa802dc58c440eb60f15
+DIST Net_SMTP-1.8.1.tgz 14931 BLAKE2B 9194e46d1987e48f58c3b851bf6921b4308d39d17b7ca028a4a58a6583171dbe31020477cd7f808ac72ffae81f315e3b416cd5f52e898e0d12cc802af5dbcaa7 SHA512 ba3b68e35d95cc41ef33105402348a322e54c6335d819d1a6e1264f25bc30def4485d0da34901ca203ccd591aeddffbe75b5acb11fb7415a1a13668198aa9942
 EBUILD PEAR-Net_SMTP-1.7.2-r3.ebuild 691 BLAKE2B d703b969fae98d38de638b56474188d211497c5c8b150c45650ac91e41d9fc83e3096f7b9650f464b2f415bbf6a2aaef3abad8cabdd51c7bb44a1de595206c77 SHA512 9db4278e3ba613e790653c561658db1159ababac4cd98ef4cdf05b643e77cd3bce515647ddd9ccd7540870c52fb18c7733e4e985c8552a9cb100eb398194fe94
 EBUILD PEAR-Net_SMTP-1.7.3.ebuild 700 BLAKE2B f5a783bf29c32267a09abd564b08a2c69592b4de6f3662b13db212a2d76b11052a24e806ca362417bf699bde87a213e78fdba9af361838de5e9cb504d707fd6b SHA512 cb2c1d5c34fc29083a4d443a027d327a1e77a3e2931d2ad869168d7c23c1478936e0ea3f57de7fc4a953debeae4686672b37f5387ba8c4644b683ea94f1f72f5
+EBUILD PEAR-Net_SMTP-1.8.1.ebuild 650 BLAKE2B 0b0fa0cae7f41698fa644939d340dabeb88f6f0a35ba35d7e3ea5363f446ea5484fd1e548c25dfbb06a72c13330ffeef90b24232b6c33adfbd4a74d5c50104ec SHA512 8d626c2f92236c129a742910bd59460977ba0bd94470c348f57cf3ecfbf6b2a21daa2c6d9210c0afe3e711e495e3372b9d75609046c183ad05ad775895408b5a
 MISC metadata.xml 375 BLAKE2B 278d413ce672aa49e6f7fa3af6743d10e859cc37d4d38907fd96fe6011b68db3f5065694f6d3dd2bf179481cb729088e7e2e55c6a326d992c85463b703561749 SHA512 458638cbc2f1289c26d7c67a7d8d99fd33f7b139513470bb48f5371c9a3842f8ff9db41460e3e38eee7049f7a3c2ce54a66f919ece83d9323dbed37b8ef5f7a4
diff --git a/dev-php/PEAR-Net_SMTP/PEAR-Net_SMTP-1.8.1.ebuild b/dev-php/PEAR-Net_SMTP/PEAR-Net_SMTP-1.8.1.ebuild
new file mode 100644
index 000000000000..e73ba70c1876
--- /dev/null
+++ b/dev-php/PEAR-Net_SMTP/PEAR-Net_SMTP-1.8.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit php-pear-r2
+
+MY_PN="${PN/PEAR-/}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A PHP implementation of the SMTP protocol"
+HOMEPAGE="http://pear.php.net/package/Net_SMTP"
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="examples sasl"
+DEPEND=""
+RDEPEND="dev-lang/php:*
+	dev-php/PEAR-Net_Socket
+	dev-php/PEAR-PEAR
+	sasl? ( dev-php/PEAR-Auth_SASL )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	DOCS=( docs/guide.txt )
+	use examples && HTML_DOCS=( examples )
+	php-pear-r2_src_install
+}
diff --git a/dev-php/PHPMailer/Manifest b/dev-php/PHPMailer/Manifest
index 2596bd565cd5..94152aa689f6 100644
--- a/dev-php/PHPMailer/Manifest
+++ b/dev-php/PHPMailer/Manifest
@@ -1,3 +1,5 @@
 DIST PHPMailer-5.2.26.tar.gz 159174 BLAKE2B 989ee85f6ca374bd7f4accf3d18fbd173bbbd3176e6846c9a2aec68f3bfca4ead4e0197f6287e2bc8ed4a125bf7fcb53240a1f8ce6a1813eaffb66067c2c4e9e SHA512 4c3e324ecd1dd23eb40f14ee785fb9b353b742ff4fb26fe0586622038157e60d64560f5ba4a625f16fad6568954d685ebbe436d88bc427d5bd260c056815b656
+DIST PHPMailer-6.0.5.tar.gz 88092 BLAKE2B 0b2113b54d547d788c54cbcf18fe134a6b08f6b9eabcbad308a7d0bba8e95426fd8be77419419cbe0379be080350a1caf1690cbe3f096c178cc3a8c9506d9529 SHA512 5b18700ef26fe5de20a7ca291ece44b897182c603ed8187e0f711099325b35b20f8dbab2c456eaac1338731356661237d9b249c2f40051807b0d58ead612013c
 EBUILD PHPMailer-5.2.26-r2.ebuild 1960 BLAKE2B 7bb0a7ea8e71c6bff9cc37972f0e62b5e71184707da7f7543d8fa5578ecb090ce8be4086ad2abb55675ec3647435e2559cd0acc84e4fd0cc5bbb12e1fd290668 SHA512 2c147dd3d6c8ecefd05716a8767fb45e373af2845adf7a2d18bc894374f78fedeff614addd829f0137d9dc6bfd40059548068cac8af82e9c25b1cec839fea746
+EBUILD PHPMailer-6.0.5.ebuild 2216 BLAKE2B 9c5283ddeffb1ab3fd93782251d78bc593d0905e623e5c7babd34e2b82f44ecbec61d5d3f7faae4822fad8e891940f3c6792498434cca5ec6a443f63cb87e76f SHA512 d3b4191b3facd821c13527fb7c8b73f89368e87ce7bb41c8e102e66414cbaa3b897b1603b8e3cbb2b22d6d7193ce5c16a8b24765062a8fdf332b5edf72dc08a1
 MISC metadata.xml 446 BLAKE2B 178ea98081e664641c7a8632a1c7dac9b5cac8992b0b945208f5ef654633340daced2473bbdc342b70d8b168ac2206ba132f7ab9601f61b5436f3eb3e0441ca1 SHA512 3dfce858cb0e00b526f04a5764a6173d4711db4f21f52b6d827b82f1cddea4e33f533e645dae95d0bb6a69699b00520a414f2e322c76b56aee1e4ea047bb4bb5
diff --git a/dev-php/PHPMailer/PHPMailer-6.0.5.ebuild b/dev-php/PHPMailer/PHPMailer-6.0.5.ebuild
new file mode 100644
index 000000000000..99907db766fb
--- /dev/null
+++ b/dev-php/PHPMailer/PHPMailer-6.0.5.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Full-featured email creation and transfer class for PHP"
+HOMEPAGE="https://github.com/PHPMailer/PHPMailer"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# To help out the Composer children, the tests and examples are missing
+# from the release tarballs.
+IUSE="doc idn ssl"
+
+# The ctype and filter extensions get used unconditionally, with no
+# fallback and no "extension missing" exception. All of the other
+# extensions are technically optional, depending on how you use
+# PHPMailer and whether or not you're willing to settle for fallback
+# implementations.
+#
+# The insane dependency string is to prevent the ctype and filter
+# extensions from being provided by one version (i.e. slot) of PHP,
+# while intl and unicode are provided by another.
+RDEPEND="
+	ssl? (
+		idn?  ( dev-lang/php:*[ctype,filter,intl,ssl,unicode] )
+		!idn? ( dev-lang/php:*[ctype,filter,ssl] )
+	)
+	!ssl? (
+		idn?  ( dev-lang/php:*[ctype,filter,intl,unicode] )
+		!idn? ( dev-lang/php:*[ctype,filter] )
+	)"
+BDEPEND="doc? ( dev-php/phpDocumentor )"
+
+src_prepare() {
+	# OAuth.php relies on a (now non-nonexistent) autoloader. We remove
+	# it early so that we don't generate documentation for it later on.
+	rm src/OAuth.php || die 'failed to remove src/OAuth.php'
+	eapply_user
+}
+
+src_compile(){
+	if use doc; then
+		phpdoc --filename="src/*.php" \
+			   --target="./html" \
+			   --cache-folder="${T}" \
+			   --title="${PN}" \
+			   --sourcecode \
+			   --force \
+			   --progressbar \
+			   || die "failed to generate API documentation"
+	fi
+}
+
+src_install(){
+	# The PHPMailer class loads its language files
+	# using a relative path, so we need to keep the "src" here.
+	insinto "/usr/share/php/${PN}"
+	doins -r language src
+
+	dodoc README.md SECURITY.md
+	use doc && dodoc -r html/*
+}
+
+pkg_postinst(){
+	elog "${PN} has been installed in /usr/share/php/${PN}/."
+	elog "Upstream no longer provides an autoloader, so you will need"
+	elog "to include each source file (for example: PHPMailer.php,"
+	elog "Exception.php,...) that you need."
+}
diff --git a/dev-php/SabreAMF/Manifest b/dev-php/SabreAMF/Manifest
index 3e94a08e6482..3f8680182542 100644
--- a/dev-php/SabreAMF/Manifest
+++ b/dev-php/SabreAMF/Manifest
@@ -1,3 +1,4 @@
-DIST SabreAMF-1.3.234_p0.tar.gz 82526 BLAKE2B 9c6726db4d7920ed202014de803e755a481bb49addce8035533b8b9507f6cff40bd18d1a27e812084518748edf36d7d1b2ae5460e7414cec59e7bbf142428514 SHA512 4aef460300d6af925b228ec9fbde635851ec42ac3c9920165df4175b7e7de2d0bc9225bda869c095b8751d7e7f39ecb20866e8a9190df4c728c37f7de60ec4cc
-EBUILD SabreAMF-1.3.234_p0.ebuild 666 BLAKE2B 22393a2e2f8fc1f169d07bd60b5afb958b50ed14b9c19aa28e7b6f3dab28731f2139ff3f288827f687b5bec7fbbc5cc8dc8bf2e8d90ae556fd3156d978dcfd82 SHA512 c3cf97cbeb0c6eaa81783b4c57afa97712239cd157bcdb5fbdbf3fd7e9afac450bbb3664a9dbdc19bfd53fc40666ed93f45401147d52cfe3c84064ce8ca62037
+AUX autoload.php 236 BLAKE2B 3d91e2d8a6103438262ca06aa8f1821cccce8edf4bfbe0007b2468e37ab0546284929fd91e8ea665636e6dd1b793508f55a2aacb9cf6bb653d650dd237621088 SHA512 f2a9c8e16ea3aaa4cbc1edfc7876a9ffe3e87a78a66a490d56093158f99ba5d15413ecd0f22344385d24b6da40c5ff5c1061f835193483fa43d3e11a325845de
+DIST SabreAMF-1.5.0.tar.gz 83408 BLAKE2B 2df210f9a42e00de0adfac94ff9b89ccc918796c79e7df5602ba71bf8cf44ebea7374557d1062e1f95c9578cc95451daf36986e98042f2bdcb17e43581096cfe SHA512 4c0eead7f3adb64001cb4f40f680ade4cd0259d8b24d57970081e19447a69269753c5c5adecef327ba3a9f0cb2c14ff05575c289694bee752007f03e14af4d0f
+EBUILD SabreAMF-1.5.0.ebuild 680 BLAKE2B e0b7b4989d716a7bdfb517308c92c85e3b182172231f8bc12ce9add1576fd0a01ae10104ae9da8062a9fae19a86d18580a8faa07a6e23f5c25b35d9bb3309d2d SHA512 9faa7c162ccee4d60952e403602512cc9c2782d70599c5af4d0faa7c1be57ba16b95752ef7d1931109bf90e6d862566d9bad3d58c1d53fb2768179947d7ab168
 MISC metadata.xml 318 BLAKE2B d4d80e308bc8a9f06155aff1e51a13199d16e706ede69ffe8a1fd1e7b576b616a3ed4b416ecacc599e2d2c04eace343de0a766e37f1a152ee02e88ad4846d080 SHA512 0e738941b2ec5b9ab2c948dfbeaeb6f66391069058668e580701ac1302b39f8cd65463712ca861d7eb45ba3929e288cb73a1c032c3d77efe73f7dc6134305bc3
diff --git a/dev-php/SabreAMF/SabreAMF-1.3.234_p0.ebuild b/dev-php/SabreAMF/SabreAMF-1.5.0.ebuild
index 31b973862c36..ce985ece45a7 100644
--- a/dev-php/SabreAMF/SabreAMF-1.3.234_p0.ebuild
+++ b/dev-php/SabreAMF/SabreAMF-1.5.0.ebuild
@@ -1,25 +1,25 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
-
-inherit vcs-snapshot
+EAPI="7"
 
 KEYWORDS="~amd64 ~x86"
 
 DESCRIPTION="SabreAMF is a Flash Remoting server and client for PHP"
-HOMEPAGE="https://github.com/evert/${PN}"
-SRC_URI="https://github.com/evert/${PN}/archive/e5521c27e9309404d7505e1e16db843fcb2202ec.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/evert/SabreAMF"
+SRC_URI="https://github.com/evert/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
 IUSE="examples"
 
-DOCS=( README ChangeLog )
+RDEPEND="dev-php/fedora-autoloader"
+
+DOCS=( README.md ChangeLog )
 
 src_install() {
 	insinto /usr/share/php/${PN}
-	doins -r ${PN}/*
+	doins -r lib/${PN}/* "${FILESDIR}/autoload.php"
 	einstalldocs
 	if use examples ; then
 		insinto /usr/share/doc/${P}/examples
diff --git a/dev-php/SabreAMF/files/autoload.php b/dev-php/SabreAMF/files/autoload.php
new file mode 100644
index 000000000000..55c3461e485f
--- /dev/null
+++ b/dev-php/SabreAMF/files/autoload.php
@@ -0,0 +1,8 @@
+<?php
+/* Autoloader for dev-php/SabreAMF */
+
+if (!class_exists('Fedora\\Autoloader\\Autoload', false)) {
+	require_once '/usr/share/php/Fedora/Autoloader/autoload.php';
+}
+
+Fedora\Autoloader\Autoload::addPsr0('SabreAMF_', __DIR__.'/..');
diff --git a/dev-php/pecl-apcu/Manifest b/dev-php/pecl-apcu/Manifest
index 6c532dd2def7..f804bea1bd38 100644
--- a/dev-php/pecl-apcu/Manifest
+++ b/dev-php/pecl-apcu/Manifest
@@ -7,7 +7,7 @@ DIST apcu-5.1.9.tgz 111049 BLAKE2B c7138f65d73a056e4a34972098c2b543ad6d96d0d8215
 EBUILD pecl-apcu-4.0.11.ebuild 1453 BLAKE2B 3d0e75d3dbe866f5e10dc464fb5a54a67ed79656ef9d97d62052da4670be39d91122fb2b1da4e6629c26b7aff71585e683e3fccddf59d77afda21d47eaea2c8b SHA512 b0fb1cdceb8e2c48b459309c6e98a1fb16faa48e1228bc0bfbe5c01cee0b038121ffae8a094cdc030fd1bc94624d4602e6abcb5b99dd6a2109024856446571b1
 EBUILD pecl-apcu-5.1.10.ebuild 1980 BLAKE2B 5370b05a1172cf5ea96dc526029890c003fc802c762924063155bd4458d7273773599171e28908e69c99bcfcb3d19611df15ac8caabf26f4f20b4b6ab27e8a20 SHA512 eda7e2586c04f39c4a6217b344d97110e3a8371f43b5b06b70845b89564e6b948e7ead601c523a43d2bda8b8670bc61cf0b9b29de1e89d1cc497df349b5d6c61
 EBUILD pecl-apcu-5.1.11.ebuild 1980 BLAKE2B 5370b05a1172cf5ea96dc526029890c003fc802c762924063155bd4458d7273773599171e28908e69c99bcfcb3d19611df15ac8caabf26f4f20b4b6ab27e8a20 SHA512 eda7e2586c04f39c4a6217b344d97110e3a8371f43b5b06b70845b89564e6b948e7ead601c523a43d2bda8b8670bc61cf0b9b29de1e89d1cc497df349b5d6c61
-EBUILD pecl-apcu-5.1.12.ebuild 2094 BLAKE2B 4ffddcfef85ed487edb45462633875576a28ee2e1e1a437bd4019aba67e003a56d7de6e3214f102808e6b3a04d90717a5f79961caabba6d5627da6574d6358dc SHA512 534cc3793e3d6be2f15be3c0faf0e14d6791ad5a0d544641f16e0b72c05780aebab60f8217de8d5d594abaf0b1f275f15ac79a9cc2b8053f687f379863c8b484
+EBUILD pecl-apcu-5.1.12.ebuild 2093 BLAKE2B 84a4783d1e5f9fb621369986b1b6f53952a3c85154ab9984051abb63a9d8b6ffee8870cd47991434f32cd81d322f74ad51098a3a1f77a19882cb86613d95e585 SHA512 d93c6e848b15a7365bc38ae5ff0fed0ed7c8be3025e18e178fb3c6ac9855e9a91c32da9c91a3849bbe8f8ce88c2931404fe0c1366ed14bd8e02674fb1f2801bc
 EBUILD pecl-apcu-5.1.8.ebuild 1860 BLAKE2B f13dd25e9afa2054bd3474d72f326f815384befe594b9bec7803021bbe4c67fc9501e9b23760b08a22d29654a3b34a6c76120ebe5baf27cb22814bef8b7425c4 SHA512 f086a6e970a87a65658064feecbe42b30c3e1bb6c01effb0cd890ced791df3228b8143374957e94c970899a7d7fffaf3abe818816de8f29b4398fbc23002be9b
 EBUILD pecl-apcu-5.1.9.ebuild 1980 BLAKE2B 5370b05a1172cf5ea96dc526029890c003fc802c762924063155bd4458d7273773599171e28908e69c99bcfcb3d19611df15ac8caabf26f4f20b4b6ab27e8a20 SHA512 eda7e2586c04f39c4a6217b344d97110e3a8371f43b5b06b70845b89564e6b948e7ead601c523a43d2bda8b8670bc61cf0b9b29de1e89d1cc497df349b5d6c61
 MISC metadata.xml 540 BLAKE2B 87b95a306509825ceb5c27c471c496692da1efaf9fc04c357d9aa47c458db302456884401b077cd040bc70a6540706cc54ac2aa76f7da8a1d3b63b6af8661e5a SHA512 46b3e028a3632c8ebfa89a9e2053bc0bb8893fd0a75ee3f84e1d62daec9be5cadbe1f9fc55bb14931a91cde04ff04c5f7c19b2dcf57551ee08fa3eb64ed88232
diff --git a/dev-php/pecl-apcu/pecl-apcu-5.1.12.ebuild b/dev-php/pecl-apcu/pecl-apcu-5.1.12.ebuild
index fcbe122680b2..907e9265b6ba 100644
--- a/dev-php/pecl-apcu/pecl-apcu-5.1.12.ebuild
+++ b/dev-php/pecl-apcu/pecl-apcu-5.1.12.ebuild
@@ -17,7 +17,7 @@ inherit php-ext-pecl-r3
 # However, we only really build for 7.x; so redefine it here
 USE_PHP="php7-0 php7-1 php7-2 php7-3"
 
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 
 DESCRIPTION="Stripped down version of APC supporting only user cache"
 LICENSE="PHP-3.01"
diff --git a/dev-php/pecl-apcu_bc/Manifest b/dev-php/pecl-apcu_bc/Manifest
index d29c9ffd352a..7338924965c5 100644
--- a/dev-php/pecl-apcu_bc/Manifest
+++ b/dev-php/pecl-apcu_bc/Manifest
@@ -1,5 +1,5 @@
 DIST apcu_bc-1.0.3.tgz 7245 BLAKE2B cf3a632568218a3dead69c251aac67a3e1c9c03e0bef0b57184bb1e85c60aadc09dcbcf49f2703869783128949a9aa2f4e5eb660d9ca88f800e85ce0692847b1 SHA512 b1faf811316bbba25354b9b28d5c13c69ae93913b90eb36d1904ef4d9ca35000e1d83f8204ab4500813cb8858feccebb262523f42b3116b85c59c6a796affe67
 DIST apcu_bc-1.0.4.tgz 7406 BLAKE2B c7099f13bfe589c9752fb7fa8454f16094a13d63924ceef614db1fef11d37265673e745383241836685dcabca8ae83af3c71ba2f2d8a77b4ab213db209924f12 SHA512 633ae74c4be3ee0c2c98540f696dc440f3f345c52811e856cb46c65c6b6fa8fa9f06ecb1d784cd990cf8b5219b65e14a29b97e57828dc6e7aa6b91d2475e6a0e
 EBUILD pecl-apcu_bc-1.0.3-r1.ebuild 738 BLAKE2B 3a84093f3a30dc29947a13c78a2e8a0f05817789ae4f4ce57aaf86ad0f56d149613276168918d7c1ea2d85b5ce1283e7964243c3afa7b0cc6a1847a751c44030 SHA512 c82072c2bf7f501479cc92d379bcb53ed83e99b1da929feb1ca8a15455a01c3b48dd48f778641f091c76f13f12fe92c85a14175332f5e9a0a263a7ceb499f9fc
-EBUILD pecl-apcu_bc-1.0.4.ebuild 1155 BLAKE2B cb0c6cbc416d7e8276eaa96459ab41faf374f4f3fa1a5211f0ccb6128fb8534c265f3c4ffc7e0217dae3b5ee115e00857bf2c7994053e21b90fe62251d8d9db6 SHA512 e1eb65ae54350768149d4d6610e07b0a9237d78409d0d976a8319814204b1b8fdc05bdc78b5994f954322037d67f8bdcd9a88449bff9a914e6ffd3eb2e8925ad
+EBUILD pecl-apcu_bc-1.0.4.ebuild 1154 BLAKE2B 1cd0dde4480b764156c1ce0dfbf43a8ef9854301b403047a720b4408bcbb12b189623766f76d315c5c1326171e0ee121e78884f9ab3cbad348c1f61bfeb4d7ba SHA512 8624329b8c1bf082c2bfd5f9f4e4f04230d995fd46a6f0adf801e40152a2a550f3c2a962cf77274a271b8f7a2dbaab74aedc6ff4bda54ac48ddd7445a225add6
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-apcu_bc/pecl-apcu_bc-1.0.4.ebuild b/dev-php/pecl-apcu_bc/pecl-apcu_bc-1.0.4.ebuild
index 0725748dbc35..b3444d3692b5 100644
--- a/dev-php/pecl-apcu_bc/pecl-apcu_bc-1.0.4.ebuild
+++ b/dev-php/pecl-apcu_bc/pecl-apcu_bc-1.0.4.ebuild
@@ -14,7 +14,7 @@ USE_PHP="php7-0 php7-1 php7-2"
 
 inherit php-ext-pecl-r3 multilib
 
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 
 DESCRIPTION="Provides APC backwards compatibility functions via APCu"
 LICENSE="PHP-3.01"
diff --git a/dev-php/tcpdf/Manifest b/dev-php/tcpdf/Manifest
index 606d9ad1f551..ced383ee9657 100644
--- a/dev-php/tcpdf/Manifest
+++ b/dev-php/tcpdf/Manifest
@@ -1,3 +1,3 @@
-DIST tcpdf-6.2.16.tar.gz 17006033 BLAKE2B a4a9b502812bca3babe9d89bc215e75c951a2f3649ac01cf7327d5e13ccfd36e9586eb15a712fd48245f504ace2bcf7075413f9ee06526f4dec5c7d6c3e34b9d SHA512 302022636cd2c178e2d015b702188d59b608855110928e253daf7dd14e117a6770ad85385023c7970f13347142c60cc62a8fbdcee471364c47cb499fc3fbaa6c
-EBUILD tcpdf-6.2.16.ebuild 1016 BLAKE2B 7bc6a2f7a8d6eddb96ef8dbea07e6303d9557de293324c7541d455756f9003e91e339f6a1ed2cc7c8b0bb0f49c6e916c1ecfed56380e78139623a566b45ad635 SHA512 901a4fad0c30a5b8d76d78f0f60621f17f593dfa999a9482390ffd04f6e79f11d00c28d9fad57654dbf89a3eca5ea10a98bdf5c8255f6517a75c55daa70b3473
+DIST tcpdf-6.2.25.tar.gz 17006366 BLAKE2B f95d9d4931d56459d5ae9ea9bcaad72a31abaa8e9404fea17bc69089fb93b89d94a027512568282b6b8758651c3d347c3190a38db7ee200939cc045b9f12650b SHA512 d2e2bdf080c0a6af918a14c4f5704ee4bf7adad76044c89c3165afe392e39fa7bf98271da976cec7f024e3047e1df49090cb0206084efa77bb5b76708d6524c8
+EBUILD tcpdf-6.2.25.ebuild 1035 BLAKE2B 14abfbe7799e79ed77c39c212aeaa9ac1a21afc36a1b513efd198851cea8aba113ca6aef271c5b0e28558c60df17325adc0499fd4c7e13f24fb41996c04ac2bb SHA512 54f9ed75ac4aea625b96195b42ba3516a23e9a0c0acd518300712af9423c70c2a7079dc733d26d8c9bbe1b189bfd5a27b9d40a13f95df9df0d7a5a6d9a4a6bd2
 MISC metadata.xml 320 BLAKE2B 74e0f7eb2cfc2dbbea9b1c275a52625a8d649aa2f5ae467c2df348f034ba51cadc4a6b34f66c2c8dc7752dc62e17441c0d92edacc065e5f2b295bada6c4928cd SHA512 b4f9bc199e0af92d393023cefbb7879bcf1631f6043f400254d948aba10b90a858c6d3a7a41f9ad14334a653ece24d1036acd0e18d7ae06363c1ae6364a0a120
diff --git a/dev-php/tcpdf/tcpdf-6.2.16.ebuild b/dev-php/tcpdf/tcpdf-6.2.25.ebuild
index 5b1b109e8504..ff9b6ad05128 100644
--- a/dev-php/tcpdf/tcpdf-6.2.16.ebuild
+++ b/dev-php/tcpdf/tcpdf-6.2.25.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="TCPDF is a FLOSS PHP class for generating PDF documents"
 HOMEPAGE="http://www.tcpdf.org/"
@@ -30,7 +30,8 @@ src_install() {
 	insinto "/usr/share/php/${PN}"
 	doins tcpdf*.php
 	doins -r include fonts
-	dodoc CHANGELOG.TXT README.md
+	DOCS=( CHANGELOG.TXT README.md )
 
-	use examples && dodoc -r examples
+	use examples && HTML_DOCS=( examples )
+	einstalldocs
 }