gentoo resync : 25.01.2018

23 files changed, 233 insertions, 450 deletions

diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 15869c9cf9fa..3bedc9710b92 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/icingaweb2/Manifest b/www-apps/icingaweb2/Manifest
index 242c6f7218a6..c16bbd2396a2 100644
--- a/www-apps/icingaweb2/Manifest
+++ b/www-apps/icingaweb2/Manifest
@@ -1,6 +1,8 @@
 DIST icingaweb2-2.4.2.tar.gz 7180122 BLAKE2B d3018ab2bbb9cbe501c638208d7546640b83775ef86e340b61c9a83bc8f250060c34a7dae74cc983252ff05747d951107ff5c7857aaa44dc387ce513843c503f SHA512 2a6f80561b59fde1b7ca72b8a120f93685a4741e7af036a90cdd5a1371f8e6d6caa25161f136b379255032b16b21914325a26f078121743d1299e96e7685ef53
 DIST icingaweb2-2.5.0.tar.gz 8032968 BLAKE2B f0fab047da90ff514f715a8ddbf51d97beb1cd052513a523c63fbb97a424ecee8ff7b2c63a6e432cda3d70bdb1283641702d3ae1ff4146d084b312009ccdbe5e SHA512 9946c74033550accdc7077b3f77ce035931c72645871808ea488113d3545f8082460c1b8a4dffcb08f01d452fab54fd425e90e77cd006a7783b426132015498f
+DIST icingaweb2-2.5.1.tar.gz 8133540 BLAKE2B f5f9d2131f87160f7df5b34cae7e9b1036e14994f3b739607b26ba676e6cd56ad95ed5688c873df3232fc9782566b0bb5c2054aa04dd272b389a1eae8501af88 SHA512 8e76347f76a2b2889fb9a61c000ef7865f40b2ea261f59bfbf24bb8d0e4e7e2977ff283d31989f6892e371f4a9a4d4682a2cac3269070b2036cc37ea74af1b11
 EBUILD icingaweb2-2.4.2.ebuild 2549 BLAKE2B b20f1ce38a44e2066fe321d6d8a86a95976a52648c2d4ba0e24073e2040a755634c9747708c384fa29855e1ce3ab088eb39a9b644547fbed5d78632e239246db SHA512 45e388216b6b4b25facf2a46fed4385f47455023cdc6fff6586a8801c6f1aabc7a13e1330f9e6a56e3acd9f4c7bce724411049fb0245aa6d3295c0dba45e6c33
 EBUILD icingaweb2-2.5.0.ebuild 2549 BLAKE2B b20f1ce38a44e2066fe321d6d8a86a95976a52648c2d4ba0e24073e2040a755634c9747708c384fa29855e1ce3ab088eb39a9b644547fbed5d78632e239246db SHA512 45e388216b6b4b25facf2a46fed4385f47455023cdc6fff6586a8801c6f1aabc7a13e1330f9e6a56e3acd9f4c7bce724411049fb0245aa6d3295c0dba45e6c33
+EBUILD icingaweb2-2.5.1.ebuild 2551 BLAKE2B 26e99debb6314b95d285171683ef789e0b0d3d7a6368c0c29c6e182d4179f2fbeaf080f4807710c7b160a47088fe969bb9d374ea81ce31d497514f25b32d36e2 SHA512 fa11545bb44db98cb2ca1ff33ad1185990c8d5ee0a15a26db86a47cf77564099576ddcd79eb21467846d46554c8b29024d41bba06325adba7d9bc5854a6654c2
 EBUILD icingaweb2-9999.ebuild 2546 BLAKE2B a5a883a093e6a88e99d357b65a5d7367719d40fa98d7d8ab530147631448f033ec0858481575bb5a981f0126bf650d7862ea5c283ff9add93325ec640b28034c SHA512 fa08a2c6d47a9b1df8027dba57b7b8be8bad1980af3c45af52203435dc98ce28b47ec211691e241bda8913dcd77370004ef1b24622fabae8cc3d510f3f9decbc
 MISC metadata.xml 407 BLAKE2B 42e1ae67b6d8307c3af6ee7257eb811d893705aedd5852c4b33b103d77bbb4858d01bf8369511d7ce1cc187158482755894583d3b77be0ca7580043279f96461 SHA512 40eb3b6ff856fb8a4bcced4b177c73e4a7987b468dbcfe645d4a9f816f100ce899c8f8f803ad343c2b33b60cbcfbd4cef37257548311d22b4272a15602b1c961
