gentoo resync : 22.04.2018

3 files changed, 2 insertions, 90 deletions

diff --git a/www-apps/drupal/Manifest b/www-apps/drupal/Manifest
index b6daae8aa7ce..b19edf9cc87e 100644
--- a/www-apps/drupal/Manifest
+++ b/www-apps/drupal/Manifest
@@ -1,8 +1,6 @@
 AUX postinstall-en.txt 1595 BLAKE2B 9b5c237befcf415d0f769052c9634da830326ff57da1a1db538059138780c8ebf8d0666908fb6bb3eba99fee5d5869cd12042f0d276b560b51db60803e46c146 SHA512 6a0a5388d40b3c49f3c685a6a7986c2a9efe3e6d7c5115fbb3110ebe4c19c605a4ff785447a20c0296f3cb16811a8a6e77f2439d58253a011603709c9dd9b760
 DIST drupal-7.58.tar.gz 3281269 BLAKE2B 128ce0e9df584036771ead0f345dd3277e8a1b584398c4e766817774ded159ab8be6666e3f4702f8d636dd14ca7f3f2d7df6a7e0accb2d8e82d3d20802a1134c SHA512 13e437e0458d6b45723ceeca28ec9f82a67497b3dafff0152512e3ad07e1a9b53cdc39404565089ea1531495a047f803e3a1006ca218cbe3dcbbb7a6119e154e
-DIST drupal-8.4.6.tar.gz 13413996 BLAKE2B 26202aa2388d2240239c83e6023e262b45bf7f8e8040e591ed765c1bbd4435f8cd1fb24cce7029220e7a2617bc8657bcfa70203cf3ee4e799ef8fab25d32116b SHA512 ded7d5e9af8e01d098e1e436afebeadc69bf99a436a3516c4884af689c812770ec41609a55d2f41aaf226f8ad8e4318acb864af0bbf5d243a81cd373611d5795
-DIST drupal-8.5.1.tar.gz 15537139 BLAKE2B 49dc9c732ea3ba625c78642eca6fa1717543251749a1c6642ba1a5ae372f5e36e16fae263a686a554cd2051d38367eeba597d3bbd7e21c6f69ca458ad96e54a7 SHA512 a4b095102a1d929a40f0b0b9c71f5956280eb03a88a4ba41b54523c22a5a704404d95b2541670f91fb54874d3e1b35f550fd87040d24df29b37d960929f02df2
+DIST drupal-8.5.2.tar.gz 15527091 BLAKE2B 52aea95b6375ad2f82261c52201f04e19c72f25c3e02567a079bce01e09f6857947e0dd7f4706670162bedaf4ea29398e3f3bd34c5434f8a880bef1a07e439db SHA512 721e8425a18f68fec3a1dbaf22d0f5622e257d01705dc16a7de659d770afbab0e5207297d5a78abeea60a72dc98e4aecb0a1f81f95c80973cd7fe40da4e76567
 EBUILD drupal-7.58.ebuild 1773 BLAKE2B bb8f2af7fc9709ba9b7db4801a96c8469bfbf0fe50bed09fa7d16528825165541665411a2f8bfe843d21b050ab2e8cf6789e874629b5a03d70e3dbcfebe0f7f9 SHA512 a34a9ab5d7fb21823fed786d36bda99bc43e9b2b22794f4c996d33adce4f822ae10caf1c3553a0180532b11093627f0cdbd048c922a089e274ab22d04e7f6aaf
