gentoo resync : 29.10.2017

23 files changed, 101 insertions, 850 deletions

diff --git a/www-apps/gitea/Manifest b/www-apps/gitea/Manifest
index eeab78b266f3..69dd4782247a 100644
--- a/www-apps/gitea/Manifest
+++ b/www-apps/gitea/Manifest
@@ -1,10 +1,8 @@
 AUX gitea.confd 74 SHA256 edf43ca063fccf9951cd1e3975fdfa7ba0e26b47d7442596ce27bc5f2fd21e4c SHA512 3e05bad19cd924c4375d9ca6fc57142ba4b5ec897a1c789c3fc9710dfcfee209a199c95040eece089ad93e0357486ab98fad0c448a61e318646b7a71845e9a25 WHIRLPOOL 7cfce49d1b3053dc07318c2f2626bf2d6029f9dead23c800a775277928c486225297668a34e6e7d322e506b3c3b68652a3aa31514e30e49ef9a1dc72ea3fb738
 AUX gitea.initd 681 SHA256 d54242e9f1f8854f97cc0acf47242a2ace8ee388c9af7d152ef831ca57bbf3c0 SHA512 4565a201f34e5beecc8b535c677e308718a3df91f78a1a7132dda70bc4131871ad9f007c76490c23a001357ce78172a0a22c3e5ff9f3deaa7032e1d8cb11e986 WHIRLPOOL afc8b379026eb28360ef92671ffff1930dec68817653766ce7d3c108912aee33e6e2b3b3b33bedc39edcd5c0a9ac57012130f423be1bf7589465544d471b9050
 AUX gitea.logrotated 87 SHA256 19538aff00c6ad5377df593391f33f59b28333ebe7a95eb9848ce663a6f7c9ba SHA512 798f3fc33026f19dd31ffa78b9b1ed313d7b82b19c047f509e896c1798b2925a1bb7c4998d98a6b47e728979bf7132fb1c2a80eb7fda096a763d6791631cb6d4 WHIRLPOOL 7d8d3dea943948757803a4091a6950a2f9b2859570ee5783bf524c248557e72625042ecdaa9d694177c9a6e3e942dacf5a06e1298994ba009269d3417c299026
-DIST gitea-1.0.2.tar.gz 13448604 SHA256 f75e220f8c44a9b7c67d2d5339479e690df9f03ec3337eede3aab0c7e8e55c87 SHA512 1826e60961adc585fd54a2c913e6cfaa9754052a932981f83eb6a1f2521d09eb7165545f80494439763c8f13bb1f4ffc24b791162cae7b739fd9eb96f7db530c WHIRLPOOL 3afcfbf4d15b94b4b8e5fde511626ce6acfbf201a58b54f3cd077b6c6487f62b3a0b3e4ef7c3c4526a432e0aa4833e038ca7d69e2e09cf9fe329ea65607f42ab
-DIST gitea-1.1.3.tar.gz 13018735 SHA256 c36b96707585d5395b10145d81e732c29e1d1476e7bff55ee6e131a3e516f1de SHA512 c674699bc51ad367d4e47aa1b65e2025d57747cd516df6a7d7e715bf7467a3504dcf461823db15365a61ac91a35b68bce2486b645d09708a6e952fff379c12e4 WHIRLPOOL 1134cf37e09a9e20a927ef9119eb92c2e716af092717ffcce1003d62c08f95452e054820e8392b6797d89c045d8ae317b3d0f50385367e2eb4c636e404e16073
 DIST gitea-1.1.4.tar.gz 13018104 SHA256 36ac983bb3b3f7b1edb8a86acbd6f73f3fabcd2ecf1554b86fe212318b4234d7 SHA512 4427c4c1a588dcf201f707c3e2827fd702a0f8c0add63c6a5eff0d6ef8d21fdaaaf275f8e790017751f161431d563df22f71a6ea046085f9fb1d57da99f20524 WHIRLPOOL 14ad4d092348f8058ccb2438a9bca4dd3223305a9e8575aac808ef5bf15d1b27fc8c54b6a0b890244fe28761c31a633c7050d77b63410086fb1e03cba3e3d569
-EBUILD gitea-1.0.2.ebuild 2450 SHA256 c762c14a7819401d1232d6f7c7109d8918f9ce0f23f11d0303ca13b183b94b1b SHA512 e2980081bb3b30cc046853ba6ea9a7fe8c0f9ed72329b79f06db4e86e3c6608e7b7b669a1e2337c19fa21dda7262f3de7072afedc4e9a5d3144e5976c7f100c3 WHIRLPOOL c2a8dd8c086ee9b1ed15a25bb0d0082295b889e6e5a36580f0dbda01100a368e6fb0ff720fbb3b763696fac206f56e914e2077026f0b10674a5353e8a3470bc5
-EBUILD gitea-1.1.3.ebuild 2450 SHA256 1a549f918363bbae88e0ddd8156593087a28e0e332f8027910d3064ca9b53c31 SHA512 47845442511a19ef76572a01199d32b1fad93540addad3578152e457a78eeac7ec941ea1bd19c134b6514c729230492d8f68f2b3693fea9ecaa21d881176530b WHIRLPOOL afc3eace56cdf14f695db3ba012d0311b829a28d2d40cee1e7297f2c16dd349337e194b7c94a2631e7d6de51fbda714236688329466cefbd336589d4760ad526
+DIST gitea-1.2.1.tar.gz 14326562 SHA256 a18e0390d2c2ca956e94e98294707c9ac1d926763d00e2da682a3e72db393612 SHA512 a8c446361d69fb71d4ee2b6476dd49b84cd88d0eb53b3f6b86a7dbd8c7189a81f65d6178aed96fb6a15dfba5940ec2026c8ff104a249405e3e14a76cd9bb8103 WHIRLPOOL 3a2e7f32fdbd3d4a03c45d08de64b37269f7bde92c42d9825fe56788003a49b4c9fcc56b62116207fd6e0b44db358b065eac9787db3a7ed4f5dd191bafa7bcd3
 EBUILD gitea-1.1.4.ebuild 2450 SHA256 4b51128b604e09398d5d3f8d5ad571b12f1606566ca3713b409ebb4a2803ad99 SHA512 4d86c3afe45be17bda6d2818b68e7337b744e564acbe1e6c448da766a438e7279fef8932874cd9c885f388382e21fc540d81b8256ef2e2e629e7f5b7536ad354 WHIRLPOOL 659198061e9f8216608a399c5453ab5e82606f18d1432d20791bb45062dbbf7188f5c9696967f9d1358b795052261eeda4a46a07152c5bb2b04e7c2c1b925f9d
+EBUILD gitea-1.2.1.ebuild 2450 SHA256 4b51128b604e09398d5d3f8d5ad571b12f1606566ca3713b409ebb4a2803ad99 SHA512 4d86c3afe45be17bda6d2818b68e7337b744e564acbe1e6c448da766a438e7279fef8932874cd9c885f388382e21fc540d81b8256ef2e2e629e7f5b7536ad354 WHIRLPOOL 659198061e9f8216608a399c5453ab5e82606f18d1432d20791bb45062dbbf7188f5c9696967f9d1358b795052261eeda4a46a07152c5bb2b04e7c2c1b925f9d
 MISC metadata.xml 324 SHA256 cf95cc2d754abaf77062d71409b6cb4bc9cd630637518db74d8f8af0bfa1effd SHA512 7b0e56ffe4652157a5126ae7cb7cc6b557ec8367dac02c28f69243181147855dc0e96fe09dd7ff507052a7f5382445deb98090175e06d030fe635990812820ee WHIRLPOOL 4694b3b159f487e2fbeccadd34cb56080888a5422fd8bd0c39db9e18b82bbd0ea1772ba6c2a068968f80c02babd74780e158b790b9b2d260d0ff466a2808e3db