diff --git a/www-apps/icingaweb2/icingaweb2-2.5.1.ebuild b/www-apps/icingaweb2/icingaweb2-2.5.1.ebuild
new file mode 100644
index 000000000000..f3513d784a28
--- /dev/null
+++ b/www-apps/icingaweb2/icingaweb2-2.5.1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit depend.apache eutils multilib user
+
+DESCRIPTION="Icinga Web 2 - Frontend for icinga2"
+HOMEPAGE="http://www.icinga.org/"
+SRC_URI="https://codeload.github.com/Icinga/${PN}/tar.gz/v${PV} -> ${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="apache2 ldap mysql nginx pdf postgres"
+REQUIRED_USE="^^ ( apache2 nginx )"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=">=net-analyzer/icinga2-2.1.1
+		dev-php/pecl-imagick
+		pdf? ( media-gfx/imagemagick[png] )
+		apache2? (
+			>=www-servers/apache-2.4.0
+			|| (
+				dev-lang/php:5.6[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
+				dev-lang/php:7.0[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
+				dev-lang/php:7.1[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
+			)
+		)
+		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]
+				dev-lang/php:7.0[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
+				dev-lang/php:7.1[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
+			)
+		)"
+RDEPEND="${DEPEND}"
+
+want_apache2
+
+pkg_setup() {
+	depend.apache_pkg_setup
+
+	enewgroup icingaweb2
+	enewgroup icingacmd
+	use nginx && usermod -a -G icingacmd,icingaweb2 nginx
+	use apache2 && usermod -a -G icingacmd,icingaweb2 apache
+}
+
+pkg_config() {
+	if [[ -d /etc/icingaweb2 ]] ; then
+		einfo "Updating existing installation ..."
+	else
+		einfo "Running first time setup ..."
+		einfo "Creating configuration directory ..."
+		/usr/share/${PN}/bin/icingacli setup config directory
+		einfo "Creating authentication token for web setup ..."
+		/usr/share/${PN}/bin/icingacli setup token create
+		if use apache2 ; then
+			einfo "The following might be useful for your Apache2 configuration:"
+			/usr/share/${PN}/bin/icingacli setup config webserver apache --document-root /usr/share/${PN}/public
+		fi
+		if use nginx ; then
+			einfo "The following might be useful for your NGinx configuration:"
+			/usr/share/${PN}/bin/icingacli setup config webserver nginx --document-root /usr/share/${PN}/public
+		fi
+	fi
+	einfo "All done."
+}
+
+src_install() {
+	insinto "/usr/share/${PN}"
+	doins -r "${S}"/*
+	fperms -R a+rX "/usr/share/${PN}/public/"
+	fperms u+x,g+x "/usr/share/${PN}/bin/icingacli"
+}
+
+pkg_postinst() {
+	einfo "Run 'emerge --config =${CATEGORY}/${PF}' to finish setup."
+}
diff --git a/www-apps/jekyll-coffeescript/Manifest b/www-apps/jekyll-coffeescript/Manifest
index 342a6146a16a..2dcbee078159 100644
--- a/www-apps/jekyll-coffeescript/Manifest
+++ b/www-apps/jekyll-coffeescript/Manifest
@@ -1,5 +1,3 @@
-DIST jekyll-coffeescript-1.0.1.tar.gz 5206 BLAKE2B 7f67794efca76ac32230f1e8098d19b9b197542f5bc781c6a8eb80cf024caf3a8cab6c3c07c8470b58b09194ccfe7dd28fc4897e6708d5407b67ba245c72a66c SHA512 88c73c2393dff2b9dc8aac2329f6e669f98c66c5d1b7ee2a4dc2236608197a3bfdc07bd4a67832c94f4059e4c82212b2b14c4f37b48957e4b40c9d2449c7c482
 DIST jekyll-coffeescript-1.0.2.tar.gz 5042 BLAKE2B 1a08099b940118e15f5f2310671efe1cc61fc496242c94a3351654870518095d62f576922f1bbf882a64f7bbca6b9b00e1f692f00684f0a5c60005a5fb86c69b SHA512 cc8e3fc21d9ff0b4c0fb00652e8a8011fbb535f6c1b51c0c380637cb124524282f6ef5272e82976f964c5eae66a8340bd11f516f6625732d9ee51ef6c58b3a8f
-EBUILD jekyll-coffeescript-1.0.1.ebuild 802 BLAKE2B e3dfb60edfd8d28fd303d0a57698f3bcc49b1301ba5d03e09308eefa7c6d799a030b2df8d08426848890de40a33e162ff862439cae2f941aaefa318ac8fa51c8 SHA512 a0d3dd6c935e0cd02ef8068291a93b97af00c4c8b37d8f013e443b3e72e10772a9ce7f8ac5b9a6111d3b4af6db45884ec7bb99adf1878a5da6b374a8a43c8997
 EBUILD jekyll-coffeescript-1.0.2-r1.ebuild 855 BLAKE2B a5b431c54dc590e943f785d902d71e72427defe36d4b204abf98b16e07e3150d3799d1d14839c931cba007b58fad2cd5286046a87e99a8d8634178abbb109bda SHA512 deee794f3b9b5c09e93243959976c5bc637be2b4753b44a5690594c37c5d07fdc473ea65316fcf1374cb45234d6c75e959d77cb1a2ab16ee744e2c1fa3bc0c6a
 MISC metadata.xml 338 BLAKE2B 224b7454b4b3fb88128aafe4b0980619f366f5c5151d14f801bda08f2457c9a9bcac20767070cc4240ffcaed43b62382a14bc886d17a4259a9c7b9ecb0b6cb0b SHA512 01c630c47335166243996a64160cce9820e4b46086ccfba65c9ea6455c69ff94c3a0ab8760993b49e80f0f36d8375af02bc1774fba9fa020cdf7dc87c23bfded
diff --git a/www-apps/jekyll-coffeescript/jekyll-coffeescript-1.0.1.ebuild b/www-apps/jekyll-coffeescript/jekyll-coffeescript-1.0.1.ebuild
deleted file mode 100644
index 1b1c70de2aa0..000000000000
--- a/www-apps/jekyll-coffeescript/jekyll-coffeescript-1.0.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby21 ruby22"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-RUBY_FAKEGEM_EXTRADOC="README.md History.markdown"
-RUBY_FAKEGEM_TASK_DOC=""
-
-inherit ruby-fakegem
-
-SRC_URI="https://github.com/jekyll/jekyll-coffeescript/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-DESCRIPTION="A CoffeeScript Converter for Jekyll"
-HOMEPAGE="https://github.com/jekyll/jekyll-coffeescript"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/d' Rakefile || die
-	sed -i -e "/^RSpec/i \
-		require 'jekyll'"\
-		-e "/^RSpec/i \
-		require 'jekyll-coffeescript'" spec/spec_helper.rb || die
-}
-
-ruby_add_rdepend "dev-ruby/coffee-script"
-ruby_add_bdepend "test? ( www-apps/jekyll )"
diff --git a/www-apps/jekyll-sass-converter/Manifest b/www-apps/jekyll-sass-converter/Manifest
index b52e49bd1c89..a87eb8906dd3 100644
--- a/www-apps/jekyll-sass-converter/Manifest
+++ b/www-apps/jekyll-sass-converter/Manifest
@@ -1,5 +1,3 @@
-DIST jekyll-sass-converter-1.4.0.tar.gz 7986 BLAKE2B 2198304c0f60fce68c60699e04556fea5961b771122bba54728b5fda6bb521915c6a8ace94aa975b7f91508b7edd7d728dfde7dad144b276e3e3affc53467f30 SHA512 2ba7a10b687aa1cdd193c85c70efc15b9ff97987e29b7c591382c706a7d6a588c376995858ab0b1aff38b118eef9fd71c2175a1e6f9a3bc396966fdf13949d1b
 DIST jekyll-sass-converter-1.5.0.tar.gz 8516 BLAKE2B 78b4c49f2d49f28f1c7f02fe808ab98644cb9143038c179bbdb872bf8b8d45cbba84bd73da924a61e661d7d22ba26f2715531146ec8169089729046f196be403 SHA512 ece83d8c13e93a90c66ed899accc77746d56067f6841ca0d29050168c52d9eea6de3d78760b0f468be2dbc9b0b9df5ac02d5066a26809a33cdadd591fbbc9b52
-EBUILD jekyll-sass-converter-1.4.0.ebuild 597 BLAKE2B 1bfb30c94a43f7b5b43e215409f7848ba4f15abecd26135c1a207ebcc1a717c074ea7ebe28233e18a3d764de8e68600e768cc2c39bbdc4ada7d7272e406a91a4 SHA512 e2380e6780cda0c7b49ce7a78fb4ba643bd6d22867ec5b7c93ad0cb4ce96e8e0cabe0794c30d4f9074456ebaffe4cf556bb0290d1888f6f3e54ecc08b99b10ec
 EBUILD jekyll-sass-converter-1.5.0.ebuild 688 BLAKE2B 8f8ed5094888b162e964e89849c4d60389f475471081b979a31977b63b4b60b29c2b04015ecfe1decaf78d7366cff3ed7469daf8f36dbb423377d7f37c6a7b87 SHA512 0e20ff537f10b709ad3546c3265832e89d0f9418aa6a74e460f3e959e5a2f19834514a74a4a3febaa181b05baf02e5e033c4b5a32c16f1eab8d8be52e274c605
 MISC metadata.xml 340 BLAKE2B 2e117f6e85b11458811aa3cab607946ca1baaf9b6022c02d1ffffa62da6be9443624e31642a6bc793a0fda23c6b84c91df7f4413de7ea84217fd984c7a5c4a58 SHA512 db6a48ae69a3e29603aa912dbc716f790f4d47e33a2fa416d71716b34f75122ae9f28d17fb97bdc1472e71f3dc311087443ed494c4e06eb500c4345c5cf37603
diff --git a/www-apps/jekyll-sass-converter/jekyll-sass-converter-1.4.0.ebuild b/www-apps/jekyll-sass-converter/jekyll-sass-converter-1.4.0.ebuild
deleted file mode 100644
index b109b85567e7..000000000000
--- a/www-apps/jekyll-sass-converter/jekyll-sass-converter-1.4.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby21 ruby22"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md History.markdown"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A basic Sass converter for Jekyll"
-HOMEPAGE="https://github.com/jekyll/jekyll-sass-converter"
-SRC_URI="https://github.com/jekyll/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/sass:3.4"
-ruby_add_bdepend "test? ( >=www-apps/jekyll-2 )"
diff --git a/www-apps/jekyll-sitemap/Manifest b/www-apps/jekyll-sitemap/Manifest
index 1ab6f08ddc9e..3889d1d7ae04 100644
--- a/www-apps/jekyll-sitemap/Manifest
+++ b/www-apps/jekyll-sitemap/Manifest
@@ -1,3 +1,3 @@
 DIST jekyll-sitemap-0.11.0.tar.gz 64238 BLAKE2B eb3226d344972c82d328faf4149886d760bf240da1be36b878c9e9334a30b4b75954c0ea35acfe1d3fc0e638630376287ffe4c37dcbdbdd198632f280ff2959e SHA512 ba1bb162586b8383b1ede68e86cec73db023400586e373572aa8e7c3e26ef1024d313ce59aa1f7711b2b34ba08220be99d5bfeb0ea804e1a1091c0953f8de095
-EBUILD jekyll-sitemap-0.11.0.ebuild 625 BLAKE2B 99fdca4841c7c332201fe0f51c6c42bc37987ea744e9be255349e214708a4d5ac6313135adb8bcd903d77f5d33c7e59c50e6dd54352f1e056be79009857a9de8 SHA512 5835dcbb38496198e35fc20bf9e980f7e7f24701ce078f9fb6db00f2174ac2b90961732c5e078d2becdd3f390aaf635485a8ebb1621e98cfa3d71cd7665f5296
+EBUILD jekyll-sitemap-0.11.0.ebuild 625 BLAKE2B 4cd63b306b9d8164115ed5755399fa27b32aa7decdc3a3cd0cec41a8a8076459309d972c3fdac74f5abf0d5afa3cbe5933d7db267a97a281aaaefc707b23298e SHA512 55bd43adbc04d14f9aada76dd798e9fcbc90e90c851a77f7640fc80b11cc48a937a7b538fcb810cdf6f1cac4c2bb256d7dca23333fc1f3938b8165dddc8f8c50
 MISC metadata.xml 253 BLAKE2B 04790d797238d114af848d448e7edfc2a4e14c62b472a24e1097cf831989b0042e4c6770e8a63d7285f4245dfce2787887f2db04d175923037a064c28b192490 SHA512 03899ba135dd5ebedf0c0157aeb74d2facdedbc4ea842a1f9133c0f20b8c49596dacc8f376810fe133ed8571adc0acee4dfd854bcf5f33b3f5c2a1d116250712
diff --git a/www-apps/jekyll-sitemap/jekyll-sitemap-0.11.0.ebuild b/www-apps/jekyll-sitemap/jekyll-sitemap-0.11.0.ebuild
index e9a53768800b..ac5b7cd2617b 100644
--- a/www-apps/jekyll-sitemap/jekyll-sitemap-0.11.0.ebuild
+++ b/www-apps/jekyll-sitemap/jekyll-sitemap-0.11.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby21 ruby22"
+USE_RUBY="ruby22 ruby23"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/www-apps/jekyll-watch/Manifest b/www-apps/jekyll-watch/Manifest
index 2ac667571020..5cac785b99e2 100644
--- a/www-apps/jekyll-watch/Manifest
+++ b/www-apps/jekyll-watch/Manifest
@@ -1,5 +1,3 @@
-DIST jekyll-watch-1.3.1.tar.gz 14735 BLAKE2B 273d7418c2d9d001c6fcde0dc1430e8c8dfaa92556305578b6f9597701467f28363550dc504402206e169590f927d63fb44259d49941ce7ff466f55ce809665a SHA512 ce54f4367cd2c5a63ce823b234584a84798fe0234165cb038f3af301b7ddef39ef1a983aad41843e51d1af9366e495a83112f6b55bd58127d1c95eaf5600eee4
 DIST jekyll-watch-1.5.0.tar.gz 15076 BLAKE2B 1270f309fed8e4aff6712fdad1554b9ed6e4d0936512c8c80a6b1d77977411fd74c099d361a7c7a3ce785e794beeca7d865e17f9fa25f0b4d889e861614b5c8b SHA512 98c9df7f92c214b0047cf266e06c48350615836af3b7ea69e1f77b10d26e4ed441fdbbdc16e557ef2293fe5ab1314ed71bb3e0e65e3f1ad4c4224f71e1255c95
-EBUILD jekyll-watch-1.3.1.ebuild 671 BLAKE2B a8763780250d9689f8517a40edfcb979fe8ea552acf8ac494e86fb71089ccc8ee530cc34c1f3ccac2b091499c31dda764a3b2c7e6bce989bf68bfe8cedd183d0 SHA512 1f09a81007da1bfd4c698a189fb04c5a421bd372b0c3381590cb21f09ce442cd8b401bc9e27081aa08343bb1069ad8e64ad118d68deef13c3fded4af6b9b7828
 EBUILD jekyll-watch-1.5.0.ebuild 671 BLAKE2B 9705a331e0de3c2e660284195c9703a45fab18217a1a35dd5356702a279e2d8e9cfe4728566613f1b0d48a9793de919a79c216079200d6c146ba29caf61d40ae SHA512 38a1e258fa088e7e09ae02fb8342cdb3c9820d5a4b48c5a7071fbb8d5e2afae1de7f54bfe4de9b581c9ca128a1ba1cea619a2acec4c7d42c127c682681ff8fd7
 MISC metadata.xml 331 BLAKE2B c43bc1213adee987e9bd55089f8f5fa00f5de2461fe584b8715332d7ace822a5b0ffc47a2af7001e5c134ff20d9a3580d2225dacee73e4fbdadc1735cbe806a6 SHA512 53a2e135c948ee84fdf2f7ad1583d658636ea1077b80b6e2ab52c10615ceb5a30ac4a400c213e5fff5f4effdee0acd4afc8653adbca80178815f1fdfd3620004
diff --git a/www-apps/jekyll-watch/jekyll-watch-1.3.1.ebuild b/www-apps/jekyll-watch/jekyll-watch-1.3.1.ebuild
deleted file mode 100644
index ce293cf48f3a..000000000000
--- a/www-apps/jekyll-watch/jekyll-watch-1.3.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby21 ruby22"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md History.markdown"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Rebuild your Jekyll site when a file changes with the --watch switch"
-HOMEPAGE="https://github.com/jekyll/jekyll-watch"
-SRC_URI="https://github.com/jekyll/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/listen-3.0"
-ruby_add_bdepend "test? ( >=www-apps/jekyll-2 )"
-
-all_ruby_prepare() {
-	rm Rakefile || die
-}
diff --git a/www-apps/jekyll/Manifest b/www-apps/jekyll/Manifest
index 104ad1823c2c..62bd9ab956be 100644
--- a/www-apps/jekyll/Manifest
+++ b/www-apps/jekyll/Manifest
@@ -1,6 +1,4 @@
 AUX jekyll-3.6.0-test-helper.patch 657 BLAKE2B 8e9d9bb57efa2370976d459dac772f7f41c0bf02c2fc0c71f19d4b78714e06f96d8a800a45f7c3eca80f766639036a624df24e681a9258e4bdc76bfb563498ad SHA512 7b53cd03a988cc5c949d15be8de91ffd37d4f228822cc3bec64c961c163ba60946df1d314bdf746a33a42df091f06f481f945a712515cca04539e111393246d0
-DIST jekyll-3.2.1.tar.gz 1010949 BLAKE2B 1efb4fd56c147e6fc30d8f617d55dcd02893c67a961376f81ba3c971a3e46495ada3f1af8445e682e07a48dd4b1466493fa3e137731645e799ac3e4f949c70e7 SHA512 36360e852b8438ae12a64320514204c7b0f8bc53d6cb04f6024a25d5294f562c37c1464fc0e632502814d8e2dd0900877b48c3ccb0046d7c6a145bb1dae37b48
 DIST jekyll-3.6.0.tar.gz 737199 BLAKE2B b823d794c5f4e0fb78276d2af28821a7ac67b13159832cbda3a691ad0f9e32c2228da1dde22a0ee33890ffb8384ac6d92adbb7b47629f98dda1d92024488475a SHA512 87c17c31cda44d040308079aacbcdba1e704186a69d64c1240a44960f7a79e74b35bb230be7c14419bb89843cfbf48ecf3601a8018df2255deebc0afdb4fcd86
-EBUILD jekyll-3.2.1-r2.ebuild 1591 BLAKE2B 4f99af1539470337ce0ceafa0cb3c20837c7057d2a383706ca214afce0480f673c1dc438b0ca3d6680e1c29f0d16a82fb0d6d6a664d90903e21d948725c04a85 SHA512 0580069c7f6bc00525f62d38d7b6bf140aa9582f7a808569da8488f3b5649327594048486b86de6d6f752c720de5911ca6cef78376073b40689eba5c197b2f4e
 EBUILD jekyll-3.6.0.ebuild 2060 BLAKE2B e4cc457be60914fc5ed7a2c01367026a8101ae3993b5596e8c0c9692019291ec4bd271437880057b36b78d5b953d2d3e614f0fed6f34046caff92a729a3818f9 SHA512 1d468fa1ee943368d07eeb8f2d303a4cace987838e501d4b5e773cf18782a0c44399611cd7ceb351b75aafd771ccebf7281475e6cf388da940a9f0fa516a06fc
 MISC metadata.xml 325 BLAKE2B c29145c8eacfee5164b55192ebd77d0b4134179380ac4c5f0ac29b1f708dc0cb1d91748ad68aca73380466451efcfe03c1115ebc706c16a70b527b2e3360a7d2 SHA512 02b93ff17a615bde6a2074bed7dc0d64c0cea0d11002e48fe5a132b3d8044c0329a5a69f62f917eadf8fb090ef1ea7ce99bd78496fd738a1d327599dde7582e2
diff --git a/www-apps/jekyll/jekyll-3.2.1-r2.ebuild b/www-apps/jekyll/jekyll-3.2.1-r2.ebuild
deleted file mode 100644
index 9e1b4a117d46..000000000000
--- a/www-apps/jekyll/jekyll-3.2.1-r2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby21 ruby22"
-
-inherit ruby-fakegem
-
-RUBY_FAKEGEM_EXTRADOC="README.markdown History.markdown"
-RUBY_FAKEGEM_EXTRAINSTALL="features site"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_BINDIR="exe"
-
-DESCRIPTION="A simple, blog aware, static site generator"
-HOMEPAGE="http://jekyllrb.com https://github.com/jekyll/jekyll"
-SRC_URI="https://github.com/jekyll/${PN}/archive/v${PV}.tar.gz  -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-ruby_add_rdepend ">=dev-ruby/colorator-1.0
-	>=dev-ruby/kramdown-1.3
-	>=dev-ruby/liquid-3.0:3
-	>=dev-ruby/mercenary-0.3.3
-	>=dev-ruby/pathutil-0.9
-	>=dev-ruby/safe_yaml-1.0
-	>=dev-ruby/rouge-1.7:0
-	>=www-apps/jekyll-sass-converter-1.0
-	>=www-apps/jekyll-watch-1.1"
-
-ruby_add_bdepend "test? (
-		dev-ruby/rspec-mocks
-		dev-ruby/launchy
-		dev-ruby/mime-types:0
-		>=dev-ruby/rdiscount-2.0
-		>=dev-ruby/redcloth-4.2.1
-		>=dev-ruby/rouge-1.7
-		>=dev-ruby/shoulda-3
-		dev-ruby/test-unit:2 )"
-
-all_ruby_prepare() {
-	sed -i -e "/simplecov/,+5d"\
-		-e "1igem 'test-unit'"\
-		-e "1igem 'minitest', '~> 5.0'"\
-		-e "/reporters/d"\
-		-e "/profile/d"\
-		-e "/Reporters/,+4d" test/helper.rb || die
-	# Drop bundler
-	sed -i -e "/self.class.require_from_bundler/d" lib/jekyll/plugin_manager.rb || die
-	# This test fails without bundler
-	rm test/test_plugin_manager.rb || die
-	rm test/test_theme.rb || die
-	# Replace git command in gemspec
-	sed -i 's/git ls-files -z/find -not -type d -print0/' $RUBY_FAKEGEM_GEMSPEC || die
-}
diff --git a/www-apps/redmine/Manifest b/www-apps/redmine/Manifest
index 36978bc192bb..6ee8f9956108 100644
--- a/www-apps/redmine/Manifest
+++ b/www-apps/redmine/Manifest
@@ -1,13 +1,13 @@
 AUX 10_redmine_vhost.conf 343 BLAKE2B ef74d3feefb81ea29a85860e94ced42cc565058a9e57a1bdb7bc3581842c9543315852d47b9bed80ffbb94280f5f0264c05a552819f89bcc409118ccffd68865 SHA512 839a01abedd2977f79bde2a55041d4e3e3a72de1e04e2bdc4aa5169b3ec22adce12b2b39d4b991d6e034fcd13fbcd030cba5ecc69ae71a76f7f37d2cdde09edc
 AUX additional_environment.rb 322 BLAKE2B 26571ffcbc43431058a685000e00870ec41d266c4cdf46e077018bbbac34a5c818fccb19508c76dd56f53bc31d3e469e61302d36825ba36a5d851cfa73b0a0ef SHA512 1a4b649bc036372a47782a089c2b3db244ea4dd5437f2d931b6c7c4578f5aa104c8b8493da4a3f2874aac0380527604807ec2062525dcd392425b9b22c84f9bf
-AUX redmine-3.3.4_requires.patch 2632 BLAKE2B 8f309ae247dc6e063aa43463e8d1603a51ff8d8b6becc1ff87838b7e0e174100817e836d971f4cf619f5e06a3aac02ed5e11fd8a61885628aeabb7ebc48eede9 SHA512 737605cd5f8c8df9e8113204a49ce452908a75675d7c9682d4db455e9c852f881b5fa318e7f286727253ab56d7ced43c2b48b1066567ea2f6f1193c827da892e
+AUX redmine-3.4.3_requires.patch 3119 BLAKE2B 85a2f5d9aa8b3eb7467a846e9d56b8081d84fc4e08755474f3e5701a81afcb666d9cd8e5551f333b72c8959d022611c5c9e369e633f748605c22ad3b83a6299e SHA512 854d7e31be964eeea9cc3fd80dc246cad1713a3941f33ea46b27d0419bbc9dd7c017dfc31539542f65cf329ca72e6e278532912107e38f24dd9fab972d00a9a4
 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.8.tar.gz 2323001 BLAKE2B e86de553bf5177470440dc5669914bf0381cfd31caecb3ecb35869cbed376599f39770d18a0f4a74a2bc9e56f58dec4bbc803a0567c39b6c6de4adaf78d2f03d SHA512 3817fe98ca61326c5e4f3c3fa67540a38305275b9c24a1d74d869d713d4a582974cb2ea983016aace3625a8ebadec9354b8f1e028ed6ade2ba3ebf18a33de1dd
-DIST redmine-3.3.5.tar.gz 2368487 BLAKE2B 4588052ee2810f276b1c639f22d41f70e627979fa46debe1eb475f9bd60162d677c208e930cc8398e66644793c12547f4a61383ac44e8052d4233fa1eebd6bec SHA512 6471429eda15b5788d3d46f114ba63dcd30adfddf8b58b21ef206fa65c39dede1db6f11c7340560cf687f14dd46b64a40d934914f9edf2b58ba1fbd730eb304f
-DIST redmine-3.4.3.tar.gz 2442818 BLAKE2B a93b9ba62b56a3ad5549d41cfd02f33e8973399ca5fa900f6154634504496256552730cbc8d7e2a8e55b33518bb30ed613c4b226842a319c9b4eb9566b36d897 SHA512 27deb85916eb0285abd51e847037f213ebdcb5f16f57a19e7ff1d58eaed71a5c69695c707c12f2976d8dedc7aacb68bdf349c2d527e8312ce8c1c54d7af2db8d
-EBUILD redmine-3.2.8.ebuild 6825 BLAKE2B 2f9130e173130bdbbcd048b4832fe3cb66a99844b121753777594b90df5680256e78478c59e0151632651c6220e2b0083e92def2a4b9ffdc1ff704d70ca88aba SHA512 40c49274f3c31c527c0bebb4188af799c7b1fcd17315659593afa65a048cb796583edd7e28d57710fff03ac5811e85b967563f145c96008de4cd6acfe2e23379
-EBUILD redmine-3.3.5.ebuild 6569 BLAKE2B 61d5e7bfb015c36087340024fc2980a36ac4ebbfeb911879ff319a19a9887766748490fb5d70b87f74c4d3d644c7db9eff249ef7bdc61be02e7c3aaede399d8c SHA512 9bf99a73c5334feca2048c324bf78e9562aa702915481d9e7abfa12a5df23cbaa840ad02b5d5fad444030522977eccba3cb651f6c443e8cc2b63c2bcbc5e6acd
-EBUILD redmine-3.4.3.ebuild 6576 BLAKE2B 8b88685ec856e801f1f95047f9c121549a59412cb1c08494634e371375ab8d3858d907901c73fbe08a7731e54831112621b937099d3fde9af739f7a17345200d SHA512 7999fd691ef975ffd686d7a92ddbaa95c9b3bbbbffc050c565ef07f09a72808dae0dc63247e1bf75480afb98ad94187db7a91c2c45a96b81bfb0b5694a779f92
+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 6578 BLAKE2B 0455452412ad2a1883df471c933814d0d928f51377a4f7e6ed7ec84b1d702306fa0116427d8ca6f75266c0c0355dd3123eeec6414e059f2b222946e66367b636 SHA512 ba18f84e6d4cb9d98a01b3e0aa68ca89c80f326db4ae2e5546d4e6fbf1335460258b7d46b8888dfccd4d5bb492ed9c498dcd2d5156d143c035efdc442fac3695
 MISC metadata.xml 527 BLAKE2B 251acbf9246fd6c986b37b6320e78619036d30bc8e155e97a93a2c3ca99847eb39d7919ba94f633aa021462cd200dd156b6f7d3c1575151c1d6b38a4ee999bfa SHA512 156e0ee607ad0ae734a98fab405679c55de4e2a5d620cce564a7ac17e8a029869f66c3df6d2733eb8106f9732537355c72be7c7261209af196264d069788eed4
diff --git a/www-apps/redmine/files/redmine-3.3.4_requires.patch b/www-apps/redmine/files/redmine-3.3.4_requires.patch
deleted file mode 100644
index e4510839cf48..000000000000
--- a/www-apps/redmine/files/redmine-3.3.4_requires.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff -Nuar redmine-3.3.3-orig/app/controllers/application_controller.rb redmine-3.3.3/app/controllers/application_controller.rb
---- redmine-3.3.3-orig/app/controllers/application_controller.rb	2017-05-24 21:05:03.515966923 +0500
-+++ redmine-3.3.3/app/controllers/application_controller.rb	2017-05-24 21:07:22.629960174 +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.3.3-orig/app/controllers/welcome_controller.rb redmine-3.3.3/app/controllers/welcome_controller.rb
---- redmine-3.3.3-orig/app/controllers/welcome_controller.rb	2017-05-24 21:05:03.514966923 +0500
-+++ redmine-3.3.3/app/controllers/welcome_controller.rb	2017-05-24 21:08:14.895957638 +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
-   caches_action :robots
- 
-diff -Nuar redmine-3.3.3-orig/app/models/custom_field.rb redmine-3.3.3/app/models/custom_field.rb
---- redmine-3.3.3-orig/app/models/custom_field.rb	2017-05-24 21:05:03.513966923 +0500
-+++ redmine-3.3.3/app/models/custom_field.rb	2017-05-24 21:08:32.223956797 +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::SubclassFactory
- 
-diff -Nuar redmine-3.3.3-orig/app/models/mailer.rb redmine-3.3.3/app/models/mailer.rb
---- redmine-3.3.3-orig/app/models/mailer.rb	2017-05-24 21:05:03.514966923 +0500
-+++ redmine-3.3.3/app/models/mailer.rb	2017-05-24 21:05:47.039964812 +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.3.3-orig/config/application.rb redmine-3.3.3/config/application.rb
---- redmine-3.3.3-orig/config/application.rb	2017-05-24 21:05:03.689966915 +0500
-+++ redmine-3.3.3/config/application.rb	2017-05-24 21:05:35.723965361 +0500
-@@ -1,8 +1,8 @@
- require File.expand_path('../boot', __FILE__)
- 
- 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.3_requires.patch b/www-apps/redmine/files/redmine-3.4.3_requires.patch
new file mode 100644
index 000000000000..338f627adb1b
--- /dev/null
+++ b/www-apps/redmine/files/redmine-3.4.3_requires.patch
@@ -0,0 +1,73 @@
+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/redmine-3.3.5.ebuild b/www-apps/redmine/redmine-3.2.9.ebuild
index 80dcfc032480..c3b226cd21c4 100644
--- a/www-apps/redmine/redmine-3.3.5.ebuild
+++ b/www-apps/redmine/redmine-3.2.9.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
@@ -7,8 +7,8 @@ USE_RUBY="ruby22 ruby23"
 inherit eutils depend.apache ruby-ng user
 
 DESCRIPTION="Flexible project management web application using the Ruby on Rails framework"
-HOMEPAGE="http://www.redmine.org/"
-SRC_URI="http://www.redmine.org/releases/${P}.tar.gz"
+HOMEPAGE="https://www.redmine.org/"
+SRC_URI="https://www.redmine.org/releases/${P}.tar.gz"
 
 KEYWORDS="~amd64"
 LICENSE="GPL-2"
@@ -74,7 +74,7 @@ all_ruby_prepare() {
 	# remove ldap staff module if disabled to avoid #413779
 	use ldap || rm app/models/auth_source_ldap.rb || die
 
-	eapply "${FILESDIR}/${P}_requires.patch"
+	eapply "${FILESDIR}/${PN}-3.4.3_requires.patch"
 }
 
 all_ruby_install() {
diff --git a/www-apps/redmine/redmine-3.4.3.ebuild b/www-apps/redmine/redmine-3.3.6.ebuild
index d2e874a23beb..c3b226cd21c4 100644
--- a/www-apps/redmine/redmine-3.4.3.ebuild
+++ b/www-apps/redmine/redmine-3.3.6.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
@@ -7,8 +7,8 @@ USE_RUBY="ruby22 ruby23"
 inherit eutils depend.apache ruby-ng user
 
 DESCRIPTION="Flexible project management web application using the Ruby on Rails framework"
-HOMEPAGE="http://www.redmine.org/"
-SRC_URI="http://www.redmine.org/releases/${P}.tar.gz"
+HOMEPAGE="https://www.redmine.org/"
+SRC_URI="https://www.redmine.org/releases/${P}.tar.gz"
 
 KEYWORDS="~amd64"
 LICENSE="GPL-2"
@@ -20,7 +20,7 @@ IUSE="imagemagick fastcgi ldap markdown passenger"
 
 ruby_add_rdepend "
 	dev-ruby/actionpack-action_caching
-	dev-ruby/actionpack-xml_parser:*
+	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
@@ -74,7 +74,7 @@ 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.3.4_requires.patch"
+	eapply "${FILESDIR}/${PN}-3.4.3_requires.patch"
 }
 
 all_ruby_install() {
diff --git a/www-apps/redmine/redmine-3.2.8.ebuild b/www-apps/redmine/redmine-3.4.4.ebuild
index c0bd7c7e880f..c3b226cd21c4 100644
--- a/www-apps/redmine/redmine-3.2.8.ebuild
+++ b/www-apps/redmine/redmine-3.4.4.ebuild
@@ -1,13 +1,14 @@
-# Copyright 1999-2017 Gentoo Foundation
+# 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="http://www.redmine.org/"
-SRC_URI="http://www.redmine.org/releases/${P}.tar.gz"
+HOMEPAGE="https://www.redmine.org/"
+SRC_URI="https://www.redmine.org/releases/${P}.tar.gz"
 
 KEYWORDS="~amd64"
 LICENSE="GPL-2"
@@ -15,42 +16,41 @@ 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="ldap fastcgi passenger imagemagick"
+IUSE="imagemagick fastcgi ldap markdown passenger"
 
 ruby_add_rdepend "
-	dev-ruby/rubygems
-	>=dev-ruby/rails-4.2.5.2:4.2
-	>=dev-ruby/jquery-rails-3.1.4:3
-	>=dev-ruby/coderay-1.1.0
-	>=dev-ruby/builder-3.0.4:*
-	>=dev-ruby/roadie-rails-1.1.0
-	dev-ruby/mime-types:*
-	=dev-ruby/request_store-1.0.5
-	>=dev-ruby/rbpdf-1.19.0
 	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/redcarpet-3.3.2
-	>=dev-ruby/nokogiri-1.6.7.2
-	ldap? ( >=dev-ruby/ruby-net-ldap-0.12.0 )
-	>=dev-ruby/ruby-openid-2.3.0
 	>=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 )
-	imagemagick? ( >=dev-ruby/rmagick-2.14.0 )"
-	#	ruby_targets_ruby19? (
-#		postgres? ( >=dev-ruby/pg-0.11 )
-#		sqlite3? ( dev-ruby/sqlite3 )
-#		mysql? ( dev-ruby/mysql2:0.3 )
-#	)
-
+	"
+# 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
-#		<dev-ruby/nokogiri-1.6.0
 #	)"
 
 REDMINE_DIR="/var/lib/${PN}"
@@ -66,26 +66,20 @@ all_ruby_prepare() {
 	# bug #406605
 	rm .{git,hg}ignore || die
 
-	echo "CONFIG_PROTECT=\"${EPREFIX}${REDMINE_DIR}/config\"" > "${T}/50${PN}"
-	echo "CONFIG_PROTECT_MASK=\"${EPREFIX}${REDMINE_DIR}/config/locales ${EPREFIX}${REDMINE_DIR}/config/settings.yml\"" >> "${T}/50${PN}"
+	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
 
-	# Make it work
-	sed -i -e "1irequire 'request_store'" app/controllers/application_controller.rb || die
-	sed -i -e "18irequire 'action_controller'" -e "19irequire 'action_controller/action_caching'"\
-		app/controllers/welcome_controller.rb || die
-	sed -i -e "4irequire 'action_dispatch/xml_params_parser'" -e "/Bundler/d" config/application.rb || die
-	sed -i -e "18irequire 'protected_attributes'" app/models/custom_field.rb || die
-	sed -i -e "19irequire 'roadie-rails'" app/models/mailer.rb || die
+	eapply "${FILESDIR}/${PN}-3.4.3_requires.patch"
 }
 
 all_ruby_install() {
-	dodoc doc/{CHANGELOG,INSTALL,README_FOR_APP,RUNNING_TESTS,UPGRADING}
-	rm -r doc || die
-	dodoc README.rdoc
-	rm README.rdoc || die
+	dodoc doc/* README.rdoc
+	rm -r doc appveyor.yml CONTRIBUTING.md README.rdoc || die
 
 	keepdir /var/log/${PN}
 
@@ -128,7 +122,9 @@ all_ruby_install() {
 }
 
 pkg_postinst() {
-	if [ -e "${EPREFIX}${REDMINE_DIR}/config/initializers/session_store.rb" -o -e "${EPREFIX}${REDMINE_DIR}/config/initializers/secret_token.rb" ]; then
+	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}\""
@@ -138,7 +134,7 @@ pkg_postinst() {
 	else
 		elog "Execute the following command to initialize environment:"
 		elog
-		elog "# cd ${EPREFIX}${REDMINE_DIR}"
+		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"
@@ -150,38 +146,49 @@ pkg_postinst() {
 }
 
 pkg_config() {
-	if [ ! -e "${EPREFIX}${REDMINE_DIR}/config/database.yml" ]; then
-		eerror "Copy ${EPREFIX}${REDMINE_DIR}/config/database.yml.example to ${EPREFIX}${REDMINE_DIR}/config/database.yml"
-		eerror "then edit this file in order to configure your database settings for \"production\" environment."
+	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
+	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: ${RUBY_TARGETS}."
+	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 "${EPREFIX}${REDMINE_DIR}" || die
-	if [ -e "${EPREFIX}${REDMINE_DIR}/config/initializers/session_store.rb" ]; then
+	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 "${EPREFIX}${REDMINE_DIR}/config/initializers/secret_token.rb" ]; then
+	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."
@@ -200,11 +207,12 @@ 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 "${EPREFIX}${REDMINE_DIR}"/log/production.log
+		chown redmine:redmine "${EROOT%/}var/log/redmine/*.log" || die
 		einfo
-		einfo "If you use sqlite3, please do not forget to change the ownership of the sqlite files."
+		einfo "If you use sqlite3, please do not forget to change the ownership"
+		einfo "of the sqlite files."
 		einfo
-		einfo "# cd \"${EPREFIX}${REDMINE_DIR}\""
+		einfo "# cd \"${EROOT%/}${REDMINE_DIR}\""
 		einfo "# chown redmine:redmine db/ db/*.sqlite3"
 		einfo
 	fi
diff --git a/www-apps/wordpress/Manifest b/www-apps/wordpress/Manifest
index 820145d4e352..538e7d084380 100644
--- a/www-apps/wordpress/Manifest
+++ b/www-apps/wordpress/Manifest
@@ -1,11 +1,5 @@
 AUX postinstall-en.txt 1554 BLAKE2B 0a6e291b6d590e03fe4702a9e01f88a59fc4d820f95b4e7541d03f32dc397f86de694de73c5d9d8910e30a7f7f49f59b5f918b75ff16f537f9fd0931052e3e57 SHA512 d03a9da686ea1806e0583706af271738fa0b912cf7d718c096e2efbdb03b178e5b4137ec6ba5d91d85ca71f3403ca45e61eb992467cf05846e02dc10f5bbb03c
 AUX postupgrade-en.txt 1653 BLAKE2B cf2e403046ff8646b7dfffaec7c267633fa735f1be7448f76c9bfeefb2372c169453123db169d70bf871dc4c1ee1a239aeb17a25a1de582b23b38a7d589fd1c2 SHA512 3fa8b143a4cd8e23798423427ec31174947eeccfdbc5611dca3b32e02484f68602713dd75c3153db344de4151de1924fbaa6807e360fddeda79fa0dc70005913
-DIST wordpress-4.8.3.tar.gz 8184961 BLAKE2B 47e6195c44dd203cdfeadae0a8427f1d231f3cc3ef4487b4f9e9fb8662169f3b592caca23e1139dcf8bfd8334e451de8eafd4aa27be4b681dc4613f0857bdd05 SHA512 696be1c24dec869d896e22b408b17009e8c482545237156f17d4b5f2d726876a17c3cc5c3de632126229747589d74f7b188c06d2a79878efc800bd6db273d709
-DIST wordpress-4.9.1.tar.gz 9638827 BLAKE2B fb80f5b41df3abb9e28ab492c645c368b1f62b46ba78fc255b4eaa77e54d7801c51f85bdded809cce27027592ca0ccda0a88d8ff67afc0ad5183dd510d9f5d96 SHA512 1835d8fd0df9931487489d2e67285e7c73ec1783df39621cfbfe52aa8a0b3cba05fd3b842c7fd67ab2b76009f33337dae650f22dd6a3c4aa71eae100541b8a58
 DIST wordpress-4.9.2.tar.gz 8807744 BLAKE2B 88c2c9decde312600548e03a14e3721dc82a3a57e59910f9ad85a323beb4ac8faba7de48f46bbc43c78e6862fb93c181b5b6bb690142f5e897c84dd621c9e58f SHA512 013d49b7a7d478888937e1acb49b6543b820c8d1c5b5a3bd86f9629d44640a4c399e84b2604a359c26986bc0e29836094c8444e152c4aa5bcffe9f7a4620f731
-DIST wordpress-4.9.tar.gz 9638753 BLAKE2B 98df805843f8f48c8678205e7fbdd5fa4d223ce0b772c02ff52d5f5d21559ae56f33023dd3881bdea244c46f8ae6c5ca31a7d6b0da75661d616f67d28253a673 SHA512 b7898730d42839406b9270b945c687e80bc1025dcf23dfa1455576f0fc9dffb3b8c082b6fc6d1b6915791ce33c7327c8ce28bbf2beafdc7154ab0e29660c4cc7
-EBUILD wordpress-4.8.3.ebuild 1263 BLAKE2B be5742a77197835f9f1492732ca24bc4db29fa9fcfe4d5c756f6e2732b5457e2e88c6b0606fcb5b887e5b43488a04510996808da9fc6857b86017695d6cb9595 SHA512 2f4e9d8aa679e09cee89af28ca894df07339663cf0dc47b9ffaac558d95635b52d5c57d08c6eaa49a587f3a323c4de1294cee4dfa62058f2a77ad329039fdc39
-EBUILD wordpress-4.9.1.ebuild 1263 BLAKE2B be5742a77197835f9f1492732ca24bc4db29fa9fcfe4d5c756f6e2732b5457e2e88c6b0606fcb5b887e5b43488a04510996808da9fc6857b86017695d6cb9595 SHA512 2f4e9d8aa679e09cee89af28ca894df07339663cf0dc47b9ffaac558d95635b52d5c57d08c6eaa49a587f3a323c4de1294cee4dfa62058f2a77ad329039fdc39
 EBUILD wordpress-4.9.2.ebuild 1263 BLAKE2B 8dd8a3be63b647649417f0ad97f5c31039ddec6c200cb34679cebc74bcf35ba6c79a568e2d3f3a1e3a3f5abc2799b1ccb99f3f8eef88d6e9821b952794d40583 SHA512 9026b3ea5f9f341cd2c7cb531ed546b8e87c0520a9bc8e5207db83fb1457b220d7a62d3b46bbd9cf56f990f62965e20ab4f29f2e1cc9a4b4e0e61b880d2ad2c7
-EBUILD wordpress-4.9.ebuild 1263 BLAKE2B be5742a77197835f9f1492732ca24bc4db29fa9fcfe4d5c756f6e2732b5457e2e88c6b0606fcb5b887e5b43488a04510996808da9fc6857b86017695d6cb9595 SHA512 2f4e9d8aa679e09cee89af28ca894df07339663cf0dc47b9ffaac558d95635b52d5c57d08c6eaa49a587f3a323c4de1294cee4dfa62058f2a77ad329039fdc39
 MISC metadata.xml 392 BLAKE2B 736fb06bba21342a9cdd29ce815b1325098bc11798675534a4d299bcbaeb29f46d1eab8bebd90e2539187e82294510d06827ac068611797ad441e7c024bee6b8 SHA512 f63f0ac7c836f4f8c21d69b021d6e4d6f4257f80fd1995f180509379c7ab82028a89d1be22a381e36aad34b21d94e29c2471b48d6b31dd1a634150991e7b6c33
diff --git a/www-apps/wordpress/wordpress-4.8.3.ebuild b/www-apps/wordpress/wordpress-4.8.3.ebuild
deleted file mode 100644
index c7283f88735a..000000000000
--- a/www-apps/wordpress/wordpress-4.8.3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit webapp
-
-DESCRIPTION="Wordpress PHP and MySQL based content management system (CMS)"
-HOMEPAGE="https://wordpress.org/"
-SRC_URI="https://wordpress.org/${P/_rc/-RC}.tar.gz"
-
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND="virtual/httpd-php
-	|| ( dev-lang/php[mysql] dev-lang/php[mysqli] )"
-
-S=${WORKDIR}/${PN}
-
-need_httpd_cgi
-
-IUSE="+akismet examples +themes vhosts"
-
-src_install() {
-	webapp_src_preinst
-
-	dodoc readme.html
-	rm readme.html license.txt || die
-
-	if ! use akismet ; then
-		rm -R wp-content/plugins/akismet/ || die
-	fi
-	if ! use examples ; then
-		rm wp-content/plugins/hello.php || die
-	fi
-	if ! use themes ; then
-		rm -R wp-content/themes/*/ || die
-	fi
-
-	[[ -f wp-config.php ]] || cp wp-config-sample.php wp-config.php
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	webapp_serverowned "${MY_HTDOCSDIR}"/index.php
-	webapp_serverowned "${MY_HTDOCSDIR}"/wp-admin/menu.php
-	webapp_serverowned "${MY_HTDOCSDIR}"
-
-	webapp_configfile  "${MY_HTDOCSDIR}"/wp-config.php
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-	webapp_postupgrade_txt en "${FILESDIR}"/postupgrade-en.txt
-
-	webapp_src_install
-}
diff --git a/www-apps/wordpress/wordpress-4.9.1.ebuild b/www-apps/wordpress/wordpress-4.9.1.ebuild
deleted file mode 100644
index c7283f88735a..000000000000
--- a/www-apps/wordpress/wordpress-4.9.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit webapp
-
-DESCRIPTION="Wordpress PHP and MySQL based content management system (CMS)"
-HOMEPAGE="https://wordpress.org/"
-SRC_URI="https://wordpress.org/${P/_rc/-RC}.tar.gz"
-
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND="virtual/httpd-php
-	|| ( dev-lang/php[mysql] dev-lang/php[mysqli] )"
-
-S=${WORKDIR}/${PN}
-
-need_httpd_cgi
-
-IUSE="+akismet examples +themes vhosts"
-
-src_install() {
-	webapp_src_preinst
-
-	dodoc readme.html
-	rm readme.html license.txt || die
-
-	if ! use akismet ; then
-		rm -R wp-content/plugins/akismet/ || die
-	fi
-	if ! use examples ; then
-		rm wp-content/plugins/hello.php || die
-	fi
-	if ! use themes ; then
-		rm -R wp-content/themes/*/ || die
-	fi
-
-	[[ -f wp-config.php ]] || cp wp-config-sample.php wp-config.php
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	webapp_serverowned "${MY_HTDOCSDIR}"/index.php
-	webapp_serverowned "${MY_HTDOCSDIR}"/wp-admin/menu.php
-	webapp_serverowned "${MY_HTDOCSDIR}"
-
-	webapp_configfile  "${MY_HTDOCSDIR}"/wp-config.php
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-	webapp_postupgrade_txt en "${FILESDIR}"/postupgrade-en.txt
-
-	webapp_src_install
-}
diff --git a/www-apps/wordpress/wordpress-4.9.ebuild b/www-apps/wordpress/wordpress-4.9.ebuild
deleted file mode 100644
index c7283f88735a..000000000000
--- a/www-apps/wordpress/wordpress-4.9.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit webapp
-
-DESCRIPTION="Wordpress PHP and MySQL based content management system (CMS)"
-HOMEPAGE="https://wordpress.org/"
-SRC_URI="https://wordpress.org/${P/_rc/-RC}.tar.gz"
-
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND="virtual/httpd-php
-	|| ( dev-lang/php[mysql] dev-lang/php[mysqli] )"
-
-S=${WORKDIR}/${PN}
-
-need_httpd_cgi
-
-IUSE="+akismet examples +themes vhosts"
-
-src_install() {
-	webapp_src_preinst
-
-	dodoc readme.html
-	rm readme.html license.txt || die
-
-	if ! use akismet ; then
-		rm -R wp-content/plugins/akismet/ || die
-	fi
-	if ! use examples ; then
-		rm wp-content/plugins/hello.php || die
-	fi
-	if ! use themes ; then
-		rm -R wp-content/themes/*/ || die
-	fi
-
-	[[ -f wp-config.php ]] || cp wp-config-sample.php wp-config.php
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	webapp_serverowned "${MY_HTDOCSDIR}"/index.php
-	webapp_serverowned "${MY_HTDOCSDIR}"/wp-admin/menu.php
-	webapp_serverowned "${MY_HTDOCSDIR}"
-
-	webapp_configfile  "${MY_HTDOCSDIR}"/wp-config.php
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-	webapp_postupgrade_txt en "${FILESDIR}"/postupgrade-en.txt
-
-	webapp_src_install
-}