gentoo resync : 12.01.2019

6 files changed, 93 insertions, 6 deletions

diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 720efa7a2e22..2ec9d3ee5c8b 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/drupal/Manifest b/www-apps/drupal/Manifest
index 8062f85bc471..75498f87b4cc 100644
--- a/www-apps/drupal/Manifest
+++ b/www-apps/drupal/Manifest
@@ -4,9 +4,11 @@ DIST drupal-7.61.tar.gz 3287629 BLAKE2B 635fca54063bf3030cd3699f2395c64a4949719b
 DIST drupal-8.6.2.tar.gz 16240694 BLAKE2B 122ff2464af6376256d96db8b470cf5f83beeba80a5c63e549e7eb0cfc875629d0b2d4ed46b130294e2145ea5a428b15cfa0edfcd31596660188df769b68bcd2 SHA512 8cdcd31f3a112a577e622cca0fb7957580b5691102421344c6f6bfc3096f33aae3a68d7d8eb9062ad14761bac14b68c2967973b1b1ef367dcbd79b972493b7c5
 DIST drupal-8.6.3.tar.gz 16372220 BLAKE2B b9bbf18e25292bfa87f23e2aa2329f86dfe714a265188c35998059b0075f31ceb6d0d6a23ed576615b1a6a6aef6b935a495e70b22aed0e649b41b79994bc9123 SHA512 93284235c9620ed235bfe0100317846694095ca96b1da7ac402c415e9f5f0819887c4da516655dabb49b4bbdba58935d7f78712c525c803125ec27d6a5692cea
 DIST drupal-8.6.4.tar.gz 16401179 BLAKE2B 15b44df0ddbc420aad07c95eda6c238a9862c186cd762c6f332452919340939f7b604b424a046adbe2111bd7ae4e50b7dad2a8d67b5122035fc0f30a7b2cb47a SHA512 ff81fe8aa10f635b5906d7a21efc5e8d44e96594d26a2637987ea2ef36b6ea323638bf4fca2374553d381645e4d187ef72d0284d4d0bad8663efe1e0b7bfcf8b
+DIST drupal-8.6.5.tar.gz 16465640 BLAKE2B 39d2ae65884a54bb4830b41d58f7b84ed76d1476a3a1c08a291a0bc75b8351108648f872525f03236fa078438d9863b635084484d8003b20c9331c8ac02f874d SHA512 7298b315c14931c24a1f433625c91a96bb2c7d09ab6ceac31fba62d316604a8b72c13941ef99ffc878ff697f00fb70924f6ffdd23081ec1c9258d0dba1b52e76
 EBUILD drupal-7.60.ebuild 1770 BLAKE2B c95fb45714d745fe90f8522f44f4c6c4e8447fc0ca70bef0ba14e4d9112f6d17cb8241a15f6eec9cd3ff7dc4821f2f3744f797c9a756224efbc4dda6e1104251 SHA512 cc332985461f2fd70e73231af6841c8f9c64d5f9ec961b46ca2814d24bc6a2d4a29e35c53ea1fe231de4f8c6183461402fcdce46a37db64e28af6f36658e095c
 EBUILD drupal-7.61.ebuild 1770 BLAKE2B c95fb45714d745fe90f8522f44f4c6c4e8447fc0ca70bef0ba14e4d9112f6d17cb8241a15f6eec9cd3ff7dc4821f2f3744f797c9a756224efbc4dda6e1104251 SHA512 cc332985461f2fd70e73231af6841c8f9c64d5f9ec961b46ca2814d24bc6a2d4a29e35c53ea1fe231de4f8c6183461402fcdce46a37db64e28af6f36658e095c
 EBUILD drupal-8.6.2.ebuild 2425 BLAKE2B 6c7c13e66671b68a6f3d1305bdbd07e06fc1d07e4f9d44fd093196f266f690cff3d1e02444c3b9fbf9ca4733f32d396be55888e4fb87c464706fdf36692f9481 SHA512 5e436f0647278c0f2775ce4aa3096fa32e7f9b9d682e16b1cbda27d622fc5b9f11842b002d39efd47f6430e5799199c6bd28b4f980bfaa75ad2be20776fc74ff
 EBUILD drupal-8.6.3.ebuild 2425 BLAKE2B 6c7c13e66671b68a6f3d1305bdbd07e06fc1d07e4f9d44fd093196f266f690cff3d1e02444c3b9fbf9ca4733f32d396be55888e4fb87c464706fdf36692f9481 SHA512 5e436f0647278c0f2775ce4aa3096fa32e7f9b9d682e16b1cbda27d622fc5b9f11842b002d39efd47f6430e5799199c6bd28b4f980bfaa75ad2be20776fc74ff
 EBUILD drupal-8.6.4.ebuild 2308 BLAKE2B 0b05ff48f64b17a262c5220852bcb1f9d185b7404d2934f7252cdc184207cbb49d3defa31fcd9ea7ceeb8618a2934a60d742ff55a9b28bfb6438649b1ef38c6b SHA512 8046d3eaaa248ac73513708a5f4e465bb5761e6101eef7c11d622584b1bcfc2c8be752a03e607a40c5d83df74e93452a353d7a1478f33138b539b464117623ac
