gentoo resync : 28.04.2021

2 files changed, 20 insertions, 20 deletions

diff --git a/www-apps/redmine/Manifest b/www-apps/redmine/Manifest
index 97917fb78b8f..3c8e6dad1534 100644
--- a/www-apps/redmine/Manifest
+++ b/www-apps/redmine/Manifest
@@ -3,6 +3,6 @@ AUX additional_environment.rb 322 BLAKE2B 26571ffcbc43431058a685000e00870ec41d26
 AUX redmine-3.initd 1269 BLAKE2B 1c0f561fa1c13c899b17b7c707ac6beaa9090a9ec98657f7ddce2e653241d7388392f22eaf35a85f5de96c3a0c32a4b67f0003725c371ef1ffb1f76c56d989b4 SHA512 c0ec931313d8b684cc8d2ab59e0c6d6fd159202420a3849cbb09a62f4fae7f6c3ec071b58fc17d838247c7c573a92de0ecdab7de995fd2391c4bd66001335ece
 AUX redmine.confd 267 BLAKE2B d2f4f34ac6ac2aadfe5371831fb5dba6dc6e58fd26197528ebe27d9f4faa3dc8b9c495e77841b8a2e67db7093c76cbcda24b9548da0d10268d105b5dde0bb023 SHA512 4e4a700f1540b5e82df6ca610a94adcb08929f5ca75e605e40372b18ccc395515cdd53451ba2b3e3d9bdf129d9052a7218f6323d526c1ffb2540254d279c8d94
 AUX redmine.logrotate 106 BLAKE2B 0c725d812b4a6caae29ed55d0b948a3dc14369aa550994d55ca3aa41e0c1e34962d26da4a46c99fdbdcdd600c12f2d386559af53a2e48d55b5d670372be65b60 SHA512 c7e611dc5e662e5b2126c77a333081708e552f2980efb835dc8560cd5e1929c6923e5e6e4e45604fe662b9bd5ef433678eb900e797cee34bbb1b80fb55eed0e1
-DIST redmine-4.1.1.tar.gz 2712056 BLAKE2B 767964ca455fdea081d3d409e91903367190ccce08474dd6c3bba8a3a89b7efd3846dbe1dd09039620591807dc44926744218f5db28a59ddb2da326a3f3f5b1d SHA512 fe691318fe8464de197a49ac172ecfcd65047ca62273226f63549620475557cd27cf8e193355a665abef64fc0c9e59556b4732cdcaa8061746918b06a7afcf81
-EBUILD redmine-4.1.1-r1.ebuild 6736 BLAKE2B da7a3b459020d4258822d13d0c9a9d1073350b5a72db3c138f35f579e4716218446fc55045da0cf1f45a44d851306b4fd8d57f3cac4586c6ef1101a2818ae708 SHA512 62d863404c2a8b1636bf929c3ccf3d0b53158c50ee8ed7d0df7e769372569d0563ec6ea2a201923415ef7bb422a68fa40ff2483a2459adc3ea51cc45e466f4b1
+DIST redmine-4.1.2.tar.gz 2719030 BLAKE2B a169d024a76dc0b592a71da55e785152ba1cdb2203a864cff905571f1eae350d77e6955d819c660379e3e7b539664bf77a21f0f91ed5c4299f173221e763859c SHA512 a7ed547e8907d98c16c9d7c775fa3fcdb322d3e4494a1e5467cbc37c9710f04b9d5121fbdd9d8444b2028f7c8a842237ccc9d1b62c066c26bdc150cf408afb3b
+EBUILD redmine-4.1.2.ebuild 6721 BLAKE2B 31b6199982251014d96d7b9b74662cae2b68d735fd6515d587d5276ac56f05c269072e4c75159b9539bfb4ab96ba584274d55aebfcc361b7b79fefa2b5f770d8 SHA512 982db3106881601cfadecb6ef559f62a70d77dafa539e00af17474f7c3332cfd7b58caaad6425a2ac8413af48a474fc0c42f58b18ddcd0c4534d07a87faa564a
 MISC metadata.xml 557 BLAKE2B 34d0ed361118b010c7e4ecfc2acd5de4efc28054e866de8c8d278c439877cdc4e5c4ac238085e5f403a947abd37932c4e0dad5df456d2808172136740983036a SHA512 05f799fdd307d371ae877b236aba94278ec939f67405573100d200f60c5344196b7555616cab136b11235382eb443801ba495f57ede4c36f2f913ec1020cd4ba
