gentoo resync : 29.10.2017

7 files changed, 10 insertions, 678 deletions

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() {