+EBUILD drupal-8.6.5.ebuild 2308 BLAKE2B 3ad53afceb565164978938c6d1ced683084a2703302b8f70dfe28184a1d0c969b5155e3c284abc8144431acc705e6f4edd4dc22e041f681833aef030781bc955 SHA512 76af12560b41b542934b443cf19571ff0480ef954e8f3cf7a789506147b4a40419300584a332960b0eacf78f32bd15545c6c5590b5983a4f8fdb5364abc2ee52
 MISC metadata.xml 419 BLAKE2B 3652ed012764eeebfd813e1979965e76caf500aea8a29bf8652c56f145e62e5ac8c5ae233919a0be123878cccdbab5fa52a4c02ed7367099862407487ca0b8b9 SHA512 3610c6151b6bbbb452a9c599d04d28a18c3e535c0976e425778e8b138bb03637bb28900acef2ef405ec10176390db33e997ba5d789f8a0fc49564538194fc8a1
diff --git a/www-apps/drupal/drupal-8.6.5.ebuild b/www-apps/drupal/drupal-8.6.5.ebuild
new file mode 100644
index 000000000000..a8514d07dfe0
--- /dev/null
+++ b/www-apps/drupal/drupal-8.6.5.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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_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/icingaweb2/Manifest b/www-apps/icingaweb2/Manifest
index ff8722b679e2..56988cb743db 100644
--- a/www-apps/icingaweb2/Manifest
+++ b/www-apps/icingaweb2/Manifest
@@ -3,5 +3,5 @@ DIST icingaweb2-2.6.2.tar.gz 8171965 BLAKE2B 2a7ebe4ee84ea311a1e0cac14021db66c09
 EBUILD icingaweb2-2.6.1.ebuild 2753 BLAKE2B ca25d486a10b97ac6efb871049239c49301e1b242c5cf7021144f67c99f38ad525d5b06bd78b652d44ed7977cf86b43ef3e711af965fad4c583ba6246aac49a0 SHA512 4493fb4bca00b034ba9714c3b16edd202d8a3ccfeb6dd0ccdd4f14c86499fc0be27e59b10a44e14488d89e74926841cf6090156cbacb13fa8acf44035309c3a4
 EBUILD icingaweb2-2.6.2-r1.ebuild 2331 BLAKE2B 1363042c58ee67b76b6f82d89919c7a92edf289ca99ef6e1c157592c9a449ac1afc6459a42b4a1ed89168ee9ef1dc6c6f6012e1090a0b0f98115ec56b04823bf SHA512 73bc873c58b89adc43eed160788406ea9299e66d9388b681e31cd91ef300547c20ec27c8ed09309db12c813ce507e73e88b3850d9e6d87194f9a11758a90683c
 EBUILD icingaweb2-2.6.2.ebuild 2750 BLAKE2B f3a93c50db31b0d18d442a76ad42777bc26136a1aa10baed09c31ebf8b31529e76c21f9c26375e17bf9bce3ff10325e8e6f9cf7dde0cb7a7ddcb34a6788450b0 SHA512 1eff0bc5243c531f4d869ad8d0cf91551649dcae50489dfaad45d342777a6714dc58e752a315a00bae9967664b5b5c74386ebc2fef9193f3553c1027ea0fde70