diff --git a/www-apps/gitea/gitea-1.0.2.ebuild b/www-apps/gitea/gitea-1.0.2.ebuild
deleted file mode 100644
index 48f821befd27..000000000000
--- a/www-apps/gitea/gitea-1.0.2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
-EGO_PN="code.gitea.io/gitea/..."
-EGIT_COMMIT="e2c8d6fcb2c4073ed5cf164d88e7b5d44d95943c"
-ARCHIVE_URI="https://github.com/go-gitea/gitea/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~arm"
-
-DESCRIPTION="A painless self-hosted Git service, written in Go"
-HOMEPAGE="https://github.com/go-gitea/gitea"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-go/go-bindata"
-RDEPEND="dev-vcs/git"
-
-pkg_setup() {
-	enewgroup git
-	enewuser git -1 /bin/bash /var/lib/gitea git
-}
-
-src_prepare() {
-	default
-	local GITEA_PREFIX=${EPREFIX}/var/lib/gitea
-	sed -i -e "s/git rev-parse --short HEAD/echo ${EGIT_COMMIT:0:7}/"\
-		-e "s/^LDFLAGS += -X \"main.Version.*$/LDFLAGS += -X \"main.Version=${PV}\"/"\
-		-e "s/-ldflags '-s/-ldflags '/" src/${EGO_PN%/*}/Makefile || die
-	sed -i -e "s#^APP_DATA_PATH = data#APP_DATA_PATH = ${GITEA_PREFIX}/data#"\
-		-e "s#^PATH = data/gitea.db#PATH = ${GITEA_PREFIX}/data/gitea.db#"\
-		-e "s#^PROVIDER_CONFIG = data/sessions#PROVIDER_CONFIG = ${GITEA_PREFIX}/data/sessions#"\
-		-e "s#^AVATAR_UPLOAD_PATH = data/avatars#AVATAR_UPLOAD_PATH = ${GITEA_PREFIX}/data/avatars#"\
-		-e "s#^TEMP_PATH = data/tmp/uploads#TEMP_PATH = ${GITEA_PREFIX}/data/tmp/uploads#"\
-		-e "s#^PATH = data/attachments#PATH = ${GITEA_PREFIX}/data/attachments#"\
-		-e "s#^ROOT_PATH =#ROOT_PATH = ${EPREFIX}/var/log/gitea#" src/${EGO_PN%/*}/conf/app.ini || die
-}
-
-src_compile() {
-	GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" emake -C src/${EGO_PN%/*} generate
-	TAGS="bindata pam sqlite" LDFLAGS="" CGO_LDFLAGS="-fno-PIC" GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" emake -C src/${EGO_PN%/*} build
-}
-
-src_install() {
-	pushd src/${EGO_PN%/*} || die
-	dobin gitea
-	insinto /var/lib/gitea/conf
-	newins conf/app.ini app.ini.example
-	popd || die
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/gitea.logrotated gitea
-	newinitd "${FILESDIR}"/gitea.initd gitea
-	newconfd "${FILESDIR}"/gitea.confd gitea
-	keepdir /var/log/gitea /var/lib/gitea/data
-	fowners -R git:git /var/log/gitea /var/lib/gitea/
-}
-
-pkg_postinst() {
-	if [[ ! -e ${EROOT}/var/lib/gitea/conf/app.ini ]]; then
-		elog "No app.ini found, copying the example over"
-		cp "${EROOT}"/var/lib/gitea/conf/app.ini{.example,} || die
-	else
-		elog "app.ini found, please check example file for possible changes"
-	fi
-}
diff --git a/www-apps/gitea/gitea-1.1.3.ebuild b/www-apps/gitea/gitea-1.2.1.ebuild
index 45ea9f668ac8..56e96b9e348b 100644
--- a/www-apps/gitea/gitea-1.1.3.ebuild
+++ b/www-apps/gitea/gitea-1.2.1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 inherit user golang-build golang-vcs-snapshot
 
 EGO_PN="code.gitea.io/gitea"
-GIT_COMMIT="06a554c"
+GIT_COMMIT="34182c8"
 ARCHIVE_URI="https://github.com/go-gitea/gitea/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 KEYWORDS="~amd64 ~arm"
 
diff --git a/www-apps/grafana-bin/Manifest b/www-apps/grafana-bin/Manifest
index ebaa354aa9ab..62658c2522fd 100644
--- a/www-apps/grafana-bin/Manifest
+++ b/www-apps/grafana-bin/Manifest
@@ -1,11 +1,11 @@
 AUX grafana.confd 162 SHA256 5b9e125f2648ed98125097770b609dcce543443f0862b99c0653f55b3b9be895 SHA512 13b9868a4c0a5a7209e6f4aa1206a93a0fb33b0234c4c0a6942bdab9d1cf139049181c066e01c49f639165ea422259fa7cab9e0bdf21537b3722bd86691d9b2c WHIRLPOOL cffd9b5c07791af6873b26868e0402ab882410b124fc48a86f367cab09c1a3edf3cc112a83a879e041ce7f717ddad8f70199e5f714281e19da701eeaadcaeb4b
 AUX grafana.initd.3 972 SHA256 0f898484e081a416429d4a881c99988aea6a9d9d2085b326c5dd1e85163cbb39 SHA512 fbad0e00b1b47d9eba808d2ed84e3208d2279f1deeaad71710c6756ad120b1f9f1bb2ba1c5f9677ed3a5efe28df8437c48f5c68b5e8eabb1e91b14e762c1e442 WHIRLPOOL 85f5634bb9fcd78c45d1d5c207951402a60be9b5f5595b47d8785bf1fa3a26f4238346a1d2a16a2e1457620b2cb5b20bfa46f5ed8cdf12e1b5f6297691a0db66
 AUX grafana.service 651 SHA256 406238530f759454339ef57d5297038bf9aea15b1ec919eb4aa9619584165f7b SHA512 7bda41f0c6ee9ec0947ef6b8d4591453f797ac0256f9b67800249a6edf699e55855a9bd6f46501a86ffec5b5d2e1d8ac735657a0c63600683f61044e0bbc35d4 WHIRLPOOL f4a9f08a49fc749e4e4189d1f288dd1a3a394ac3d1e6607639a9c559ee83ff9e59a4f4a5956400a2941e934d44fae619d3bf7a63089bdb6997179df9459c3278
-DIST grafana-bin-4.4.3.tar.gz 47282503 SHA256 90d0c53f6a9edb5f6fb5acb58265a167ef41f5b06701301eafc30bafa28566dc SHA512 21eea944931a9d4a7120d6f2e27fb5300f747ba0ff12cc93b160d38133400548701e342e6481e647f4252d34740aa49a7ebbe8c63a2a30a9fa6a057b90deb87a WHIRLPOOL d5fffbf9dc21fbb0711335a6234233a95bcd801bc3701e1b1be8b037977a291d77e668e950f6bf2c7f848c2395ccfe424b9abf97062f8d1b08b3b676e24f0f81
 DIST grafana-bin-4.5.1.tar.gz 50375732 SHA256 62fe532e5c2f7a56c713d53ee91c710e3213bae642447fd4624d6df806702651 SHA512 ea529a58aa835113ac2b4e8fb7b7f4f7dfa2a554e4aa212f81838faf193de7914a924b80162caa4bfee79d7dbd35278a792c15ca7e0302e062e26e93e29dd488 WHIRLPOOL 02959f0c93a0d257b56dd12bd9abe06372d51155751811c05ecf2281c2a52e3b41ef7d0c2aa2102c66e3d549f1a87f8f62fcabe00bedef7aad5185cbf550e087
 DIST grafana-bin-4.5.2.tar.gz 50374607 SHA256 c438a7ef775dd64e2ebfc72bef1e5a69849f1802b1921f30d6904e8cf05281a6 SHA512 9b650e204f90dfec7ea3ff723a937a3332064c3b5a00bebf3aca4cffe1fdccf83efbe5040c954dc82bc3389a4f5d72f7fa47941f43d022cbdf40e067f9c5adf7 WHIRLPOOL da931ffb2e4a73a77cc64afd3adace46a6043f31455c5bfec9181c0d80aa5191877ffba95d0f77b147ef17f268bb10e3921f7b4304988a08e9b70d87bc40b9c6
-EBUILD grafana-bin-4.4.3.ebuild 1750 SHA256 2b313b3814221ec83a670cde3447c9cd38f60a8a56031c3f8e72ae66b81ee2a6 SHA512 7b0aac0e0e288f00d29e4a1b770ebc0ebea629cb1760c4c99ea6531f746b6a571d58a0ac1a8001a1668dc1d4527510fe3ecc7b02e70247df9589fde6ece9a2f4 WHIRLPOOL c9b94817bd180230b90910acff82ab08813d53c6ba6d46b0f9a114d96b20f3226152c589aeb2358c4c78d4c3fe039dcae825f74f95001ac71b1d26a891fbaebf
+DIST grafana-bin-4.6.0.tar.gz 47177837 SHA256 eac61c02fb39880abac9b2fc0cf6516800ab63a5a98735b5c348a924561e5393 SHA512 bba310b1db360b4621101d02692a19de4a553474271dd6b6b8468c8a2aa938ebb7bc921074f2a8a33545e94fc5a9ec9f6bfdd207e552ae8ba2a2eec127107d37 WHIRLPOOL 168ae3bfbcef9475b4da2d4b45f983d85cd3d1b96efb4a2c6d716e934251b6ec8cdc4311903d3076c2d2305c854f070c19f29c77b8b08a8e700768c4b3f00e07
 EBUILD grafana-bin-4.5.1.ebuild 1750 SHA256 2b313b3814221ec83a670cde3447c9cd38f60a8a56031c3f8e72ae66b81ee2a6 SHA512 7b0aac0e0e288f00d29e4a1b770ebc0ebea629cb1760c4c99ea6531f746b6a571d58a0ac1a8001a1668dc1d4527510fe3ecc7b02e70247df9589fde6ece9a2f4 WHIRLPOOL c9b94817bd180230b90910acff82ab08813d53c6ba6d46b0f9a114d96b20f3226152c589aeb2358c4c78d4c3fe039dcae825f74f95001ac71b1d26a891fbaebf
 EBUILD grafana-bin-4.5.2.ebuild 1750 SHA256 2b313b3814221ec83a670cde3447c9cd38f60a8a56031c3f8e72ae66b81ee2a6 SHA512 7b0aac0e0e288f00d29e4a1b770ebc0ebea629cb1760c4c99ea6531f746b6a571d58a0ac1a8001a1668dc1d4527510fe3ecc7b02e70247df9589fde6ece9a2f4 WHIRLPOOL c9b94817bd180230b90910acff82ab08813d53c6ba6d46b0f9a114d96b20f3226152c589aeb2358c4c78d4c3fe039dcae825f74f95001ac71b1d26a891fbaebf
+EBUILD grafana-bin-4.6.0.ebuild 1750 SHA256 2b313b3814221ec83a670cde3447c9cd38f60a8a56031c3f8e72ae66b81ee2a6 SHA512 7b0aac0e0e288f00d29e4a1b770ebc0ebea629cb1760c4c99ea6531f746b6a571d58a0ac1a8001a1668dc1d4527510fe3ecc7b02e70247df9589fde6ece9a2f4 WHIRLPOOL c9b94817bd180230b90910acff82ab08813d53c6ba6d46b0f9a114d96b20f3226152c589aeb2358c4c78d4c3fe039dcae825f74f95001ac71b1d26a891fbaebf
 MISC ChangeLog 3787 SHA256 7c5499b4ee86c942885dc7ce4bef893e78f6021866021ddd2d3c23e3ed4ceaaf SHA512 414365d302b28b7764df04eb01400c4ba459ec6538cd788b0ea84188b83d23f17d50e65f7f4763a1cd1b4e60cb52b7c2cc6e181de3558fcd5422534eec449a3e WHIRLPOOL ae426267c20f6c10682a1964d30c760897b215cb84f6aa52f6a49286b0fd3b2d38a7d62c56f7495321165c2c92086ac898a19d033c236d07b1d2317d359cccfc
 MISC metadata.xml 368 SHA256 4ae4d3d18cf294a94d808004217a1179c782f8385a2d29f6113d522d57e6cb85 SHA512 1a122f3c2926cd0b933f4f35c56d02ae7a601bb124bc1173f5e422dba35d00d8d91e7018c06bbeda0e9b39699efa86bcb3973a60935fc034dbd23a8d672aebac WHIRLPOOL fd3c8de9f27844fde5ac3054213bcb24dc596a6545f1b057900c769b969b58ccf722db75b6a4925f914606bf3bee5375edb800a564b43813de2c12521449e8a4
diff --git a/www-apps/grafana-bin/grafana-bin-4.4.3.ebuild b/www-apps/grafana-bin/grafana-bin-4.6.0.ebuild
index 3a8308e2d6d7..3a8308e2d6d7 100644
--- a/www-apps/grafana-bin/grafana-bin-4.4.3.ebuild
+++ b/www-apps/grafana-bin/grafana-bin-4.6.0.ebuild
diff --git a/www-apps/icingaweb2/Manifest b/www-apps/icingaweb2/Manifest
index 96d71b072381..ac4937c24265 100644
--- a/www-apps/icingaweb2/Manifest
+++ b/www-apps/icingaweb2/Manifest
@@ -1,7 +1,5 @@
-DIST icingaweb2-2.4.1.tar.gz 7176640 SHA256 27150d96a2172d0fa0c77389970052a1bf7aa6553494e80837f6699e96e24bc6 SHA512 21ac8faea3e339cfc668407cef826cf4a8f01c964ad102e2c9bc9716e20c3177cea10ec575b99a5a4bb0a9681032b83427c250c5288b037a70d27dc919d0f641 WHIRLPOOL 40c5e48f0c7b6b32cb1eb02c1a447512bdba397eda8c20110a1e4d0c0b794265fe413c2c3a1a56d3f009e4245e211322a5b97a16449af4a1ff90bb4831f781fb
 DIST icingaweb2-2.4.2.tar.gz 7180122 SHA256 8ce42b4f0fb3ddd93c56d70c642512af13db1d5db2ad0227ec7567a4413daa94 SHA512 2a6f80561b59fde1b7ca72b8a120f93685a4741e7af036a90cdd5a1371f8e6d6caa25161f136b379255032b16b21914325a26f078121743d1299e96e7685ef53 WHIRLPOOL 0f350e796e5b03c5d3e0c501cdae8c485c2eb745da87e308f57066cfe507d24482799ab9e6fe1ed621c19f14fcca3b97c7f57d67a28ac51e42c13aa7094afe83
-EBUILD icingaweb2-2.4.1-r1.ebuild 2549 SHA256 5054aca910b4c43cedb1f65927eed50d613327c089378a9f8d80a03eeb38b67b SHA512 45e388216b6b4b25facf2a46fed4385f47455023cdc6fff6586a8801c6f1aabc7a13e1330f9e6a56e3acd9f4c7bce724411049fb0245aa6d3295c0dba45e6c33 WHIRLPOOL 63ec99eeb04bec6b8f9ae0dd7a57f33164525955ce20bf50e86d04b1b05b01400c0ef0787018cc16580b301510a50226f12fff1270f4635b29eab7e815f82a4b
-EBUILD icingaweb2-2.4.2.ebuild 2551 SHA256 f8eb44b0693890012405e741cb712ad0fd1547be90021414026bcabacfd39e89 SHA512 4b59c96f553f19d648c4444e94372f88bb69da38c8f1d9e8d5c57a4720f48ce81e1f72742a2db29f8c5e8f02b3323457abc96b80f7b737cee2418721034dce12 WHIRLPOOL 11c14cc483109b185946c70590f51be02503a6862e72b9238e7af5a07ea1ffee2f27883871d969b16388a203e6f8cce559612a7ace3996fbfc59a59aecdc7764
+EBUILD icingaweb2-2.4.2.ebuild 2549 SHA256 5054aca910b4c43cedb1f65927eed50d613327c089378a9f8d80a03eeb38b67b SHA512 45e388216b6b4b25facf2a46fed4385f47455023cdc6fff6586a8801c6f1aabc7a13e1330f9e6a56e3acd9f4c7bce724411049fb0245aa6d3295c0dba45e6c33 WHIRLPOOL 63ec99eeb04bec6b8f9ae0dd7a57f33164525955ce20bf50e86d04b1b05b01400c0ef0787018cc16580b301510a50226f12fff1270f4635b29eab7e815f82a4b
 EBUILD icingaweb2-9999.ebuild 2546 SHA256 cf85e05cdf795c6ccf373bb0d4e3d00a6c97a8acedd331dc72526854d1a44e4f SHA512 fa08a2c6d47a9b1df8027dba57b7b8be8bad1980af3c45af52203435dc98ce28b47ec211691e241bda8913dcd77370004ef1b24622fabae8cc3d510f3f9decbc WHIRLPOOL 6e168c77c068b5cad0f9d1f9dda10b546501f802f0d6fedadb737f6b213757cad8500fd7e985cbed1d6cbf37eca6ba6686060865f4877f7eaa707e45e6b62cd4
 MISC ChangeLog 5943 SHA256 9eadd672b6c42d1fe6693377dd99ef67a692b7d4069e21a4e683700866e2d43b SHA512 f3726691410d5de8c4d3f3aef22903f4b418eb8b80adc4933f564e6a4179288bf9ea625d135129e6d309b810aa417fbef88426e1fe00ff360ccaafc626448225 WHIRLPOOL cfd9631fccd26df693305c2b26563577c8dc985a084cf11d2214ed3c601d6650daf72d60221373f6ff4c7e98222b1eadee818284f1f493ab55bffafaf03ce6c1
 MISC metadata.xml 407 SHA256 b9ad2e9df3e4db89dc3e44032cf06cec95938ec8c990b7abea53f2c0e8ae5e62 SHA512 40eb3b6ff856fb8a4bcced4b177c73e4a7987b468dbcfe645d4a9f816f100ce899c8f8f803ad343c2b33b60cbcfbd4cef37257548311d22b4272a15602b1c961 WHIRLPOOL 15cb580f93914e0c73c25d3cc5e0c3d2fd24e0e5ae5c3c3c2369e85dcbb141828e4b5f0ce59efe01c0d8899339314695e701e9aeedd9f4c15560156598bbd74a
diff --git a/www-apps/icingaweb2/icingaweb2-2.4.1-r1.ebuild b/www-apps/icingaweb2/icingaweb2-2.4.1-r1.ebuild
deleted file mode 100644
index 796ba177fbff..000000000000
--- a/www-apps/icingaweb2/icingaweb2-2.4.1-r1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2017 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/icingaweb2/icingaweb2-2.4.2.ebuild b/www-apps/icingaweb2/icingaweb2-2.4.2.ebuild
index 9c54138b2b4f..796ba177fbff 100644
--- a/www-apps/icingaweb2/icingaweb2-2.4.2.ebuild
+++ b/www-apps/icingaweb2/icingaweb2-2.4.2.ebuild
@@ -12,7 +12,7 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="apache2 ldap mysql nginx pdf postgres"
 REQUIRED_USE="^^ ( apache2 nginx )"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND=">=net-analyzer/icinga2-2.1.1
 		dev-php/pecl-imagick
diff --git a/www-apps/metadot/Manifest b/www-apps/metadot/Manifest
index f5188d4b3a60..c6c8cb29a480 100644
--- a/www-apps/metadot/Manifest
+++ b/www-apps/metadot/Manifest
@@ -6,7 +6,7 @@ AUX reconfig-6.4_p3 361 SHA256 76291fa277b4b32486bb550b533851b2da10afca0eb792033
 DIST Metadot6.4.5.4.tar.gz 4055040 SHA256 d125b61d59563d25b2feac8ae692225478130e88f5f9165cf1de34c7985cc785 SHA512 a7982e604b1f0f8db393bb16c6ecb7ca0562b8b1a620bc9db268e4be4c73de827b8a0cf0c5156822c3c63d4f8ef19a37a37d2c39037bf9d6d00df0a310e04cc1 WHIRLPOOL e96ce975c4bf19827fbd3d9e18ecf11d52cd0a2e138a91ce3dcc3dffa40cc16e04f9c687e717efccf19bb68aeba64a85fff4375ed91d1caa3295c2b583f3e332
 DIST metadot6.1.6.tar.gz 3754969 SHA256 d7033b8ad561914714ea3d4d32d745566b291494fd3cfc46f66c496e37c48339 SHA512 0b7f4bd99fcc909b3f3428591193fecadfe6542b5a541c351e69323efe06e38fdb4a507d83ceec61105ddeae6b95433f67d3d12778c4acf4b9189b169f03fd7e WHIRLPOOL 1ebe465989931256dcb5bf784e6c0d1cbfae6fffe1feff32326cf6ec71f04b01d35ceb69a359f8b5e50152ccaf7f2c93492d3f0f9fd8955d78e0c7074f001ad5
 EBUILD metadot-6.1.6-r1.ebuild 1266 SHA256 7a888bb5f0090ac925abc8aac02865ba4f309bcb24da1cbc8083ff640a082cf1 SHA512 f3a10d000b44343373a63e50388f0119dc43fe675395c58fcdd3d987b56f88ad4b105c757d28747a7a64836c7a3a31d842b7e426bb497999197b0dbab0027848 WHIRLPOOL 1db7fdf980698c5e020eb90442b755ca7b57d499b59852f4de8d3bf3592931d7a86bad8c689be7893a516615f943cbc1e7dd3743bea57fa27b14aa9f2ac2fa4f
-EBUILD metadot-6.4.5.4-r1.ebuild 1748 SHA256 bc2fa5dc904893f18f940617f3800b42a47e1206ac9b6961c3051b4bce63b23e SHA512 74396c35982f891135fe5dcf948d6a690cdee3e9819acf3c36b6c9d313291e82fd43c419f99977452e681e7cfc1a002703cb167c785fb823c1a61896236ae7be WHIRLPOOL a037bfd05eb1ceea99c11ff76ebdf45aeee4ae159346aa1c9493a0b0e815b7258cf1285be45045a0c152ec10a477fdd8b1e0a6c021cc5138be0721729de29176
+EBUILD metadot-6.4.5.4-r2.ebuild 1751 SHA256 cfdab8c5adacf6005c7b285f2a8851c4cdea23b98984d31ec5b5e5d6e1e44ce4 SHA512 51fe6d0ab6fedaf53f11325b6ad4d422390363e43752640c0af58d1387b43aa17d79499c451c923f9454f03946b0249df9f4cfa6d3a6cf307909e2ffae17c84b WHIRLPOOL 12310cac2ce0b853f8048dca91bbcce9c59c33ce022855735c2fc63f608c202f59385f02dde8822bf3f81a6eabfd7b7db0fd6410002a4c5770f1e5a6c584379d
 MISC ChangeLog 3271 SHA256 6fd4d61cf127b527585978da532cbdefb248822c16c13b8deb80e15adb92c75f SHA512 b2380ed27ce6032b386462916dc8fa65ef9238b5465daa0419a925e716c0482acc076578169e20947bc962a2c1cec88f67af46df2832ebbefd8ab3923574ab86 WHIRLPOOL 2ac7feb83528faba1caa59c82c10169f1b61f6da9ada566f6a8207aa0b80aa40d03167b87e1321ec6bcf9e9a9713477beea42701ec9a721014a6e9eee1844e0b
 MISC ChangeLog-2015 4740 SHA256 27047d3e4f9f03c30481c672c53c08e9fba616f61673d2b0b93930cac6793a48 SHA512 d9b6a516051373d7e27a690c0a908df1c865f43e80ea0c4ac6bfe7b4f59f4b7b4c9084dc66f98fe77d2a284bfb231733509be1fb6896fcb8003d8f4ab3a6e47b WHIRLPOOL 75a872e12f87b1f50f0e72d7212e2c9a4be2d89eec2546f05f6418647b04e9552aa187c70b7ba86f3b6c0f6d32ceccf05af0cd3e734c1091579dcb72f8d9d2c0
 MISC metadata.xml 246 SHA256 f696b469729aeeb7810f246774e90471415680a9ebd6b55c56c13a5213057508 SHA512 1181711d3b020b2ca7beae0a539a9b7f1abe70962cd8561900e5f06e14c9c871c61ca6088fb674de19ef3b844a1b3c29cf0f84f638b2d0cb7c030f60cd1d42ed WHIRLPOOL fef696fa5b101de1ba4bdc0188a4757648d9eb40d4b01408cf17416d1f39909026a80e4b082d8497801aae1caea588b6d28616cd3853e1b03b94a8fd672f9c85
diff --git a/www-apps/metadot/metadot-6.4.5.4-r1.ebuild b/www-apps/metadot/metadot-6.4.5.4-r2.ebuild
index 90501a51226e..4ab1afba1f7a 100644
--- a/www-apps/metadot/metadot-6.4.5.4-r1.ebuild
+++ b/www-apps/metadot/metadot-6.4.5.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 inherit webapp
@@ -45,7 +45,7 @@ RDEPEND="
 	dev-perl/Date-Manip
 	dev-perl/Text-CSV_XS
 	dev-perl/HTML-Tree
-	dev-perl/HTML-Format
+	dev-perl/HTML-Formatter
 	dev-perl/Data-ShowTable
 "
 
diff --git a/www-apps/nanoc/Manifest b/www-apps/nanoc/Manifest
index 917b38521b1a..4e8f9f5d4802 100644
--- a/www-apps/nanoc/Manifest
+++ b/www-apps/nanoc/Manifest
@@ -1,11 +1,13 @@
 DIST nanoc-4.6.4.gem 241152 SHA256 4fc9c41f8103edc732654ba8559f42007ce6e7013078cf652f05e572c61272aa SHA512 49e41f5bfc3ae9afc7e40b182374579adbd703954ba97b0cbe68c0e3ac864e7301a90dc5993795636b96155a1d9cfbb102e6bfa321513919123ff680322a2631 WHIRLPOOL bbfd86c526f34258d68e1532ec4629cada74da8a5a6411f6bd5b1fa890693dd614205c9859483b1b796a0de38d9ec1ce21650d69415aa8eb4f08500fa9e27eea
 DIST nanoc-4.7.14.gem 256000 SHA256 e68fb32763517dbd78b655ad14d2bc69e0828f4cce6488240c4ec89b7d8377a9 SHA512 e7413771794e9d2931e3be2a5b5575f7cd207d9b11167a1838496edf34bee4e631c362d9ac50fb0f9dddbe2fd5836b402506565c704838327116a18f0ea34088 WHIRLPOOL ff04d10480a2a9ff308d0ac11320f37fcc7afed84221dc9bc86ff8b318a1100d2cdb20634d771612c7e56a727ac3448b094b7d736c5bf38c4f24fc09d9bd7486
 DIST nanoc-4.8.1.gem 256000 SHA256 9d2bb60fffcc3a0f1ec7b6c204494514874f51ad9d5f8f4e15441d5d4d976a22 SHA512 9b24c91074ba591a18ba1f4adc2e97e89f3fa0e152cb56fbce58b2591312f54db0336487526ca0f34dc02ef22b2c0960a70a5313e0d8b6c6b7cb2d36ab98b5eb WHIRLPOOL 51fbe4eb5a587143a16d8d9bec7f5f2ccea3900a87534808209a54b763e9fa0d7ba7c5fece38fc82ff447f6175f1feb9ec26ea2127c12bd65ddb94b155af89e6
+DIST nanoc-4.8.10.gem 260608 SHA256 fc3d1bc48af638fb93b4023f0cfcd40e658c74129c25dd878cd9c3f93f2317ea SHA512 36080407696d19739af666d9ba4e04d051d679b29b3e8e5d24d893a2d05b05201b74777007781a0da80125a98fd8cc465fb0b78ca0c28c5fc80bdd5229d5fa24 WHIRLPOOL b7ab3d0edad55bcebbb87ab81d60375b15686bcd5109809f757cdd95a99e1a2def4f45d829e4d85ec64acbfd8d5cd454e75068333ba0735304b4a1e2ec0ab44c
 DIST nanoc-4.8.5.gem 257536 SHA256 bd0909d15dfacc3f1e859ba1c84f66611c414aee6600c256d27394d8b47bed58 SHA512 6cb4e57e3e852dea5f2b64ed2d194dba88e109ebf1e83433b49bb6c0027b7d47676bd418aa6d1149c88a71981790bb459ae5a5d21c18a805cdd9db1bf5c3647f WHIRLPOOL 289ed9e7c2e90fe41392d2ade914f57db022455cab8f40a809d30a2bdf1e74b7b999c8e7d25ee3fc109dc896062bf20baeeff53d412cfae1e9798f2cdd0aaa23
 DIST nanoc-4.8.9.gem 258560 SHA256 68f51386e8a2eb01f1348c43a10a752fc118f513550a9011d097693f7e193703 SHA512 7fedd050564134ba4f3706689af21d856639b02ba0c5a4bc02bf639f7be4dafd9efed4c3e11aaba08b53d4587476c9f071f4cd0fa07879e769295c6175735dd4 WHIRLPOOL 7c214f597864d4914e7f2279b39d2b415308ee97b43fd7657c370ea77f8a530902a6f323998099209272b8aa131932625c8aa6b1539557b1b106ea1364ca8a57
 EBUILD nanoc-4.6.4.ebuild 1244 SHA256 0cae293493918356633b4b1b4c49b4b73c428038780d0dd69bda0dab406583f0 SHA512 2be4cc8b453fccf9c1bb77cbc38b2f3d8b8d70dbe23611d0b6f40e832847f740c9747b9de1853e1a6d09d6ecc9f7548bc0098556362cff9b93ccd4dad3659959 WHIRLPOOL b673a7d76414eb4bfe8204df5cb78a8e7c3d346cade64151aa3fdc1a822fb09ac00e9246659c8b47e9773482caab28c22d046ff98e5db4e16c7a9cd7e0b7d7eb
 EBUILD nanoc-4.7.14.ebuild 1527 SHA256 33a3f473dac02173c37e4abd079a1eceaacd591298153f9da37f27a4f82f85af SHA512 d8bed9a8d6bcb697bc2f6a406e56be084a2a60ff56580b4b6bda4e4e68081a9227c8ea793934332c891ff515ad54fbc83cf29f3d32352e416d994009878f0061 WHIRLPOOL 7aa2bc8a08a0283cb9f0687e2b762f30d1348c9a10592c3fcb3f2d23578e66d0503b0ee9e5bdf407868ba205d133745eb78e7b4726e7b339f0e6c4e97a3ac6e5
 EBUILD nanoc-4.8.1.ebuild 1527 SHA256 98ad5909cf9c8727cfb99d18d2e491149db88396e9328073f09eff546db41279 SHA512 e752e828227a445e7b575a7ce2e8071afbd6d9108a44e881e7e797490b27f73d7af8a4bba624cba72723c86a3b6e78b49c9de3fa387ce102894ba10bc46b58ed WHIRLPOOL 203087dc87539ca81fb64be31fa41ce5768d1a4af1c206363d4d8b939c691ca5e469a2ba275eb4cf9cc77e969c96df388f9dd9e1cb1a716b8d6b7e545fad7b2b
+EBUILD nanoc-4.8.10.ebuild 1572 SHA256 feb47a5784a68c591a3750befd90efc07183a02ccf040e82e52089d073190f77 SHA512 bdf5c69689dd2cf7658ad4839fe7350b0a55fe3ca78edbfeb927f837353d2d3221fe022505a93a80f3abe4a565d77446adb9f594cb897facfca6125bd22765af WHIRLPOOL ebc12a47919b8d01a7488ea1cd3fa753a9edd433ee59dbfd469ac3d570afd655efb398ebb4f32d81b35bc45098d7de4b83b7ee093eece0f73a87e05ad687fc28
 EBUILD nanoc-4.8.5.ebuild 1544 SHA256 c8572b3bfde4528ee70b7184153bdae268f0cf464b2f71ad179d90f29e474dd7 SHA512 54561e950f0b332640ca35907bbf43f1fef9b817b26ea8dd6829944a9411f4869a1b3c9711a1fcb44ecf4e75be7809016a3d9fb0a5ab1ac914927f17c83523a6 WHIRLPOOL 963d7f51adab61f3923e80a4b936a4b08f77a9cf4180c57aa7103923e8e00e5860685573b9f4b77e7f11b1a7afdf5e2453b689240036a3276c55f16cfc4c6ae7
 EBUILD nanoc-4.8.9.ebuild 1572 SHA256 feb47a5784a68c591a3750befd90efc07183a02ccf040e82e52089d073190f77 SHA512 bdf5c69689dd2cf7658ad4839fe7350b0a55fe3ca78edbfeb927f837353d2d3221fe022505a93a80f3abe4a565d77446adb9f594cb897facfca6125bd22765af WHIRLPOOL ebc12a47919b8d01a7488ea1cd3fa753a9edd433ee59dbfd469ac3d570afd655efb398ebb4f32d81b35bc45098d7de4b83b7ee093eece0f73a87e05ad687fc28
 MISC ChangeLog 5209 SHA256 4d4ceab64c54a87f9bdc25d0149c182e5721349c3a6f6985b95d3c7a79e1cadb SHA512 9ab85ec191a889c3f20641c4201acbfdd6a525abea49c39d909e06ef1fa11864f35d169d1de993ebd03ec97e7496b2f88f580d9c3bd3830b232533ac93c60a80 WHIRLPOOL de25826d041c79fa5dbb6443c1c15c0e52c33d83709994f27290316084a728a16c8725c790dc9e9f5a66ed4694344d5f74a17b1509aae436ae3f49fcb67f0466
diff --git a/www-apps/nanoc/nanoc-4.8.10.ebuild b/www-apps/nanoc/nanoc-4.8.10.ebuild
new file mode 100644
index 000000000000..b1c3454fd12c
--- /dev/null
+++ b/www-apps/nanoc/nanoc-4.8.10.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23"
+
+RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="nanoc is a simple but very flexible static site generator written in Ruby"
+HOMEPAGE="https://nanoc.ws/"
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE="${IUSE} minimal"
+
+DEPEND+="test? ( app-text/asciidoc app-text/highlight )"
+
+ruby_add_rdepend "!minimal? (
+	dev-ruby/mime-types:*
+	dev-ruby/rack:*
+	www-servers/adsf
+)
+	>=dev-ruby/addressable-2.5
+	>=dev-ruby/cri-2.8:0
+	dev-ruby/ddplugin:1
+	=dev-ruby/hamster-3*
+	dev-ruby/ref:2"
+
+ruby_add_bdepend "test? (
+	dev-ruby/rspec:3
+	dev-ruby/fuubar
+	>=dev-ruby/mocha-0.13
+	dev-ruby/minitest
+	dev-ruby/rdoc
+	dev-ruby/systemu
+	dev-ruby/vcr
+	dev-ruby/webmock
+	dev-ruby/yard
+)
+doc? (
+	dev-ruby/kramdown
+	dev-ruby/rdiscount
+	dev-ruby/yard
+)"
+
+all_ruby_prepare() {
+	# Avoid unneeded development dependencies
+	sed -i -e '/simplecov/,/SimpleCov.formatter/ s:^:#:' test/helper.rb || die
+	sed -i -e '/simplecov/I s:^:#:' -e '/codecov/I s:^:#:' spec/spec_helper.rb || die
+	sed -i -e '/coverall/I s:^:#:' \
+		-e '/rubocop/ s:^:#:' Rakefile || die
+
+	echo "-r ./spec/spec_helper.rb" > .rspec || die
+
+	# Avoid tests requiring a network connection
+	rm -f test/checking/checks/test_{css,html}.rb || die
+
+	# Avoid tests for unpackaged dependencies
+	rm spec/nanoc/deploying/fog_spec.rb spec/nanoc/filters/less_spec.rb || die
+}
+
+each_ruby_test() {
+	RUBYLIB="${S}/lib" ${RUBY} -S rake spec test_all || die
+}
diff --git a/www-apps/redmine/Manifest b/www-apps/redmine/Manifest
index c4d31bcc7b31..54d0bcac3e13 100644
--- a/www-apps/redmine/Manifest
+++ b/www-apps/redmine/Manifest
@@ -4,15 +4,12 @@ AUX redmine-3.3.4_requires.patch 2632 SHA256 d45ceeb281bbbb4a723f170b7748713b2af
 AUX redmine-3.initd 1269 SHA256 7e9eaabbf0da516991d7e585e7fb0f9a00e6c1a454254c635e258d5adc060037 SHA512 c0ec931313d8b684cc8d2ab59e0c6d6fd159202420a3849cbb09a62f4fae7f6c3ec071b58fc17d838247c7c573a92de0ecdab7de995fd2391c4bd66001335ece WHIRLPOOL f7e7ba0eb84c395c0a0abb62a834e3eee584b2e3530b35e6baac94163b22c38cba46f1e6d9dfc6bd83126942e4b4a02008ac1b4991becfca9643391f486322ab
 AUX redmine.confd 267 SHA256 2ac6b7dfc2d055554b7ee9380fcf1a49a708bbd866987b775507d7a3b30f2d41 SHA512 4e4a700f1540b5e82df6ca610a94adcb08929f5ca75e605e40372b18ccc395515cdd53451ba2b3e3d9bdf129d9052a7218f6323d526c1ffb2540254d279c8d94 WHIRLPOOL fd6e8c63921d7ab2d73b5b15ff91db64ead03e521325871e21a1d165e313a1e56c607e9d9553504ccdef10a917a85ecdd5502527df159012b471803f4063ea00
 AUX redmine.logrotate 106 SHA256 c0999bdfedb44d8c84ca933c5371770194dbc46e6f06a9dac467dcb4dbc5f2d0 SHA512 c7e611dc5e662e5b2126c77a333081708e552f2980efb835dc8560cd5e1929c6923e5e6e4e45604fe662b9bd5ef433678eb900e797cee34bbb1b80fb55eed0e1 WHIRLPOOL 8b9ac739c63c226deda3a3fca5e89f277770de7bcad0c9777a203971236ed45f28a793ecc067b7e92704d99a1afe79883f36dea0658e02cd3d59f9151d3cf9f9
-DIST redmine-3.2.7.tar.gz 2322680 SHA256 f6ec163474e2a2cac21215d130c5bd3ccee54019165052943feaffc5fe5b34fc SHA512 74eb67e25a835500c7eb1c251de824981d45402fa04d03801c16ed2e3a78d90e3eee414063fd95379749335714e72c34760a251b3a583176e76cb9398e24b711 WHIRLPOOL 61dd4497d290b6f88fa4332119b9e2c0fcf27a727f5cb727f2700153eef6fac5e088a77d5f120e77f3a59f53e2de1fa9ad6eb03a0cfb2aba3ecf4eb2998dc9ff
-DIST redmine-3.3.4.tar.gz 2367776 SHA256 f28125f31df7ebcf7debf9b030d62002e2757c6ed228882ac64562dec90efbac SHA512 152806f829ba7e4f8df18933aa9d46c959e9f314a5698b20f30b90bb0d1292439fd6a3dfaea427145273d3fd37d48f62a64068dd7f8ab1cbe507eaf5c09f7f2e WHIRLPOOL 5a61eb7ba1dfd56cc3564488ee4a3686876cfea6fe83b624a0014588a27e6623b6ed5bcfe668e92b1edf26895b3d9f6c88edccca9629539147649aa7f197ba22
-DIST redmine-3.4.2.tar.gz 2438319 SHA256 747d649e3bceef41345a147a17db143ea646eaefb23ad7c514027456847c77fd SHA512 aededddd59bb84633f7360fb19e78a9313cf2654cb2a36a449c305834dc58d8e45f4d0433fe6d188f44e950163987b8b5e5285c9a9706d6f95f2346acdfd81fe WHIRLPOOL 23c01a72d7329e5948b0ba6a6ff59dcf162c364e8eaf60714e5883b6c36796b58b12867ebb678dcac714d7dfb49610795a417b410fd56b3e0765483e968aa894
-EBUILD redmine-3.2.7-r1.ebuild 6863 SHA256 c69b26a33f176ea4468beaa9f51e1a6ef5792b1891ae34e75747877a692d211e SHA512 3a5e65dcdafb654d0e741e56d6fa8e5045a398f9910a7aa0d392204783ad948ff2a5f8c466f3764205ceff9485af2b9600ea3042e6ab6becce25990fe0190f1e WHIRLPOOL a816467088352a752fcbbd20cad623e51b2ed900062bd335ae294b0b11fa405408553e7771e9092f2fd3102891af5e355d0e8e05e29fe970d102b36d67250dee
-EBUILD redmine-3.2.7.ebuild 6863 SHA256 a39eb7c5ac6bde49cbd17bc82115b785ff2f31cb2e4033458ad83a7509961e63 SHA512 6e4b36796adc3b1f80373159828c494fd043ed9e0a0d202231689b06eccf68293f091a8f0d9de2c87f549d526fc93e49791aefbba65f2aef57673c95a6822445 WHIRLPOOL 014886e11253e241042b0875a106ce2d3f8175d073844eedb91d81c78c7219745ac2a2b7c32a9656a27ec247ac2fc34d83d59f8e00c149c967c543c24f7fa0c9
-EBUILD redmine-3.3.4-r1.ebuild 6583 SHA256 b2d5de053d6a6e03c277c0451b589b79c306a92ea0bb2efd75fd77dd093523ab SHA512 0a4769542933822a8650bdf837a1fc953beb79b6ac5f3170618f30cb43cded2b6ba811db947cc85b7082964f34af95c0782ab8470c070ace9d0a361a9cefa013 WHIRLPOOL 324ade0a32e25bebb2e552dc2b50e20bc1e117b06753457e4e275726e4fa310df71495231c1b12076b6b8ee179a1dd30cd17f2934fe7fad18bdc7b147a91852d
-EBUILD redmine-3.3.4.ebuild 6583 SHA256 74dbf5fc9e2076f6667ea69bf7065814f9a7bae04fc42f10ad20a86bd0a77d06 SHA512 1b1767683f44b62169b4a205a635e324c7ed657515e95993c415f947e65181a2bb6299c666fef0a834e5d2d865d80b86b6f902da4c311ee453e60f306e59164a WHIRLPOOL 91ddcba928f7f3a8dc0ce4cfb7455cd26f2908253dd783968eb9fee179b7a181d6a389398d19379592dc11e8d294299494aab21cba01121f9ed9d72efbb3268e
-EBUILD redmine-3.4.2-r1.ebuild 6590 SHA256 359384bf4fdf36a91e76be44d110520ef544daaeb38c18ca17a99df5e30e96b2 SHA512 995ead1f0968ff585ec892ca4b34c1369e50542f80427e0341a93e36e4ef3ef8b140668c14e89c4eb951ec980a6d7efc9ea66a3c585e50bb5889e9e88e4f711e WHIRLPOOL c3846ac498d8da0a6d87cbe12d1150b8ca9d37de4c3ba2c91d0d76acb7be155c6cd5fa438dc3f32f2fbb8f80e777be195c51f85ec0e66d87f17c3a623772d41b
-EBUILD redmine-3.4.2.ebuild 6590 SHA256 9be76a40a11a524426b842767a605ee29c082306e17b940e0e9c3c6d28dd057b SHA512 84b54aea6054f6fb2ac961ce7a0a647474ea4acf7f12ed81a2ecc5a38cc6b49053fa058321dbef9b555bcbae1850f14a422ef0902a6c82c30f27bfd24c6dc4b9 WHIRLPOOL 998ca955d951cb322793e08b3a9888ce3d4226205e6937c08609ab8d23d5c202ea06dd6ee99febeacfce6486d8a223f832124faa94b7ad5ad7ab6fa06fd28c3c
+DIST redmine-3.2.8.tar.gz 2323001 SHA256 2dffd6fb314864ccf77528721580fb639df5f96254d0c533a1fea237a9bdcb98 SHA512 3817fe98ca61326c5e4f3c3fa67540a38305275b9c24a1d74d869d713d4a582974cb2ea983016aace3625a8ebadec9354b8f1e028ed6ade2ba3ebf18a33de1dd WHIRLPOOL c315fa14d2f52d21a64a085bbd88b8f8e56d062e6be9abebe374904ac721c9401e62e7a6fe4a8cb81602fb42f515ee3f53c2788d2e7866e41c35906dc9898fb4
+DIST redmine-3.3.5.tar.gz 2368487 SHA256 87ec1ac270d050c4cabcbbebf8dc84a0efafa717aa0bc4fe3a019c53f266b238 SHA512 6471429eda15b5788d3d46f114ba63dcd30adfddf8b58b21ef206fa65c39dede1db6f11c7340560cf687f14dd46b64a40d934914f9edf2b58ba1fbd730eb304f WHIRLPOOL 959d25496dc2023e27b956f1d8efd9380f18c998a5587ec852cde2e0eb943956108fb1261be47c6b0127ff1bb026d8732404f7ff61ca8495204350174118d9b0
+DIST redmine-3.4.3.tar.gz 2442818 SHA256 62c3ea32491a13db294237ff7ade5a447e0d2913204eb871ab3a99414e41f63d SHA512 27deb85916eb0285abd51e847037f213ebdcb5f16f57a19e7ff1d58eaed71a5c69695c707c12f2976d8dedc7aacb68bdf349c2d527e8312ce8c1c54d7af2db8d WHIRLPOOL ffb12fb19797f9bc7c9efc4e19302d75d0ebdf59b9b34d9dc60340bc67de136bcb4ef0e39e70bb77138df2c1c94756985e74f8edec1d8e139506a934989f102f
+EBUILD redmine-3.2.8.ebuild 6825 SHA256 f4810df2902cf672bc827680efa521f73cdd5489f17f2ccdeb45a11a0364fe15 SHA512 40c49274f3c31c527c0bebb4188af799c7b1fcd17315659593afa65a048cb796583edd7e28d57710fff03ac5811e85b967563f145c96008de4cd6acfe2e23379 WHIRLPOOL 173e73072968e6d24b0f7cef3bac5ecf63fc26eeacfa713b8b5bfc5020ae057a0ee1652c08ada701844c00d839e8acfe3f11846e3f753d2272d27d33b830820b
+EBUILD redmine-3.3.5.ebuild 6569 SHA256 9068f2732a63d88aad58acb67239dbf738f0fff08f25642e5ea004e94a6fb305 SHA512 9bf99a73c5334feca2048c324bf78e9562aa702915481d9e7abfa12a5df23cbaa840ad02b5d5fad444030522977eccba3cb651f6c443e8cc2b63c2bcbc5e6acd WHIRLPOOL 4d55807d740516d09035ba6bd6d4d47cfd652afb85ebfe39b465ec3b7f7e6b4fdd2656910dd996bf7fc1ae01f9d5068cd4b51304dfddda4b6a6df6041b87118a
+EBUILD redmine-3.4.3.ebuild 6576 SHA256 4ac44750a2740fd1eab1ef98c2f626f2b27e8e29aba7a416def4544b9c2d0c7a SHA512 7999fd691ef975ffd686d7a92ddbaa95c9b3bbbbffc050c565ef07f09a72808dae0dc63247e1bf75480afb98ad94187db7a91c2c45a96b81bfb0b5694a779f92 WHIRLPOOL 5450e6489931e82397dff6e0103fbfe160fee0e3341aab26f9ad426d5264e7ffaeb31501121096c4e72d9b988b6c50f6616239319692a218c378598b8431e086
 MISC ChangeLog 3999 SHA256 96b085622c371ed012428ec6bff28c7cd5423bf06f8d788d39d574c1dcadbeb4 SHA512 97aa9958e2ab41ce90e1b6607b550a8053653d52e4e0c9d4d99920f4da789a1f3cbe24f27ff50b89af227f94bb8191ce4884c204b61f8f075e68d3880d8fe73f WHIRLPOOL dc8d7e880d8fbef9764601a771256bbf6713fd90beaa30617f6603b8aa91b9c89b928d93d44e4fdeb9b2dcbe21e30c6caa28f513fee2e63351bdb35e142ebbdb
 MISC ChangeLog-2015 9269 SHA256 3814b4ebd58462879a42dcc4ac854c11670d0d13bdc5a98aa41638d79bb2bdff SHA512 2d4e57af048aaa3d0baff110d72fe5e59259f1c5bfb10fc445157cc35a558a36379135b7065e0ca3dad80ee083b539d8dae53084c6bcb2487470ab3c05b2dc10 WHIRLPOOL 8d4530cabfb864263160329f9a1b90f6a8efc96911fd2fa43653614239c5897296adec7e8eb303969a7bdef559db75851f2523272033494865fe2eeb320dc024
 MISC metadata.xml 527 SHA256 90c80d49a227178b30c96ef99f2849474109570a550a337730ebbe1f28b97826 SHA512 156e0ee607ad0ae734a98fab405679c55de4e2a5d620cce564a7ac17e8a029869f66c3df6d2733eb8106f9732537355c72be7c7261209af196264d069788eed4 WHIRLPOOL e5167ddd29b75e750adcedbbb195b53d66cf03313f615e273e8c4523c1b96bb535b88abb8a81fe2cf1ca6d789b6aa6b1535f575d838d933b335ec22a2849052d
diff --git a/www-apps/redmine/redmine-3.2.7.ebuild b/www-apps/redmine/redmine-3.2.7.ebuild
deleted file mode 100644
index 5c7f032e6273..000000000000
--- a/www-apps/redmine/redmine-3.2.7.ebuild
+++ /dev/null
@@ -1,215 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby21 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"
-
-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="ldap fastcgi passenger imagemagick"
-
-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:*
-	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
-	fastcgi? ( dev-ruby/fcgi )
-	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 )
-#	)
-
-#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}"
-
-pkg_setup() {
-	enewgroup redmine
-	enewuser redmine -1 -1 "${REDMINE_DIR}" redmine
-}
-
-all_ruby_prepare() {
-	rm -r log files/delete.me || die
-
-	# bug #406605
-	rm .gitignore .hgignore || die
-
-	rm Gemfile || 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}"
-
-	# 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
-}
-
-all_ruby_install() {
-	dodoc doc/{CHANGELOG,INSTALL,README_FOR_APP,RUNNING_TESTS,UPGRADING}
-	rm -r doc || die
-	dodoc README.rdoc
-	rm 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() {
-	einfo
-	if [ -e "${EPREFIX}${REDMINE_DIR}/config/initializers/session_store.rb" -o -e "${EPREFIX}${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 ${EPREFIX}${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
-	einfo
-}
-
-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."
-		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: ${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
-		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
-		einfo
-		einfo "Upgrading database."
-		einfo
-
-		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 "${EPREFIX}${REDMINE_DIR}"/log/production.log
-		einfo
-		einfo "If you use sqlite3, please do not forget to change the ownership of the sqlite files."
-		einfo
-		einfo "# cd \"${EPREFIX}${REDMINE_DIR}\""
-		einfo "# chown redmine:redmine db/ db/*.sqlite3"
-		einfo
-	fi
-}
diff --git a/www-apps/redmine/redmine-3.2.7-r1.ebuild b/www-apps/redmine/redmine-3.2.8.ebuild
index ee397cf4ee39..c0bd7c7e880f 100644
--- a/www-apps/redmine/redmine-3.2.7-r1.ebuild
+++ b/www-apps/redmine/redmine-3.2.8.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23"
+EAPI=6
+USE_RUBY="ruby22 ruby23"
 inherit eutils depend.apache ruby-ng user
 
 DESCRIPTION="Flexible project management web application using the Ruby on Rails framework"
@@ -61,12 +61,10 @@ pkg_setup() {
 }
 
 all_ruby_prepare() {
-	rm -r log files/delete.me || die
+	rm -r log files/delete.me Gemfile || die
 
 	# bug #406605
-	rm .gitignore .hgignore || die
-
-	rm Gemfile || die
+	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}"
@@ -130,7 +128,6 @@ all_ruby_install() {
 }
 
 pkg_postinst() {
-	einfo
 	if [ -e "${EPREFIX}${REDMINE_DIR}/config/initializers/session_store.rb" -o -e "${EPREFIX}${REDMINE_DIR}/config/initializers/secret_token.rb" ]; then
 		elog "Execute the following command to upgrade environment:"
 		elog
@@ -150,7 +147,6 @@ pkg_postinst() {
 		elog "Installation notes are at official site"
 		elog "http://www.redmine.org/wiki/redmine/RedmineInstall"
 	fi
-	einfo
 }
 
 pkg_config() {
diff --git a/www-apps/redmine/redmine-3.3.4.ebuild b/www-apps/redmine/redmine-3.3.4.ebuild
deleted file mode 100644
index b65197f8bc20..000000000000
--- a/www-apps/redmine/redmine-3.3.4.ebuild
+++ /dev/null
@@ -1,221 +0,0 @@
-# Copyright 1999-2017 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"
-
-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:*
-	>=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}/${P}_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() {
-	einfo
-	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
-	einfo
-}
-
-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.3.4-r1.ebuild b/www-apps/redmine/redmine-3.3.5.ebuild
index 113a62483531..80dcfc032480 100644
--- a/www-apps/redmine/redmine-3.3.4-r1.ebuild
+++ b/www-apps/redmine/redmine-3.3.5.ebuild
@@ -122,7 +122,6 @@ all_ruby_install() {
 }
 
 pkg_postinst() {
-	einfo
 	if [[ -e "${EROOT%/}${REDMINE_DIR}/config/initializers/session_store.rb" \
 	|| -e "${EROOT%/}${REDMINE_DIR}/config/initializers/secret_token.rb" ]]
 	then
@@ -144,7 +143,6 @@ pkg_postinst() {
 		elog "Installation notes are at official site"
 		elog "http://www.redmine.org/wiki/redmine/RedmineInstall"
 	fi
-	einfo
 }
 
 pkg_config() {
diff --git a/www-apps/redmine/redmine-3.4.2-r1.ebuild b/www-apps/redmine/redmine-3.4.2-r1.ebuild
deleted file mode 100644
index d50f5c1e5135..000000000000
--- a/www-apps/redmine/redmine-3.4.2-r1.ebuild
+++ /dev/null
@@ -1,221 +0,0 @@
-# Copyright 1999-2017 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"
-
-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.3.4_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() {
-	einfo
-	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
-	einfo
-}
-
-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.2.ebuild b/www-apps/redmine/redmine-3.4.3.ebuild
index 50abc9804762..d2e874a23beb 100644
--- a/www-apps/redmine/redmine-3.4.2.ebuild
+++ b/www-apps/redmine/redmine-3.4.3.ebuild
@@ -122,7 +122,6 @@ all_ruby_install() {
 }
 
 pkg_postinst() {
-	einfo
 	if [[ -e "${EROOT%/}${REDMINE_DIR}/config/initializers/session_store.rb" \
 	|| -e "${EROOT%/}${REDMINE_DIR}/config/initializers/secret_token.rb" ]]
 	then
@@ -144,7 +143,6 @@ pkg_postinst() {
 		elog "Installation notes are at official site"
 		elog "http://www.redmine.org/wiki/redmine/RedmineInstall"
 	fi
-	einfo
 }
 
 pkg_config() {
diff --git a/www-apps/rt/Manifest b/www-apps/rt/Manifest
index 62e87835d3f1..caba769b80df 100644
--- a/www-apps/rt/Manifest
+++ b/www-apps/rt/Manifest
@@ -6,8 +6,8 @@ AUX rt.conf.d.2 229 SHA256 73988366beb98516b12c842f51e322d95317c1d2d10fb292fcc0b
 AUX rt.init.d.2 1318 SHA256 bbcf2e95cbcae37a240e9ae30b016d9dccd857f27367a34bf343e47be77df9b4 SHA512 ec7249e73e9efdcb1716e8ba3bf33d4791bf4e386b3c60207f5c1a37b8b456be8c0cd550bbe0645a9aa46afeb1c3331b3425bb9f5ef8b95b71f52f99f1244b91 WHIRLPOOL 06a5edb36eeacf105ab2e0f67c6505f8eb310a5ed12fd1f7b48ecdab473a3d276b11b28a71ebe6d207b8e23c410375c5305f97087a93505e65698f85e30176ee
 DIST rt-4.2.12.tar.gz 7537620 SHA256 e21220c609706dc9977a13309d78a4d9171455ae823cf549311342cedd837264 SHA512 e816c5481bdb158209bd78bc82af4abc0243af500abe55ae3aac666259e983282d82577de6207899745b4781fb0a50d3094901a248e7ac958dd852343b6f2676 WHIRLPOOL 726d6f7c92bdd120ae3c0463181cef3ade9c705ac23dbb93bf1a262ebc4d0d2f07144a67d04a06c3127dead7ad7e6b50f3966e2969bc8c0199507af4af854fec
 DIST rt-4.4.1.tar.gz 9057212 SHA256 f87329911020e01b39948070aec2bd7abf0c81641f0cf2f25e01c690a19f24f5 SHA512 2cb797e013b14201ececec2c408257fe3a998fefdafd0944efda0236caac40be4cc45878cbda7bf9ae82b3757de6167263db2b90331d925db1f916a8420adf94 WHIRLPOOL 2d5530cc57a1a02a2429b59c07459da3cd71b3b9596588f8f6010c67e74a56bde9793c0fd2d8c6d0bf2171930e0352fd723a40fa0d5bd815c1d596ba9802c450
-EBUILD rt-4.2.12-r1.ebuild 7508 SHA256 e9877fe3b9dda989e026a2570e3450457a092e10a4dbfa65cf12167f5c004b97 SHA512 1627e7017e512c1016689c34d3a2edd0a41461ffa2ce27f76428afdcc68876998c397edcdc8c6383677975fdbead35680d4a770142f4ec5540c81314018ed550 WHIRLPOOL 698657baedd7f2f196e405ee0555835258e4d692da7ace317809de326af15c3c2bfb7752733ba9b58479f290f08404ca64d80c6436a92664ced455bd26dfd2f2
-EBUILD rt-4.4.1.ebuild 7629 SHA256 e99b3546c915f373abcec8df33656ba5eb75d6d211b4539d5b3926261bd30d0b SHA512 8a2f291926499e5df9f4a60351ffea0aa9d92534c13ae54fcc3d8a4c9e37d46989be43d6f3f06d1641bb88e6feb5df707b892063064927b9ff5971b9f41e2db5 WHIRLPOOL 8d35dab50459db7483d7dbb053ef5ec4bb6e3d461c5d8b01f8c21d81ba308dd78bf33a526479f7ed2e3826f64043dc281d0268984c37dc677a5d5c640474a2e1
+EBUILD rt-4.2.12-r2.ebuild 7511 SHA256 51429750d06ecddfb2cc65fc972b88dc9e5ff3a8307a1457e6915cc2e98c568b SHA512 dcf02e62b49babd83d6f747062972243cd13c8b9b528861f6f09e76229ae7ad5fa1750ffd1e34ef7c90f7724f4caf1826d3b770d4a06540947b6225ae4b8b8ac WHIRLPOOL 6c1271361c983faaef67a8d5308df9cde5d03d271525bae7b29d561220f81de3c8009add683d4dc636d8beab490b0e77be66d7e09a629987f467c5ba4c59449b
+EBUILD rt-4.4.1-r1.ebuild 7632 SHA256 a091b6fcdf3ed676287123fd8f8d749c7279fed8ee1dca40007198cd46b049b8 SHA512 54e4c18a05dae9ec7e7a8021706c47d40af76b521ea2986710287119a5f3bafa375e85f20c3813bffd8028ad10ed32c76b5590fd249d7f6aa36b1ef51ab88043 WHIRLPOOL 66a634476de3bad78b84e2fc54cf81e5034e9187abb6045b2a4a16345e101c96eed750ffd9ec5ff0d2240c136ea6843ba834d6759e6f55ee37dd81592c240031
 MISC ChangeLog 5643 SHA256 86dac0e4e5f704cca8d46acd354d7d62ffc13acb8acaa3c17b609c337d9b7baa SHA512 1db44fdc3c4f6bd24ff2413bae3ddb58642d16387baa5133a6cb65cc07566877a589ef6f3e1c3d8501b9775b956094646ba5b71f1e375f53af3fcdcbf339a7cc WHIRLPOOL 1b69c1f95ea6c29a784936b6efb7339a8b091632a6fd5f113cfd23400683896318250c47c2a5e4a8555e4cea6a4b6f2b6d48c6abfafdf703247f6ad80a452c9c
 MISC ChangeLog-2015 15966 SHA256 c34772eb85e51a1ec90b625a870670bcd6dc912dd2ae583eddc93a01d8e650dd SHA512 fbf740b91a1f93c53f02c492121158696ec7ea82c491823929c7e4552ff0cae4a7498b1771f3e6903383672804170392948e7e981aa29f018e849c3c103b8737 WHIRLPOOL 57608c0a0a052d3e47b3b014b9e9c65c8be20fa13f639de8c7bc276418b8f08b093d8bda6d9406f29de87610bc8d11f2bc192b76b487ecd13598096fb07ca9e0
-MISC metadata.xml 767 SHA256 59ad02388643162eb8663e16a2d10d7f394d06213a5dc955736f7000d494517e SHA512 b74eee6a8e221bff8d7512aacf7ae8ddc01b4aa9fd3b8ceb000d399f4516dddb8db6f602c8e0311d3624b09501660f6121c0d98f1ee0c22e26f2aa587df44e82 WHIRLPOOL 1ecacafed294df79bbc43d8479669d81dbc59e7ee99d47ab0a6d06926f77967febb8f0e98818c42007d756b2563649b7cb6cd7f75cbb18cff635b85c932de700
+MISC metadata.xml 766 SHA256 b68c13cbd7e708a940be89f088bb153b51d7be48e9e081c28540b5850c5e01b5 SHA512 b30f9242a64e6f8ebfda7e0321e8732f80b0990ba8857bd37d8753688df22702c8c7d398ec0652f7478a0d547b92b1fc234bd482fa80f3ac9ddf119ad5b66d5f WHIRLPOOL 5b68703758583bf1f3f703c83d25416b74fa3bfeabd07434f9d9f512020d54b4b6603e70040f2574bb4b9acd059e6aa07410f07689a6da0a3d6cdf59520f1120
diff --git a/www-apps/rt/metadata.xml b/www-apps/rt/metadata.xml
index f1d1d6173dc8..b54f1a28f875 100644
--- a/www-apps/rt/metadata.xml
+++ b/www-apps/rt/metadata.xml
@@ -2,21 +2,21 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-	<email>titanofold@gentoo.org</email>
-	<name>Aaron W. Swenson</name>
+		<email>titanofold@gentoo.org</email>
+		<name>Aaron W. Swenson</name>
 	</maintainer>
- 	<maintainer type="person">
+	<maintainer type="person">
 		<email>eric.joshua.martin@gmail.com</email>
 		<name>Eric Martin</name>
 	</maintainer>
 	<maintainer type="project">
 		<email>web-apps@gentoo.org</email>
 		<name>Gentoo Webapps</name>
- 	</maintainer>
+	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
- 	</maintainer>
+	</maintainer>
 	<use>
 		<flag name="lighttpd">Add <pkg>www-servers/lighttpd</pkg> support</flag>
 	</use>
diff --git a/www-apps/rt/rt-4.2.12-r1.ebuild b/www-apps/rt/rt-4.2.12-r2.ebuild
index 011c42d01899..73babc3acf9b 100644
--- a/www-apps/rt/rt-4.2.12-r1.ebuild
+++ b/www-apps/rt/rt-4.2.12-r2.ebuild
@@ -73,7 +73,7 @@ DEPEND="
 	dev-perl/GD[png,gif]
 	dev-perl/GnuPG-Interface
 	dev-perl/GraphViz
-	dev-perl/HTML-Format
+	dev-perl/HTML-Formatter
 	dev-perl/HTML-FormatText-WithLinks-AndTables
 	dev-perl/HTML-Mason-PSGIHandler
 	dev-perl/HTML-Parser
diff --git a/www-apps/rt/rt-4.4.1.ebuild b/www-apps/rt/rt-4.4.1-r1.ebuild
index 352322924004..3914f8393742 100644
--- a/www-apps/rt/rt-4.4.1.ebuild
+++ b/www-apps/rt/rt-4.4.1-r1.ebuild
@@ -76,7 +76,7 @@ DEPEND="
 	dev-perl/GD[png,gif]
 	dev-perl/GnuPG-Interface
 	dev-perl/GraphViz
-	dev-perl/HTML-Format
+	dev-perl/HTML-Formatter
 	dev-perl/HTML-FormatText-WithLinks-AndTables
 	dev-perl/HTML-Mason-PSGIHandler
 	dev-perl/HTML-Parser