From 15c55f9602451e5d04a158d1c2566f5daf32324b Mon Sep 17 00:00:00 2001 From: "Azamat H. Hackimov" Date: Mon, 23 Oct 2017 22:26:40 +0500 Subject: [PATCH] www-apps/redmine: migrate to EAPI6, minor fixes. Package-Manager: Portage-2.3.8, Repoman-2.3.3 --- www-apps/redmine/redmine-3.2.8.ebuild | 12 ++++-------- www-apps/redmine/redmine-3.3.5.ebuild | 2 -- www-apps/redmine/redmine-3.4.3.ebuild | 2 -- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/www-apps/redmine/redmine-3.2.8.ebuild b/www-apps/redmine/redmine-3.2.8.ebuild index ee397cf4ee39..c0bd7c7e880f 100644 --- 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 113a62483531..80dcfc032480 100644 --- 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 50abc9804762..d2e874a23beb 100644 --- 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() { -- 2.26.2