-EBUILD icingaweb2-9999.ebuild 2326 BLAKE2B d89a0a7fad5a7a5b843537a634d663a3301e2c1e39243f42162e9ab411f3874f44f5fa7654cf7787036e74b7f417b9d246df2bf674078cc14b7ce29039b40505 SHA512 e61d107c60a8bdb31c3011ff6ffc69e5c0716c6bfe3389ae2a291e94ad9afe40ca114ca99358e79fac84cd508ed7d0547d4a044e85dbcf20f57593c978ebd2f0
-MISC metadata.xml 457 BLAKE2B c1e8513c6e19ee42752d4b14c85736b1de6ae0c6816f4cc70f3bcadac0a5f58bccc0d3804c425614455de4fa7ff033c18693d6aa137711612fd357393c8675e3 SHA512 af1d011357452a12a3c8d53c934a5586fc61a33465bc2c1d015fb15338b184ec5af9d7ec1bc4c88369bc83507cf4af2648b9395ff123237a671b74e56e00b6e6
+EBUILD icingaweb2-9999.ebuild 2387 BLAKE2B 15090aba537ae7e6c1a5d3bb87bf21c018c526ab03c7d22f34275095cf4b1621d2475110c6ad5fd2bffec2590236307f1c317c91f9a8723d2c6f00d3511d1d74 SHA512 da41c35db047516cb3e03951e845801f26704786cf289bbfd1bc691b1fcec4c6c30ba5338b43fe94f816a017cc370606bfb538e370942c37be7090b14d1e0239
+MISC metadata.xml 530 BLAKE2B 855edf88f825a4c2f286068f7195264f1ca75f15aecf56d322a2e96b79ccdbea0b45c0a9a6cc4025dd2632cb0c97b60ffda3dd859adb7a2cfb35c0373c72bc0f SHA512 4ec6c57d7342dc1fa154f16e262f762374e37f6e4db09290c1b1188cc27ee605697d28b8349c51dee71fbfd5a90fd091e17b1dff4c9c9745bd6e69df8191897a
diff --git a/www-apps/icingaweb2/icingaweb2-9999.ebuild b/www-apps/icingaweb2/icingaweb2-9999.ebuild
index 4d8e67f6cc57..03a2c2bd75d6 100644
--- a/www-apps/icingaweb2/icingaweb2-9999.ebuild
+++ b/www-apps/icingaweb2/icingaweb2-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -12,14 +12,14 @@ EGIT_BRANCH="master"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="apache2 fpm ldap mysql nginx pdf postgres"
-REQUIRED_USE="^^ ( apache2 nginx )"
+IUSE="apache2 apache2-server fpm ldap mysql nginx pdf postgres"
+REQUIRED_USE="( ^^ ( apache2-server nginx ) ) apache2? ( apache2-server )"
 KEYWORDS=""
 
 DEPEND=">=net-analyzer/icinga2-2.1.1
 		dev-php/pecl-imagick
 		pdf? ( media-gfx/imagemagick[png] )
-		apache2? ( >=www-servers/apache-2.4.0 )
+		apache2-server? ( >=www-servers/apache-2.4.0 )
 		nginx? ( >=www-servers/nginx-1.7.0:* )
 		|| (
 			dev-lang/php:5.6[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
diff --git a/www-apps/icingaweb2/metadata.xml b/www-apps/icingaweb2/metadata.xml
index 8f0ec860cd1d..c6478777dd22 100644
--- a/www-apps/icingaweb2/metadata.xml
+++ b/www-apps/icingaweb2/metadata.xml
@@ -9,6 +9,7 @@
 		Icinga Web 2 - Frontend for icinga2
 	</longdescription>
 	<use>
+		<flag name="apache2-server">Adds support for the apache2-server</flag>
 		<flag name="nginx">Adds support for nginx</flag>
 		<flag name="fpm">Adds FPM support to php</flag>
 	</use>