-EBUILD drupal-8.4.6.ebuild 2428 BLAKE2B 25c1642182eb6eb60a10bb14c0f9b8948c3490e48ad8941829af38ef8ae0fc50d0964bb06574f89db9c3770861d3f759126f00331d18c8267e233ce2f5f7ba2e SHA512 d09fbb8edca7f954e88d4789f15a2d77f3d958cd256477d52553cacbe7e94f557b4367c3ea532915a51e57582de91aa822e9450cca16d6b2196435fdf4db7c90
-EBUILD drupal-8.5.1.ebuild 2428 BLAKE2B 25c1642182eb6eb60a10bb14c0f9b8948c3490e48ad8941829af38ef8ae0fc50d0964bb06574f89db9c3770861d3f759126f00331d18c8267e233ce2f5f7ba2e SHA512 d09fbb8edca7f954e88d4789f15a2d77f3d958cd256477d52553cacbe7e94f557b4367c3ea532915a51e57582de91aa822e9450cca16d6b2196435fdf4db7c90
+EBUILD drupal-8.5.2.ebuild 2428 BLAKE2B 25c1642182eb6eb60a10bb14c0f9b8948c3490e48ad8941829af38ef8ae0fc50d0964bb06574f89db9c3770861d3f759126f00331d18c8267e233ce2f5f7ba2e SHA512 d09fbb8edca7f954e88d4789f15a2d77f3d958cd256477d52553cacbe7e94f557b4367c3ea532915a51e57582de91aa822e9450cca16d6b2196435fdf4db7c90
 MISC metadata.xml 419 BLAKE2B 3652ed012764eeebfd813e1979965e76caf500aea8a29bf8652c56f145e62e5ac8c5ae233919a0be123878cccdbab5fa52a4c02ed7367099862407487ca0b8b9 SHA512 3610c6151b6bbbb452a9c599d04d28a18c3e535c0976e425778e8b138bb03637bb28900acef2ef405ec10176390db33e997ba5d789f8a0fc49564538194fc8a1
diff --git a/www-apps/drupal/drupal-8.5.1.ebuild b/www-apps/drupal/drupal-8.5.1.ebuild
deleted file mode 100644
index 703cace2293b..000000000000
--- a/www-apps/drupal/drupal-8.5.1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit webapp
-
-MY_PV=${PV:0:3}.0
-MY_P=${P/_/-}
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="PHP-based open-source platform and content management system"
-HOMEPAGE="https://www.drupal.org/"
-SRC_URI="https://ftp.drupal.org/files/projects/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~ppc ~x86"
-IUSE="+accelerator +mysql postgres sqlite +uploadprogress"
-
-RDEPEND="
-	dev-lang/php[gd,hash,pdo,postgres?,simplexml,xml]
-	virtual/httpd-php
-	accelerator? ( ||
-		(
-			dev-php/xcache
-			(
-				>=dev-lang/php-5.5[opcache]
-				dev-php/pecl-apcu
-			)
-		)
-	)
-	uploadprogress? ( dev-php/pecl-uploadprogress )
-	mysql? (
-		|| (
-			dev-lang/php[mysql]
-			dev-lang/php[mysqli]
-		)
-	)
-	sqlite? ( dev-lang/php[sqlite] )
-"
-
-need_httpd_cgi
-
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-src_install() {
-	webapp_src_preinst
-
-	local docs="LICENSE.txt README.txt core/MAINTAINERS.txt core/INSTALL.txt core/CHANGELOG.txt \
-		core/INSTALL.mysql.txt core/INSTALL.pgsql.txt core/INSTALL.sqlite.txt core/UPDATE.txt "
-
-	dodoc ${docs}
-	rm -f ${docs} core/INSTALL core/COPYRIGHT.txt core/LICENSE.txt || die
-
-	cp sites/default/{default.settings.php,settings.php} || die
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	dodir "${MY_HTDOCSDIR}"/files
-	webapp_serverowned "${MY_HTDOCSDIR}"/files
-	webapp_serverowned "${MY_HTDOCSDIR}"/sites/default
-	webapp_serverowned "${MY_HTDOCSDIR}"/sites/default/settings.php
-
-	webapp_configfile "${MY_HTDOCSDIR}"/sites/default/settings.php
-	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-
-	webapp_src_install
-}
-
-pkg_postinst() {
-	echo
-	ewarn "SECURITY NOTICE"
-	ewarn "If you plan on using SSL on your Drupal site, please consult the postinstall information:"
-	ewarn "\t# webapp-config --show-postinst ${PN} ${PV}"
-	echo
-	ewarn "If this is a new install, unless you want anyone with network access to your server to be"
-	ewarn "able to run the setup, you'll have to configure your web server to limit access to it."
-	echo
-	ewarn "If you're doing a new drupal-8 install, you'll have to copy /sites/default/default.services.yml"
-	ewarn "to /sites/default/services.yml and grant it write permissions to your web server."
-	ewarn "Just follow the instructions of the drupal setup and be sure to resolve any permissions issue"
-	ewarn "reported by the setup."
-	echo
-}
diff --git a/www-apps/drupal/drupal-8.4.6.ebuild b/www-apps/drupal/drupal-8.5.2.ebuild
index 703cace2293b..703cace2293b 100644
--- a/www-apps/drupal/drupal-8.4.6.ebuild
+++ b/www-apps/drupal/drupal-8.5.2.ebuild