www-apps/redmine: migrate to EAPI6, minor fixes.

Package-Manager: Portage-2.3.8, Repoman-2.3.3

diff --git a/www-apps/redmine/redmine-3.2.8.ebuild b/www-apps/redmine/redmine-3.2.8.ebuild
index ee397cf4ee393ec5e736bce248b466297af640e9..c0bd7c7e880f1d4e54ca1613006fffba5024f088 100644 (file)
--- a/www-apps/redmine/redmine-3.2.8.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.5.ebuild b/www-apps/redmine/redmine-3.3.5.ebuild
index 113a6248353179057a68be0725e3758f3f8a17f3..80dcfc032480263c66ac150ed633874916a3d4d5 100644 (file)
--- a/www-apps/redmine/redmine-3.3.5.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.3.ebuild b/www-apps/redmine/redmine-3.4.3.ebuild
index 50abc98047629f1ee3426e60d6092d3e9b144b8c..d2e874a23bebbe4aad5d38ac32fab0b19d3ede7a 100644 (file)
--- a/www-apps/redmine/redmine-3.4.3.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() {