gentoo resync : 29.05.2018

15 files changed, 155 insertions, 411 deletions

diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index faee9dbcba39..68e6564b5294 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/icingaweb2-module-graphite/Manifest b/www-apps/icingaweb2-module-graphite/Manifest
index 000a71db6cb8..8bbc23ea5a26 100644
--- a/www-apps/icingaweb2-module-graphite/Manifest
+++ b/www-apps/icingaweb2-module-graphite/Manifest
@@ -1,5 +1,4 @@
-AUX patch-unquote-service.patch 2566 BLAKE2B 1eb3f46859c5109c9e35e562a5d0af0a3a0be5f374e2140e8911aef968ae5acb68ac248445246248739add0f3e80416dddebe7eaaef8b7bbda150961d533fff4 SHA512 6365cc7886f3b5d1ceed9b7f46a90ecc80205a0f42aa31e75b53e9384a094503a82a6a86748170af07be021eb08c0bc2ce800b8fffc961401ee3a5290c2b4297
-DIST icingaweb2-module-graphite-1.0.1.tar.gz 5988 BLAKE2B 43f98d853643377cc8088e60845c603563ec5f3bee8d1e9f48e884677c7bfbc82da5603e1aae05634616a52bd387c1685bf2605d1abcae0a96cc88dad303dd1c SHA512 594a8d2a141bdf682fa37dc7b677a78f255dfa3d05071878a416b7426ed6355abc2a2864394e333a00c08aba8fd4f898e42c5a49ffeaf689a16de175f6ddb333
-EBUILD icingaweb2-module-graphite-1.0.1.ebuild 713 BLAKE2B 0d795bbb7ac66003659e857017c68745a534671250252ca35a20b15105ab243752b09bedbbff14c87f5b21c76658102973f39028cc4147ab2d003d9970a3d31d SHA512 392c3e58f37ce7a3963742eba7063e2ccabc185684ce95e22e11aeb98c21d3e0f9e6e57bd0ba394a89cb284dd5cd3d171a7119f65d750ec842a97b94eae95fbe
-EBUILD icingaweb2-module-graphite-9999.ebuild 756 BLAKE2B 04fde5e34c4a0a3455a0680fec5b7cfa76f8e0bbfe0425e1054317c66a6172de975c0c5bec020f88225ee6f900e1687f7a3d38d43b0e300da44384fb3c9636c7 SHA512 717da1e4407afcde50eafb1ce60fc1a04bbc9da3f4406d679959b34f00e46637518342bd822420a447a4a5511a682dbd5ed895819589fd2ea0e4152dfa308ecc
-MISC metadata.xml 254 BLAKE2B 731c7015b1415180253ab851fc24ad031153050aa0feff41781a5c16ced70787ca132b4fe53adaa8a189de944dda987c65081162895f1f03d68dc77405308fa7 SHA512 49faa8aa0aef31db638fe291aa55ff114f96fd9f9b2c733f88b326b44f3e9dbf627e825de7c41d45f208b2b7e5e6cd5c03e6fee3fa6013625ce7ce158bbc9a31
+DIST icingaweb2-module-graphite-1.0.1.tar.gz 329327 BLAKE2B e53f9ea0e3ca061fdec80da71b6624f97eeda04d78975ac198a6e75ae5300eabf50db3e95802e6d0108ee0314ad9af6108daa24d5b99228c7d9c2fcecfc80cac SHA512 1270d2e7768d3f9181950f08c703236042a9c99d337bd2964396890cdb645b72afabe387d35d232fb123d9f635cc27fc09ac374ec2c5707fa83706b0ba67ac2a
+EBUILD icingaweb2-module-graphite-1.0.1-r1.ebuild 655 BLAKE2B e78227eaa1fe9f89451867b77143fe33cee1e9452219490e4f4374e64a67342dd18c07db8fb11fc9df8097df303c7298f0a63ac8b59e34b6ddee47608c940558 SHA512 a75ef3143b498cb55b965c9c937a59bd53c7f4c95227668f08a69511af9bb67989bb26c44e03a2fa2f7bc791580515f76f90432142c296bc220f65775f06e7ed
+EBUILD icingaweb2-module-graphite-9999.ebuild 655 BLAKE2B e78227eaa1fe9f89451867b77143fe33cee1e9452219490e4f4374e64a67342dd18c07db8fb11fc9df8097df303c7298f0a63ac8b59e34b6ddee47608c940558 SHA512 a75ef3143b498cb55b965c9c937a59bd53c7f4c95227668f08a69511af9bb67989bb26c44e03a2fa2f7bc791580515f76f90432142c296bc220f65775f06e7ed
+MISC metadata.xml 433 BLAKE2B e4b486abac016ae60b7cc2f9f8893bd55f4de4b126ae87a3497d689ffe269cc42d1f6b873febe506aad55ec5a5dc780fdec51dc638aea2152e32e51c65bfd60c SHA512 86d44590ce1d15251e1fc03ff7fc769651fadd0769eb709b0607f61d253de7513fbe4616c4d6a0dd5498f089882d6c362c7e4a768ba4c86e7a6f86368f688591
diff --git a/www-apps/icingaweb2-module-graphite/files/patch-unquote-service.patch b/www-apps/icingaweb2-module-graphite/files/patch-unquote-service.patch
deleted file mode 100644
index 3dde1f45a964..000000000000
--- a/www-apps/icingaweb2-module-graphite/files/patch-unquote-service.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 3e5921b96b17ea4d0a5f32a39940a9b762e5c3a4 Mon Sep 17 00:00:00 2001
-From: Matthew Thode <mthode@mthode.org>
-Date: Tue, 12 Apr 2016 03:14:16 +0000
-Subject: [PATCH] remove quotes around $service variable
-
-This fixes https://dev.icinga.org/issues/11572
-
-This still leaves $hostname being quoted, I don't know if that needs to go as well.
----
- application/controllers/ShowController.php | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/application/controllers/ShowController.php b/application/controllers/ShowController.php
-index f029b81..0457ce9 100644
---- a/application/controllers/ShowController.php
-+++ b/application/controllers/ShowController.php
-@@ -168,7 +168,7 @@ public function hostAction()
-             if (! array_key_exists('icingaHost', $patterns)) continue;
- 
-             foreach ($set->loadTemplates() as $key => $template) {
--                if (strpos($template->getFilterString(), '$service') !== false) continue;
-+                if (strpos($template->getFilterString(), $service) !== false) continue;
- 
-                 $imgParams = array(
-                     'template' => $key,
-@@ -228,7 +228,7 @@ public function serviceAction()
-             if (! array_key_exists('icingaHost', $patterns)) continue;
- 
-             foreach ($set->loadTemplates() as $key => $template) {
--                if (strpos($template->getFilterString(), '$service') === false) continue;
-+                if (strpos($template->getFilterString(), $service) === false) continue;
- 
-                 $imgParams = array(
-                     'template' => $key,
-@@ -289,7 +289,7 @@ public function XXXserviceAction()
- 
-             foreach ($set->loadTemplates() as $key => $template) {
- 
--                if (strpos($template->getFilterString(), '$service') === false) continue;
-+                if (strpos($template->getFilterString(), $service) === false) continue;
- 
-                 $this->view->templates[$key] = $template;
- 
-diff -Naur a/library/Graphite/ProvidedHook/Monitoring/ServiceActions.php b/library/Graphite/ProvidedHook/Monitoring/ServiceActions.php
---- a/library/Graphite/ProvidedHook/Monitoring/ServiceActions.php  2016-10-16 19:10:49.794640399 -0500
-+++ b/library/Graphite/ProvidedHook/Monitoring/ServiceActions.php  2016-10-16 19:11:17.136401235 -0500
-@@ -16,6 +16,7 @@
-                 array(
-                     'host'    => $service->host_name,
-                     'service' => $service->service_description,
-+                    'check_command' => $service->service_check_command,
-                 ))
-         );
-     }
diff --git a/www-apps/icingaweb2-module-graphite/icingaweb2-module-graphite-1.0.1.ebuild b/www-apps/icingaweb2-module-graphite/icingaweb2-module-graphite-1.0.1-r1.ebuild
index 1722cdeaadb2..312bc419e294 100644
--- a/www-apps/icingaweb2-module-graphite/icingaweb2-module-graphite-1.0.1.ebuild
+++ b/www-apps/icingaweb2-module-graphite/icingaweb2-module-graphite-1.0.1-r1.ebuild
@@ -1,18 +1,16 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-DESCRIPTION="Icinga Web 2 plugin for pnp4nagios"
-HOMEPAGE="http://www.icinga.org/"
+DESCRIPTION="Icinga Web 2 plugin for Graphite"
+HOMEPAGE="https://www.icinga.com/docs/graphite/latest/"
 if [[ "${PV}" == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/Icinga/icingaweb2-module-graphite.git"
 else
 	KEYWORDS="~amd64 ~x86"
-	MY_PN="icingaweb2-module-pnp"
-	SRC_URI="https://codeload.github.com/Icinga/${MY_PN}/tar.gz/v${PV} -> ${P}.tar.gz"
-	S="${WORKDIR}/${MY_PN}-${PV}"
+	SRC_URI="https://github.com/Icinga/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
 LICENSE="GPL-2"
@@ -22,8 +20,6 @@ DEPEND=">=net-analyzer/icinga2-2.4.0
 	>=www-apps/icingaweb2-2.5.0"
 RDEPEND="${DEPEND}"
 
-PATCHES=()
-
 src_install() {
 	insinto "/usr/share/icingaweb2/modules/graphite/"
 	doins -r "${S}"/*
diff --git a/www-apps/icingaweb2-module-graphite/icingaweb2-module-graphite-9999.ebuild b/www-apps/icingaweb2-module-graphite/icingaweb2-module-graphite-9999.ebuild
index 7e359c940e4c..312bc419e294 100644
--- a/www-apps/icingaweb2-module-graphite/icingaweb2-module-graphite-9999.ebuild
+++ b/www-apps/icingaweb2-module-graphite/icingaweb2-module-graphite-9999.ebuild
@@ -1,29 +1,25 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-DESCRIPTION="Icinga Web 2 plugin for pnp4nagios"
-HOMEPAGE="http://www.icinga.org/"
+DESCRIPTION="Icinga Web 2 plugin for Graphite"
+HOMEPAGE="https://www.icinga.com/docs/graphite/latest/"
 if [[ "${PV}" == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/Icinga/icingaweb2-module-graphite.git"
 else
 	KEYWORDS="~amd64 ~x86"
-	MY_PN="icingaweb2-module-pnp"
-	SRC_URI="https://codeload.github.com/Icinga/${MY_PN}/tar.gz/v${PV} -> ${P}.tar.gz"
-	S="${WORKDIR}/${MY_PN}-${PV}"
+	SRC_URI="https://github.com/Icinga/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
 LICENSE="GPL-2"
 SLOT="0"
 
-DEPEND=">=net-analyzer/icinga2-2.1.1
-	>=www-apps/icingaweb2-2.0.0"
+DEPEND=">=net-analyzer/icinga2-2.4.0
+	>=www-apps/icingaweb2-2.5.0"
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}/patch-unquote-service.patch" )
-
 src_install() {
 	insinto "/usr/share/icingaweb2/modules/graphite/"
 	doins -r "${S}"/*
diff --git a/www-apps/icingaweb2-module-graphite/metadata.xml b/www-apps/icingaweb2-module-graphite/metadata.xml
index 3ffdeb4af3b5..e6871e01f10d 100644
--- a/www-apps/icingaweb2-module-graphite/metadata.xml
+++ b/www-apps/icingaweb2-module-graphite/metadata.xml
@@ -5,4 +5,8 @@
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">Icinga/icingaweb2-module-graphite</remote-id>
+		<bugs-to>https://github.com/Icinga/icingaweb2-module-graphite/issues</bugs-to>
+	</upstream>
 </pkgmetadata>
diff --git a/www-apps/redmine/Manifest b/www-apps/redmine/Manifest
index 8856274aa612..246e6dafc898 100644
--- a/www-apps/redmine/Manifest
+++ b/www-apps/redmine/Manifest
@@ -1,13 +1,12 @@
 AUX 10_redmine_vhost.conf 343 BLAKE2B ef74d3feefb81ea29a85860e94ced42cc565058a9e57a1bdb7bc3581842c9543315852d47b9bed80ffbb94280f5f0264c05a552819f89bcc409118ccffd68865 SHA512 839a01abedd2977f79bde2a55041d4e3e3a72de1e04e2bdc4aa5169b3ec22adce12b2b39d4b991d6e034fcd13fbcd030cba5ecc69ae71a76f7f37d2cdde09edc
 AUX additional_environment.rb 322 BLAKE2B 26571ffcbc43431058a685000e00870ec41d266c4cdf46e077018bbbac34a5c818fccb19508c76dd56f53bc31d3e469e61302d36825ba36a5d851cfa73b0a0ef SHA512 1a4b649bc036372a47782a089c2b3db244ea4dd5437f2d931b6c7c4578f5aa104c8b8493da4a3f2874aac0380527604807ec2062525dcd392425b9b22c84f9bf
-AUX redmine-3.4.3_requires.patch 3119 BLAKE2B 85a2f5d9aa8b3eb7467a846e9d56b8081d84fc4e08755474f3e5701a81afcb666d9cd8e5551f333b72c8959d022611c5c9e369e633f748605c22ad3b83a6299e SHA512 854d7e31be964eeea9cc3fd80dc246cad1713a3941f33ea46b27d0419bbc9dd7c017dfc31539542f65cf329ca72e6e278532912107e38f24dd9fab972d00a9a4
+AUX redmine-3.3.7_gemfile_versions.patch 1401 BLAKE2B 978258b8226260edb2af735d6dacdb357e7e58f7ca99b1719a78dc8a7b77863f074e405d5980739849c3307c5d91cc82464d3d12262ad2a152a469d1b37e40d9 SHA512 a81367c5d27273c54274241a76fbbf0c3bf72344b696af419224e75a3e4350f22a15bf95699714f5c4aae0fdf0b2e6d4900c0a1b7aa8f05b845feaa6bd5f7839
+AUX redmine-3.4.5_gemfile_versions.patch 1294 BLAKE2B 2aac6c6eb74b2abbfc436f30834566dba5760ef9a5dca1fda28d4a2cbfb7db58fed31b0cc5149618defcd17eaac6b2fac9a864e61e6168ef87dbb6097d97a685 SHA512 89645b6d03ff48804201bd385557468c9c10c339021c83de7633f669147c58e2884e8eed921add5a4ed2548e350ecba025f7ab6b56e13f207d3bc3903609d125
 AUX redmine-3.initd 1269 BLAKE2B 1c0f561fa1c13c899b17b7c707ac6beaa9090a9ec98657f7ddce2e653241d7388392f22eaf35a85f5de96c3a0c32a4b67f0003725c371ef1ffb1f76c56d989b4 SHA512 c0ec931313d8b684cc8d2ab59e0c6d6fd159202420a3849cbb09a62f4fae7f6c3ec071b58fc17d838247c7c573a92de0ecdab7de995fd2391c4bd66001335ece
 AUX redmine.confd 267 BLAKE2B d2f4f34ac6ac2aadfe5371831fb5dba6dc6e58fd26197528ebe27d9f4faa3dc8b9c495e77841b8a2e67db7093c76cbcda24b9548da0d10268d105b5dde0bb023 SHA512 4e4a700f1540b5e82df6ca610a94adcb08929f5ca75e605e40372b18ccc395515cdd53451ba2b3e3d9bdf129d9052a7218f6323d526c1ffb2540254d279c8d94
 AUX redmine.logrotate 106 BLAKE2B 0c725d812b4a6caae29ed55d0b948a3dc14369aa550994d55ca3aa41e0c1e34962d26da4a46c99fdbdcdd600c12f2d386559af53a2e48d55b5d670372be65b60 SHA512 c7e611dc5e662e5b2126c77a333081708e552f2980efb835dc8560cd5e1929c6923e5e6e4e45604fe662b9bd5ef433678eb900e797cee34bbb1b80fb55eed0e1
-DIST redmine-3.2.9.tar.gz 2323496 BLAKE2B 16aea04eb8ddbe4e97c95f32ad62c6d4332001d7e8afd0b842cc76f9f1dc492b48e1dc11c8017d635520fbccda6e1044ced8be51435f76db24482bf11b5a70d9 SHA512 0bf52f245a08cfd66acd07fe849cfac7a460623cdd223806ee4c7c9c3d17753c1b2914b7bcdc950ac8401ba54c004e399f685d38946b1fbe2259943de5a18f29
-DIST redmine-3.3.6.tar.gz 2371226 BLAKE2B 4465ebf3d89e05a8c53f59b11190eb290a152e6a11fa08a210c471f31e857c3c21ce226e056be00dec7bb5b78172a929969e1cae410ce9fa4c03280c427e99c2 SHA512 124a74ccbe9e66460551fc0fb9feb5b72237c5b711463b467d665fd973c3f0a06f63c708629716401f9997cefc1c3060d64c73917d3791750b4340eda69c8848
-DIST redmine-3.4.4.tar.gz 2447358 BLAKE2B 1f5aa3c24e06029405c59e25c40c98975c98033658ee0a931b1fa95aac54187c7304f1fc0af4805226c4ef274f85d89856ffd39b0ae71b34337865d3e8f4a5ff SHA512 12bf58aade53c02df35b33ba62dd97091a5ac20fb6ef0f16f046226c62dfd06fc6cea5451f433e00f7d9374c158035dc5457d65eafdbc35a90199c5a407c7752
-EBUILD redmine-3.2.9.ebuild 6578 BLAKE2B 0455452412ad2a1883df471c933814d0d928f51377a4f7e6ed7ec84b1d702306fa0116427d8ca6f75266c0c0355dd3123eeec6414e059f2b222946e66367b636 SHA512 ba18f84e6d4cb9d98a01b3e0aa68ca89c80f326db4ae2e5546d4e6fbf1335460258b7d46b8888dfccd4d5bb492ed9c498dcd2d5156d143c035efdc442fac3695
-EBUILD redmine-3.3.6.ebuild 6578 BLAKE2B 0455452412ad2a1883df471c933814d0d928f51377a4f7e6ed7ec84b1d702306fa0116427d8ca6f75266c0c0355dd3123eeec6414e059f2b222946e66367b636 SHA512 ba18f84e6d4cb9d98a01b3e0aa68ca89c80f326db4ae2e5546d4e6fbf1335460258b7d46b8888dfccd4d5bb492ed9c498dcd2d5156d143c035efdc442fac3695
-EBUILD redmine-3.4.4.ebuild 6544 BLAKE2B e644f5e299068644f489e01c811d89f9af522deda872723a9d57355d0f0dec832c0988b36090fa6527fed0d83462aa1f9900ff195093664665331b33f975764c SHA512 894f02797098d821eccfc1954b747a0b6c882689413954ee0bec546074459a03ccd06b7a65341ff5360429ba5b54cab706eafcba1bfe2e37b9962db93a0730cd
+DIST redmine-3.3.7.tar.gz 2371716 BLAKE2B ba1e69419f846ddfa64ddc5d26fda281737501374f5aa4f79bd4c59d5b483a28070103fcc3bf2f3b1c7a4ce96dbfb32d1d1f21a6b74603aad012ce7d2e3373ed SHA512 ba106eb60587788ccd3162274a9a40d2876324e647e1fcafce0f943d69d8fe216a01cbddb2a5a4f41f64513e287c80ec518cef5a6033b3d1ed0bcfc7d1cfcc64
+DIST redmine-3.4.5.tar.gz 2448231 BLAKE2B 11041cbac5ea33c060a90ead56a4479cc86137bad5e0eb6135aed8d19059aedecd2ad52ac63ae6fcc5bbb13b5fc4cd6b05695aff484932b55ad5d7be7cb1c396 SHA512 c77ce76fadb7a2b9d6daf77a898a1ca4d7b1c8616922e89026cee3a4b0ec1a187a746f0a054b786663e78fc510596be736fd12d71b2569f6a63a21d0c95a05ad
+EBUILD redmine-3.3.7.ebuild 6660 BLAKE2B f8e8e9785b682c5ad1d7fa4ba06157a171438d3fed1bfaaebcaad0a063638d87897ea3cade28669fe30b7e69674b4617cf4095777b35dd1ec4f27fff37a5a1ec SHA512 873308418eb2a231d4ecdf41ca2f24da31af8c438a3e02e2982a9d99c80d82c7ed05a13cb67d3c48bd251efdd40658fa62954d84d5e30c29d2c3dce58ec46be3
+EBUILD redmine-3.4.5.ebuild 6668 BLAKE2B d5b9ed082d17cc8c5f98cb67e206c335536b5b43a2c4b50aa91ef736f18196219da18a9390890ca3042cee2f64602a101539e3eaedadb0eb70aa43c476bb5152 SHA512 470206aad952e6e18f02f499a7dcacfc241def2374f2a4a98b69a6cf6a244fe1a355b61b162f6679d00df586d675c316c02e65dd74a0a829ed31e348d9cd85b1
 MISC metadata.xml 527 BLAKE2B 251acbf9246fd6c986b37b6320e78619036d30bc8e155e97a93a2c3ca99847eb39d7919ba94f633aa021462cd200dd156b6f7d3c1575151c1d6b38a4ee999bfa SHA512 156e0ee607ad0ae734a98fab405679c55de4e2a5d620cce564a7ac17e8a029869f66c3df6d2733eb8106f9732537355c72be7c7261209af196264d069788eed4
diff --git a/www-apps/redmine/files/redmine-3.3.7_gemfile_versions.patch b/www-apps/redmine/files/redmine-3.3.7_gemfile_versions.patch
new file mode 100644
index 000000000000..c338a385a969
--- /dev/null
+++ b/www-apps/redmine/files/redmine-3.3.7_gemfile_versions.patch
@@ -0,0 +1,44 @@
+diff -Nuar redmine-3.3.7.orig/Gemfile redmine-3.3.7/Gemfile
+--- redmine-3.3.7.orig/Gemfile	2018-05-23 22:36:30.756737829 +0300
++++ redmine-3.3.7/Gemfile	2018-05-23 22:42:20.227720874 +0300
+@@ -4,7 +4,7 @@
+   abort "Redmine requires Bundler 1.5.0 or higher (you're using #{Bundler::VERSION}).\nPlease update with 'gem update bundler'."
+ end
+ 
+-gem "rails", "4.2.7.1"
++gem "rails", "~> 4.2.10"
+ gem "addressable", "2.4.0" if RUBY_VERSION < "2.0"
+ if RUBY_VERSION < "2.1"
+   gem "public_suffix", (RUBY_VERSION < "2.0" ? "~> 1.4" : "~> 2.0.5")
+@@ -17,12 +17,12 @@
+ gem "protected_attributes"
+ gem "actionpack-action_caching"
+ gem "actionpack-xml_parser"
+-gem "roadie-rails", "~> 1.1.1"
+-gem "roadie", "~> 3.2.1"
++gem "roadie-rails", "~> 1.2.1"
++gem "roadie", "~> 3.3"
+ gem "mimemagic"
+-gem "mail", "~> 2.6.4"
++gem "mail", "~> 2.7"
+ 
+-gem "nokogiri", (RUBY_VERSION >= "2.1" ? "~> 1.7.2" : "~> 1.6.8")
++gem "nokogiri", (RUBY_VERSION >= "2.1" ? "~> 1.8.2" : "~> 1.6.8")
+ gem "i18n", "~> 0.7.0"
+ gem "ffi", "1.9.14", :platforms => :mingw if RUBY_VERSION < "2.0"
+ 
+@@ -35,12 +35,12 @@
+ 
+ # Optional gem for LDAP authentication
+ group :ldap do
+-  gem "net-ldap", "~> 0.12.0"
++  gem "net-ldap", "~> 0.16.0"
+ end
+ 
+ # Optional gem for OpenID authentication
+ group :openid do
+-  gem "ruby-openid", "~> 2.3.0", :require => "openid"
++  gem "ruby-openid", "~> 2.7.0", :require => "openid"
+   gem "rack-openid"
+ end
+ 
diff --git a/www-apps/redmine/files/redmine-3.4.3_requires.patch b/www-apps/redmine/files/redmine-3.4.3_requires.patch
deleted file mode 100644
index 338f627adb1b..000000000000
--- a/www-apps/redmine/files/redmine-3.4.3_requires.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-diff -Nuar redmine-3.4.3-orig/app/controllers/application_controller.rb redmine-3.4.3/app/controllers/application_controller.rb
---- redmine-3.4.3-orig/app/controllers/application_controller.rb	2017-12-11 20:55:04.942299001 +0500
-+++ redmine-3.4.3/app/controllers/application_controller.rb	2017-12-11 20:55:17.285298402 +0500
-@@ -15,6 +15,7 @@
- # along with this program; if not, write to the Free Software
- # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- 
-+require 'request_store'
- require 'uri'
- require 'cgi'
- 
-diff -Nuar redmine-3.4.3-orig/app/controllers/welcome_controller.rb redmine-3.4.3/app/controllers/welcome_controller.rb
---- redmine-3.4.3-orig/app/controllers/welcome_controller.rb	2017-12-11 20:55:04.942299001 +0500
-+++ redmine-3.4.3/app/controllers/welcome_controller.rb	2017-12-11 20:55:17.286298402 +0500
-@@ -15,6 +15,9 @@
- # along with this program; if not, write to the Free Software
- # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- 
-+require 'action_controller'
-+require 'action_controller/action_caching'
-+
- class WelcomeController < ApplicationController
-   self.main_menu = false
- 
-diff -Nuar redmine-3.4.3-orig/app/models/custom_field.rb redmine-3.4.3/app/models/custom_field.rb
---- redmine-3.4.3-orig/app/models/custom_field.rb	2017-12-11 20:55:04.926299002 +0500
-+++ redmine-3.4.3/app/models/custom_field.rb	2017-12-11 20:55:17.286298402 +0500
-@@ -15,6 +15,8 @@
- # along with this program; if not, write to the Free Software
- # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- 
-+require 'protected_attributes'
-+
- class CustomField < ActiveRecord::Base
-   include Redmine::SafeAttributes
-   include Redmine::SubclassFactory
-diff -Nuar redmine-3.4.3-orig/app/models/mailer.rb redmine-3.4.3/app/models/mailer.rb
---- redmine-3.4.3-orig/app/models/mailer.rb	2017-12-11 20:55:04.926299002 +0500
-+++ redmine-3.4.3/app/models/mailer.rb	2017-12-11 20:55:17.286298402 +0500
-@@ -16,6 +16,7 @@
- # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- 
- require 'roadie'
-+require 'roadie-rails'
- 
- class Mailer < ActionMailer::Base
-   layout 'mailer'
-diff -Nuar redmine-3.4.3-orig/bin/rails redmine-3.4.3/bin/rails
---- redmine-3.4.3-orig/bin/rails	2017-12-11 20:55:04.986298999 +0500
-+++ redmine-3.4.3/bin/rails	2017-12-11 20:58:40.247288555 +0500
-@@ -1,4 +1,6 @@
- #!/usr/bin/env ruby
- APP_PATH = File.expand_path('../../config/application',  __FILE__)
- require_relative '../config/boot'
-+
-+gem 'rails', '~> 4.2'
- require 'rails/commands'
-diff -Nuar redmine-3.4.3-orig/config/application.rb redmine-3.4.3/config/application.rb
---- redmine-3.4.3-orig/config/application.rb	2017-12-11 20:55:04.971298999 +0500
-+++ redmine-3.4.3/config/application.rb	2017-12-11 20:58:20.477289514 +0500
-@@ -1,8 +1,11 @@
- require File.expand_path('../boot', __FILE__)
- 
-+gem 'rails', '~> 4.2'
-+gem 'actionpack-xml_parser', '~> 1.0'
-+
- require 'rails/all'
-+require 'action_dispatch/xml_params_parser'
- 
--Bundler.require(*Rails.groups)
- 
- module RedmineApp
-   class Application < Rails::Application
diff --git a/www-apps/redmine/files/redmine-3.4.5_gemfile_versions.patch b/www-apps/redmine/files/redmine-3.4.5_gemfile_versions.patch
new file mode 100644
index 000000000000..df49ccbe1dc9
--- /dev/null
+++ b/www-apps/redmine/files/redmine-3.4.5_gemfile_versions.patch
@@ -0,0 +1,41 @@
+diff -Nuar redmine-3.4.5.orig/Gemfile redmine-3.4.5/Gemfile
+--- redmine-3.4.5.orig/Gemfile	2018-05-23 02:01:54.591358114 +0300
++++ redmine-3.4.5/Gemfile	2018-05-23 02:05:19.531348171 +0300
+@@ -4,7 +4,7 @@
+   abort "Redmine requires Bundler 1.5.0 or higher (you're using #{Bundler::VERSION}).\nPlease update with 'gem update bundler'."
+ end
+ 
+-gem "rails", "4.2.8"
++gem "rails", "~> 4.2.10"
+ gem "addressable", "2.4.0" if RUBY_VERSION < "2.0"
+ if RUBY_VERSION < "2.1"
+   gem "public_suffix", (RUBY_VERSION < "2.0" ? "~> 1.4" : "~> 2.0.5")
+@@ -15,10 +15,10 @@
+ gem "mime-types", (RUBY_VERSION >= "2.0" ? "~> 3.0" : "~> 2.99")
+ gem "protected_attributes"
+ gem "actionpack-xml_parser"
+-gem "roadie-rails", "~> 1.1.1"
+-gem "roadie", "~> 3.2.1"
++gem "roadie-rails", "~> 1.2.1"
++gem "roadie", "~> 3.3"
+ gem "mimemagic"
+-gem "mail", "~> 2.6.4"
++gem "mail", "~> 2.7"
+ 
+ gem "nokogiri", (RUBY_VERSION >= "2.1" ? "~> 1.8.1" : "~> 1.6.8")
+ gem "i18n", "~> 0.7.0"
+@@ -33,12 +33,12 @@
+ 
+ # Optional gem for LDAP authentication
+ group :ldap do
+-  gem "net-ldap", "~> 0.12.0"
++  gem "net-ldap", "~> 0.16.0"
+ end
+ 
+ # Optional gem for OpenID authentication
+ group :openid do
+-  gem "ruby-openid", "~> 2.3.0", :require => "openid"
++  gem "ruby-openid", "~> 2.7", :require => "openid"
+   gem "rack-openid"
+ end
+ 
diff --git a/www-apps/redmine/redmine-3.2.9.ebuild b/www-apps/redmine/redmine-3.2.9.ebuild
deleted file mode 100644
index c3b226cd21c4..000000000000
--- a/www-apps/redmine/redmine-3.2.9.ebuild
+++ /dev/null
@@ -1,219 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-# ruby24 don't have required deps
-USE_RUBY="ruby22 ruby23"
-inherit eutils depend.apache ruby-ng user
-
-DESCRIPTION="Flexible project management web application using the Ruby on Rails framework"
-HOMEPAGE="https://www.redmine.org/"
-SRC_URI="https://www.redmine.org/releases/${P}.tar.gz"
-
-KEYWORDS="~amd64"
-LICENSE="GPL-2"
-SLOT="0"
-# All db-related USEs are ineffective since we depend on rails
-# which depends on activerecord which depends on all ruby's db bindings
-#IUSE="ldap openid imagemagick postgres sqlite mysql fastcgi passenger"
-IUSE="imagemagick fastcgi ldap markdown passenger"
-
-ruby_add_rdepend "
-	dev-ruby/actionpack-action_caching
-	dev-ruby/actionpack-xml_parser:0
-	>=dev-ruby/builder-3.2.2:3.2
-	>=dev-ruby/coderay-1.1.0
-	dev-ruby/i18n:0.7
-	>=dev-ruby/jquery-rails-3.1.4:3
-	dev-ruby/loofah
-	dev-ruby/mime-types:*
-	dev-ruby/mimemagic
-	>=dev-ruby/nokogiri-1.6.8
-	dev-ruby/protected_attributes
-	>=dev-ruby/rack-openid-0.2.1
-	>=dev-ruby/rails-4.2.5.2:4.2
-	>=dev-ruby/rails-html-sanitizer-1.0.3
-	dev-ruby/request_store:1.0.5
-	>=dev-ruby/roadie-rails-1.1.0
-	>=dev-ruby/rbpdf-1.19.2
-	>=dev-ruby/ruby-openid-2.3.0
-	dev-ruby/rubygems
-	fastcgi? ( dev-ruby/fcgi )
-	imagemagick? ( >=dev-ruby/rmagick-2.14.0 )
-	ldap? ( >=dev-ruby/ruby-net-ldap-0.12.0 )
-	markdown? ( >=dev-ruby/redcarpet-3.3.2 )
-	passenger? ( www-apache/passenger )
-	"
-# TODO add USE doc and test
-#ruby_add_bdepend ">=dev-ruby/rdoc-2.4.2
-#	dev-ruby/yard
-#	test? (
-#		>=dev-ruby/shoulda-3.3.2
-#		>=dev-ruby/mocha-0.13.3
-#		>=dev-ruby/capybara-2.0.0
-#	)"
-
-REDMINE_DIR="/var/lib/${PN}"
-
-pkg_setup() {
-	enewgroup redmine
-	enewuser redmine -1 -1 "${REDMINE_DIR}" redmine
-}
-
-all_ruby_prepare() {
-	rm -r log files/delete.me Gemfile || die
-
-	# bug #406605
-	rm .{git,hg}ignore || die
-
-	cat > "${T}/50${PN}" <<-EOF || die
-		CONFIG_PROTECT="${EROOT%/}${REDMINE_DIR}/config"
-		CONFIG_PROTECT_MASK="${EROOT%/}${REDMINE_DIR}/config/locales ${EROOT%/}${REDMINE_DIR}/config/settings.yml"
-	EOF
-
-	# remove ldap staff module if disabled to avoid #413779
-	use ldap || rm app/models/auth_source_ldap.rb || die
-
-	eapply "${FILESDIR}/${PN}-3.4.3_requires.patch"
-}
-
-all_ruby_install() {
-	dodoc doc/* README.rdoc
-	rm -r doc appveyor.yml CONTRIBUTING.md README.rdoc || die
-
-	keepdir /var/log/${PN}
-
-	insinto "${REDMINE_DIR}"
-	doins -r .
-	insinto "${REDMINE_DIR}/config"
-	doins "${FILESDIR}/additional_environment.rb"
-	keepdir "${REDMINE_DIR}/files"
-	keepdir "${REDMINE_DIR}/public/plugin_assets"
-
-	fowners -R redmine:redmine \
-		"${REDMINE_DIR}/config" \
-		"${REDMINE_DIR}/files" \
-		"${REDMINE_DIR}/public/plugin_assets" \
-		"${REDMINE_DIR}/tmp" \
-		/var/log/${PN}
-
-	fowners redmine:redmine "${REDMINE_DIR}"
-
-	# protect sensitive data, see bug #406605
-	fperms -R go-rwx \
-		"${REDMINE_DIR}/config" \
-		"${REDMINE_DIR}/files" \
-		"${REDMINE_DIR}/tmp" \
-		/var/log/${PN}
-
-	if use passenger; then
-		has_apache
-		insinto "${APACHE_VHOSTS_CONFDIR}"
-		doins "${FILESDIR}/10_redmine_vhost.conf"
-	fi
-
-	# logrotate
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/redmine.logrotate redmine
-
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-	newinitd "${FILESDIR}/${PN}-3.initd" ${PN}
-	doenvd "${T}/50${PN}"
-}
-
-pkg_postinst() {
-	if [[ -e "${EROOT%/}${REDMINE_DIR}/config/initializers/session_store.rb" \
-	|| -e "${EROOT%/}${REDMINE_DIR}/config/initializers/secret_token.rb" ]]
-	then
-		elog "Execute the following command to upgrade environment:"
-		elog
-		elog "# emerge --config \"=${CATEGORY}/${PF}\""
-		elog
-		elog "For upgrade instructions take a look at:"
-		elog "http://www.redmine.org/wiki/redmine/RedmineUpgrade"
-	else
-		elog "Execute the following command to initialize environment:"
-		elog
-		elog "# cd ${EROOT%/}${REDMINE_DIR}"
-		elog "# cp config/database.yml.example config/database.yml"
-		elog "# \${EDITOR} config/database.yml"
-		elog "# chown redmine:redmine config/database.yml"
-		elog "# emerge --config \"=${CATEGORY}/${PF}\""
-		elog
-		elog "Installation notes are at official site"
-		elog "http://www.redmine.org/wiki/redmine/RedmineInstall"
-	fi
-}
-
-pkg_config() {
-	if [[ ! -e "${EROOT%/}${REDMINE_DIR}/config/database.yml" ]]; then
-		eerror "Copy ${EROOT%/}${REDMINE_DIR}/config/database.yml.example to"
-		eerror "${EROOT%/}${REDMINE_DIR}/config/database.yml then edit this"
-		eerror "file in order to configure your database settings for"
-		eerror "\"production\" environment."
-		die
-	fi
-
-	local RAILS_ENV=${RAILS_ENV:-production}
-	if [[ ! -L /usr/bin/ruby ]]; then
-		eerror "/usr/bin/ruby is not a valid symlink to any ruby implementation."
-		eerror "Please update it via `eselect ruby`"
-		die
-	fi
-	if [[ $RUBY_TARGETS != *$( eselect ruby show | awk 'NR==2' | tr  -d ' '  )* ]]
-	then
-		eerror "/usr/bin/ruby is currently not included in redmine's ruby targets:"
-		eerror "${RUBY_TARGETS}."
-		eerror "Please update it via `eselect ruby`"
-		die
-	fi
-	local RUBY=${RUBY:-ruby}
-
-	cd "${EROOT%/}${REDMINE_DIR}" || die
-	if [[ -e "${EROOT%/}${REDMINE_DIR}/config/initializers/session_store.rb" ]]
-	then
-		einfo
-		einfo "Generating secret token."
-		einfo
-		rm config/initializers/session_store.rb || die
-		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake generate_secret_token || die
-	fi
-	if [[ -e "${EROOT%/}${REDMINE_DIR}/config/initializers/secret_token.rb" ]]
-	then
-		einfo
-		einfo "Upgrading database."
-		einfo
-
-		einfo "Generating secret token."
-		# Migration from Redmine 2.x
-		rm config/initializers/secret_token.rb || die
-		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake generate_secret_token || die
-
-		einfo "Migrating database."
-		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake db:migrate || die
-		einfo "Upgrading the plugin migrations."
-		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake redmine:plugins:migrate || die
-		einfo "Clear the cache and the existing sessions."
-		${RUBY} -S rake tmp:cache:clear || die
-		${RUBY} -S rake tmp:sessions:clear || die
-	else
-		einfo
-		einfo "Initializing database."
-		einfo
-
-		einfo "Generating a session store secret."
-		${RUBY} -S rake generate_secret_token || die
-		einfo "Creating the database structure."
-		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake db:migrate || die
-		einfo "Populating database with default configuration data."
-		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake redmine:load_default_data || die
-		chown redmine:redmine "${EROOT%/}var/log/redmine/*.log" || die
-		einfo
-		einfo "If you use sqlite3, please do not forget to change the ownership"
-		einfo "of the sqlite files."
-		einfo
-		einfo "# cd \"${EROOT%/}${REDMINE_DIR}\""
-		einfo "# chown redmine:redmine db/ db/*.sqlite3"
-		einfo
-	fi
-}
diff --git a/www-apps/redmine/redmine-3.4.4.ebuild b/www-apps/redmine/redmine-3.3.7.ebuild
index c914e4add206..be96b5703989 100644
--- a/www-apps/redmine/redmine-3.4.4.ebuild
+++ b/www-apps/redmine/redmine-3.3.7.ebuild
@@ -12,10 +12,7 @@ SRC_URI="https://www.redmine.org/releases/${P}.tar.gz"
 KEYWORDS="~amd64"
 LICENSE="GPL-2"
 SLOT="0"
-# All db-related USEs are ineffective since we depend on rails
-# which depends on activerecord which depends on all ruby's db bindings
-#IUSE="ldap openid imagemagick postgres sqlite mysql fastcgi passenger"
-IUSE="imagemagick fastcgi ldap markdown passenger"
+IUSE="imagemagick fastcgi ldap markdown mysql passenger postgres sqlite"
 
 ruby_add_rdepend "
 	dev-ruby/actionpack-action_caching
@@ -41,16 +38,11 @@ ruby_add_rdepend "
 	imagemagick? ( >=dev-ruby/rmagick-2.14.0 )
 	ldap? ( >=dev-ruby/ruby-net-ldap-0.12.0 )
 	markdown? ( >=dev-ruby/redcarpet-3.3.2 )
+	mysql? ( dev-ruby/mysql2:0.4 )
 	passenger? ( www-apache/passenger )
+	postgres? ( dev-ruby/pg:0 )
+	sqlite? ( dev-ruby/sqlite3 )
 	"
-# TODO add USE doc and test
-#ruby_add_bdepend ">=dev-ruby/rdoc-2.4.2
-#	dev-ruby/yard
-#	test? (
-#		>=dev-ruby/shoulda-3.3.2
-#		>=dev-ruby/mocha-0.13.3
-#		>=dev-ruby/capybara-2.0.0
-#	)"
 
 REDMINE_DIR="/var/lib/${PN}"
 
@@ -60,7 +52,7 @@ pkg_setup() {
 }
 
 all_ruby_prepare() {
-	rm -r log files/delete.me Gemfile || die
+	rm -r log files/delete.me || die
 
 	# bug #406605
 	rm .{git,hg}ignore || die
@@ -73,7 +65,21 @@ all_ruby_prepare() {
 	# remove ldap staff module if disabled to avoid #413779
 	use ldap || rm app/models/auth_source_ldap.rb || die
 
-	eapply "${FILESDIR}/${PN}-3.4.3_requires.patch"
+	# Fixing versions in Gemfile
+	eapply "${FILESDIR}/${P}_gemfile_versions.patch"
+
+	sed -i -e "/group :development do/,/end$/d" Gemfile || die
+	sed -i -e "/group :test do/,/end$/d" Gemfile || die
+
+	if ! use imagemagick ; then
+		sed -i -e "/group :rmagick do/,/end$/d" Gemfile || die
+	fi
+	if ! use ldap ; then
+		sed -i -e "/group :ldap do/,/end$/d" Gemfile || die
+	fi
+	if ! use markdown ; then
+		sed -i -e "/group :markdown do/,/end$/d" Gemfile || die
+	fi
 }
 
 all_ruby_install() {
@@ -206,7 +212,7 @@ pkg_config() {
 		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake db:migrate || die
 		einfo "Populating database with default configuration data."
 		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake redmine:load_default_data || die
-		chown redmine:redmine "${EROOT%/}var/log/redmine/*.log" || die
+		chown redmine:redmine -R "${EROOT%/}var/log/redmine/" || die
 		einfo
 		einfo "If you use sqlite3, please do not forget to change the ownership"
 		einfo "of the sqlite files."
diff --git a/www-apps/redmine/redmine-3.3.6.ebuild b/www-apps/redmine/redmine-3.4.5.ebuild
index c3b226cd21c4..d78641a9295b 100644
--- a/www-apps/redmine/redmine-3.3.6.ebuild
+++ b/www-apps/redmine/redmine-3.4.5.ebuild
@@ -2,8 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-# ruby24 don't have required deps
-USE_RUBY="ruby22 ruby23"
+USE_RUBY="ruby23 ruby24"
 inherit eutils depend.apache ruby-ng user
 
 DESCRIPTION="Flexible project management web application using the Ruby on Rails framework"
@@ -13,10 +12,7 @@ SRC_URI="https://www.redmine.org/releases/${P}.tar.gz"
 KEYWORDS="~amd64"
 LICENSE="GPL-2"
 SLOT="0"
-# All db-related USEs are ineffective since we depend on rails
-# which depends on activerecord which depends on all ruby's db bindings
-#IUSE="ldap openid imagemagick postgres sqlite mysql fastcgi passenger"
-IUSE="imagemagick fastcgi ldap markdown passenger"
+IUSE="imagemagick fastcgi ldap markdown mysql passenger postgres sqlite"
 
 ruby_add_rdepend "
 	dev-ruby/actionpack-action_caching
@@ -42,16 +38,11 @@ ruby_add_rdepend "
 	imagemagick? ( >=dev-ruby/rmagick-2.14.0 )
 	ldap? ( >=dev-ruby/ruby-net-ldap-0.12.0 )
 	markdown? ( >=dev-ruby/redcarpet-3.3.2 )
+	mysql? ( dev-ruby/mysql2:0.4 )
 	passenger? ( www-apache/passenger )
+	postgres? ( dev-ruby/pg:0 )
+	sqlite? ( dev-ruby/sqlite3 )
 	"
-# TODO add USE doc and test
-#ruby_add_bdepend ">=dev-ruby/rdoc-2.4.2
-#	dev-ruby/yard
-#	test? (
-#		>=dev-ruby/shoulda-3.3.2
-#		>=dev-ruby/mocha-0.13.3
-#		>=dev-ruby/capybara-2.0.0
-#	)"
 
 REDMINE_DIR="/var/lib/${PN}"
 
@@ -61,7 +52,7 @@ pkg_setup() {
 }
 
 all_ruby_prepare() {
-	rm -r log files/delete.me Gemfile || die
+	rm -r log files/delete.me .github || die
 
 	# bug #406605
 	rm .{git,hg}ignore || die
@@ -74,7 +65,21 @@ all_ruby_prepare() {
 	# remove ldap staff module if disabled to avoid #413779
 	use ldap || rm app/models/auth_source_ldap.rb || die
 
-	eapply "${FILESDIR}/${PN}-3.4.3_requires.patch"
+	# Fixing versions in Gemfile
+	eapply "${FILESDIR}/${P}_gemfile_versions.patch"
+
+	sed -i -e "/group :development do/,/end$/d" Gemfile || die
+	sed -i -e "/group :test do/,/end$/d" Gemfile || die
+
+	if ! use imagemagick ; then
+		sed -i -e "/group :rmagick do/,/end$/d" Gemfile || die
+	fi
+	if ! use ldap ; then
+		sed -i -e "/group :ldap do/,/end$/d" Gemfile || die
+	fi
+	if ! use markdown ; then
+		sed -i -e "/group :markdown do/,/end$/d" Gemfile || die
+	fi
 }
 
 all_ruby_install() {
@@ -207,7 +212,7 @@ pkg_config() {
 		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake db:migrate || die
 		einfo "Populating database with default configuration data."
 		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake redmine:load_default_data || die
-		chown redmine:redmine "${EROOT%/}var/log/redmine/*.log" || die
+		chown redmine:redmine -R "${EROOT%/}var/log/redmine/" || die
 		einfo
 		einfo "If you use sqlite3, please do not forget to change the ownership"
 		einfo "of the sqlite files."
diff --git a/www-apps/wordpress/Manifest b/www-apps/wordpress/Manifest
index 94be4c8731d6..f8ffbaff0cfe 100644
--- a/www-apps/wordpress/Manifest
+++ b/www-apps/wordpress/Manifest
@@ -1,5 +1,5 @@
 AUX postinstall-en.txt 1554 BLAKE2B 0a6e291b6d590e03fe4702a9e01f88a59fc4d820f95b4e7541d03f32dc397f86de694de73c5d9d8910e30a7f7f49f59b5f918b75ff16f537f9fd0931052e3e57 SHA512 d03a9da686ea1806e0583706af271738fa0b912cf7d718c096e2efbdb03b178e5b4137ec6ba5d91d85ca71f3403ca45e61eb992467cf05846e02dc10f5bbb03c
 AUX postupgrade-en.txt 1653 BLAKE2B cf2e403046ff8646b7dfffaec7c267633fa735f1be7448f76c9bfeefb2372c169453123db169d70bf871dc4c1ee1a239aeb17a25a1de582b23b38a7d589fd1c2 SHA512 3fa8b143a4cd8e23798423427ec31174947eeccfdbc5611dca3b32e02484f68602713dd75c3153db344de4151de1924fbaa6807e360fddeda79fa0dc70005913
-DIST wordpress-4.9.5.tar.gz 8565154 BLAKE2B 3578b3fc2af646b8bcac11900f7a7a5b06dd51ed3cd5fae5e247b212714914e2b1783e8b516b7ac129ed012b88a562c9a87884f66630166c01900e9f997d7b5a SHA512 958345a97429012dc17ee8223076539cbbe4a6f3daf057249be96b2b5be5ee97b5d2ad9031a748e22771eec3da890597fe2269fdc4c31d3389d7bdd79a904b80
-EBUILD wordpress-4.9.5.ebuild 1263 BLAKE2B 8dd8a3be63b647649417f0ad97f5c31039ddec6c200cb34679cebc74bcf35ba6c79a568e2d3f3a1e3a3f5abc2799b1ccb99f3f8eef88d6e9821b952794d40583 SHA512 9026b3ea5f9f341cd2c7cb531ed546b8e87c0520a9bc8e5207db83fb1457b220d7a62d3b46bbd9cf56f990f62965e20ab4f29f2e1cc9a4b4e0e61b880d2ad2c7
+DIST wordpress-4.9.6.tar.gz 8740389 BLAKE2B 827f4cf4e1c664ee04588e189bb744b10ab0abbee0434d64c2ed65cb0ec289869b26f5ef6ae067a67f308e8f3a5b139c2d905897c0ed5be40eb2166ec3939a61 SHA512 93b5c6373968925f4773b79990ee73508c4994dc5ef4387c8d88dc7d39ae3688d4e066887870731e0b4e1d84a1c027cdc62239b3e042c133eb32a03229d48335
+EBUILD wordpress-4.9.6.ebuild 1263 BLAKE2B 8dd8a3be63b647649417f0ad97f5c31039ddec6c200cb34679cebc74bcf35ba6c79a568e2d3f3a1e3a3f5abc2799b1ccb99f3f8eef88d6e9821b952794d40583 SHA512 9026b3ea5f9f341cd2c7cb531ed546b8e87c0520a9bc8e5207db83fb1457b220d7a62d3b46bbd9cf56f990f62965e20ab4f29f2e1cc9a4b4e0e61b880d2ad2c7
 MISC metadata.xml 392 BLAKE2B 736fb06bba21342a9cdd29ce815b1325098bc11798675534a4d299bcbaeb29f46d1eab8bebd90e2539187e82294510d06827ac068611797ad441e7c024bee6b8 SHA512 f63f0ac7c836f4f8c21d69b021d6e4d6f4257f80fd1995f180509379c7ab82028a89d1be22a381e36aad34b21d94e29c2471b48d6b31dd1a634150991e7b6c33
diff --git a/www-apps/wordpress/wordpress-4.9.5.ebuild b/www-apps/wordpress/wordpress-4.9.6.ebuild
index 19231ee76d17..19231ee76d17 100644
--- a/www-apps/wordpress/wordpress-4.9.5.ebuild
+++ b/www-apps/wordpress/wordpress-4.9.6.ebuild