diff --git a/www-apps/redmine/redmine-4.1.1-r1.ebuild b/www-apps/redmine/redmine-4.1.2.ebuild
index f58dfec10598..6225d28927ac 100644
--- a/www-apps/redmine/redmine-4.1.1-r1.ebuild
+++ b/www-apps/redmine/redmine-4.1.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 USE_RUBY="ruby25 ruby26"
 inherit depend.apache ruby-ng
@@ -19,7 +19,7 @@ DEPS="
 	fastcgi? ( dev-ruby/fcgi )
 	imagemagick? ( dev-ruby/mini_magick )
 	ldap? ( dev-ruby/ruby-net-ldap )
-	markdown? ( >=dev-ruby/redcarpet-3.5.0 )
+	markdown? ( >=dev-ruby/redcarpet-3.5.1 )
 	mysql? ( >=dev-ruby/mysql2-0.5.0:0.5 )
 	passenger? ( www-apache/passenger )
 	postgres? ( >=dev-ruby/pg-1.1.4:1 )
@@ -29,7 +29,7 @@ DEPS="
 	>=dev-ruby/mail-2.7.1
 	dev-ruby/mimemagic
 	>=dev-ruby/mini_mime-1.0.1
-	>=dev-ruby/nokogiri-1.10.0
+	>=dev-ruby/nokogiri-1.11.0
 	dev-ruby/rails:5.2
 	>=dev-ruby/rbpdf-1.20.0
 	dev-ruby/request_store:0
@@ -56,8 +56,8 @@ all_ruby_prepare() {
 
 	# newenvd not working here
 	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"
+		CONFIG_PROTECT="${EROOT}/${REDMINE_DIR}/config"
+		CONFIG_PROTECT_MASK="${EROOT}/${REDMINE_DIR}/config/locales ${EROOT}/${REDMINE_DIR}/config/settings.yml"
 	EOF
 
 	# Fixing versions in Gemfile
@@ -132,8 +132,8 @@ all_ruby_install() {
 }
 
 pkg_postinst() {
-	if [[ -e "${EROOT%/}${REDMINE_DIR}/config/initializers/session_store.rb" \
-	|| -e "${EROOT%/}${REDMINE_DIR}/config/initializers/secret_token.rb" ]]
+	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
@@ -144,7 +144,7 @@ pkg_postinst() {
 	else
 		elog "Execute the following command to initialize environment:"
 		elog
-		elog "# cd ${EROOT%/}${REDMINE_DIR}"
+		elog "# cd ${EROOT}/${REDMINE_DIR}"
 		elog "# cp config/database.yml.example config/database.yml"
 		elog "# \${EDITOR} config/database.yml"
 		elog "# chown redmine:redmine config/database.yml"
@@ -157,11 +157,11 @@ pkg_postinst() {
 
 pkg_config() {
 	# Remove old lock file
-	rm -f "${EROOT%/}${REDMINE_DIR}/Gemfile.lock"
+	rm -f "${EROOT}/${REDMINE_DIR}/Gemfile.lock"
 
-	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"
+	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
@@ -182,8 +182,8 @@ pkg_config() {
 	fi
 	local RUBY=${RUBY:-ruby}
 
-	cd "${EROOT%/}${REDMINE_DIR}" || die
-	if [[ -e "${EROOT%/}${REDMINE_DIR}/config/initializers/session_store.rb" ]]
+	cd "${EROOT}/${REDMINE_DIR}" || die
+	if [[ -e "${EROOT}/${REDMINE_DIR}/config/initializers/session_store.rb" ]]
 	then
 		einfo
 		einfo "Generating secret token."
@@ -191,7 +191,7 @@ pkg_config() {
 		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" ]]
+	if [[ -e "${EROOT}/${REDMINE_DIR}/config/initializers/secret_token.rb" ]]
 	then
 		einfo
 		einfo "Upgrading database."
@@ -219,12 +219,12 @@ pkg_config() {
 		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake db:migrate || die
 		einfo "Populating database with default configuration data."
 		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake redmine:load_default_data || die
-		chown redmine:redmine -R "${EROOT%/}/var/log/redmine/" || die
+		chown redmine:redmine -R "${EROOT}//var/log/redmine/" || die
 		einfo
 		einfo "If you use sqlite3, please do not forget to change the ownership"
 		einfo "of the sqlite files."
 		einfo
-		einfo "# cd \"${EROOT%/}${REDMINE_DIR}\""
+		einfo "# cd \"${EROOT}/${REDMINE_DIR}\""
 		einfo "# chown redmine:redmine db/ db/*.sqlite3"
 		einfo
 	fi