NMU. Version bump. See bug #491758. Add ruby20 support. Fixes bug #484484.

Package-Manager: portage-2.2.11-r1/cvs/Linux x86_64

3 files changed, 207 insertions, 2 deletions

diff --git a/www-apps/redmine/ChangeLog b/www-apps/redmine/ChangeLog
index c22e0ff3f489..3c81247168e7 100644
--- a/www-apps/redmine/ChangeLog
+++ b/www-apps/redmine/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-apps/redmine
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/redmine/ChangeLog,v 1.42 2014/06/03 02:22:26 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/redmine/ChangeLog,v 1.43 2014/08/05 23:04:49 mrueg Exp $
+
+*redmine-2.4.6 (05 Aug 2014)
+
+  05 Aug 2014; Manuel Rüger <mrueg@gentoo.org> +redmine-2.4.6.ebuild:
+  NMU. Version bump. See bug #491758. Add ruby20 support. Fixes bug #484484.
 
   03 Jun 2014; Patrick Lauer <patrick@gentoo.org> metadata.xml:
   Remove unneeded useflag description from metadata.xml
diff --git a/www-apps/redmine/Manifest b/www-apps/redmine/Manifest
index 115e8f638599..cc9ce435b7b9 100644
--- a/www-apps/redmine/Manifest
+++ b/www-apps/redmine/Manifest
@@ -2,6 +2,8 @@ AUX 10_redmine_vhost.conf 343 SHA256 4067d312a5fc8e7f1f98e8917d2e9c296a70a7e9847
 AUX redmine-2.initd 1458 SHA256 fb8f37ea5b7bd3a42f2c5a7d1259776696cdc3238fb11b4ac631f699b7612720 SHA512 ad781f13445468b3e10e4833d451ce8c7280bdf8147e5b1df6ed18479b7a5c375e0087fa6a05974deab16b4fdd49925dee86762993a993840536572f3b696707 WHIRLPOOL 35f35c31b9fad331b47a36cae44c431fb64aacc25877beabd9a933b674ed840d2a4d09d4bf4e1dbce075aced0adf3810b8163f9a1a739593e65d4e5b7e1126a3
 AUX redmine.confd 267 SHA256 2ac6b7dfc2d055554b7ee9380fcf1a49a708bbd866987b775507d7a3b30f2d41 SHA512 4e4a700f1540b5e82df6ca610a94adcb08929f5ca75e605e40372b18ccc395515cdd53451ba2b3e3d9bdf129d9052a7218f6323d526c1ffb2540254d279c8d94 WHIRLPOOL fd6e8c63921d7ab2d73b5b15ff91db64ead03e521325871e21a1d165e313a1e56c607e9d9553504ccdef10a917a85ecdd5502527df159012b471803f4063ea00
 DIST redmine-2.4.5.tar.gz 3883802 SHA256 bf5fde731636634b952174d0e04425f753b1a2475ab2253ceeb4631a85358eda SHA512 a748f2d2a96d5512717939b4f08396c6c2fcf93418b2475aacd70d27d8ec65e6001378a1b5ccea4b0823bd076351247655a5f9fdc211cb3947ff2173350011a7 WHIRLPOOL 950c33478c415dc5e790b2752ee5f969715c113ad467fc06111ba417fe659487faa7f27996be2f99aa40d99018d4a730c3a3f4ebc1c97cb7facb34cb81424b8d
+DIST redmine-2.4.6.tar.gz 3885107 SHA256 9dd35c9f50fcd20724c328860253c78fe0155a5f58bbf90357d72d44900a7601 SHA512 722bdb4e5dd5246dfdee2819c65d024c34368d4cbb34d27a2832909b2b82f6e677e7312fa085971c6fb78c2aa4d06552d06e2314e19c4e3d0b211fcc1ec4d911 WHIRLPOOL e1b4213f7aef6d97afadde194e6f99f6d7f61a5cc9775fb8619cda6fbe2b42a3b783039fdacfa80b40d0c86fa235d397f39f0d3d37b5a7626facfd70fe058f06
 EBUILD redmine-2.4.5.ebuild 6496 SHA256 750b12c824462c4e217920cb2519ea9b0fb32f62ea5aad6be69a75a56bb5e145 SHA512 c2162e2e9e8d04d3fdf2c93252479e364f0654090a6b1ddedc77e17b83f7c15e189ae6d3c47ba6b053a1b2efe8a974202d3be62ff12f154fd25f01f056f5704a WHIRLPOOL 2a86d9a0462a6e5e34943ed2fa5b914b469700a223598ffdfa4ab7ebbf25bc98e4117a18803911bbd77f6cb48bf6a004ef24b6539657aeeea842a9d614fa305a
-MISC ChangeLog 8788 SHA256 a178fcde653b5f59ae5159cca08906b12708e0e72b7fd7a972e78f8f0c1e7834 SHA512 20bbbe128e608aaf74e62a38f4af919748e2187dcaded6f10a967a54faca44540092403947eeada6abff8c002697aa4e7b95e6ceb0f38465dcdb2aa1c711adf1 WHIRLPOOL 11f81a469af251294335f97c5f02d957aefbd7ef72e3e63ce77af718dabfa54853aefc4044cfe24f340cfbc8e8af6f26f7198886839129d2ba8d5949a3480d97
+EBUILD redmine-2.4.6.ebuild 6225 SHA256 24d1e660dd6d74f34aaafb7ffafc66eecad3b64cf66c280551b1945be958082f SHA512 2ea2d74c0cf778fce941f02099b5ae5c2e8d08a69c700bd1045dc79f20abd480688a1e3118ef764540b1326f467f07096a71f9d8fed539f63fff10ad649e6222 WHIRLPOOL b6d728c3ecc6473e9fa94130c8175298091080383a2914f8774a44067c3fed65c661db29257a4fa772f21540293e77e982740de500548253e235e89edcf57d85
+MISC ChangeLog 8965 SHA256 9cf699146b483217c1dac6bc40066321b7dd5f0a69c5ff1a3801042f3962d45a SHA512 11720e618054abcaaf7ccf816e49ad5dbaf75f68a0b2db307c194d37d84de60fc3cad3642104eb4f0c9da1a7e293c493eccd2d14d44c58630076b9fd7510f957 WHIRLPOOL c60ac88eb689cdb516cfb063735a2eec8640a4c4343e5d4315339366bc8dc62546330d044e2f989b44db20d76bc0bf1b7883c81eaa4905bdb4daa46ea9ed9ac1
 MISC metadata.xml 515 SHA256 00ed5d7164210d2f36b45162b77390bbedd0dd596d080ad9b57dce8997d069b7 SHA512 5495055f337d51b2a55e356ddcfeadbab32b664b4a146e1170acf47a415f649b74cf6aeb99b3ed193577434680cfc5475f926820ac90bbc63c899a9c70775dce WHIRLPOOL c5576ce1b30b28b219faeeb069a0c9bda5b7ab330f8f78e5fcce1962517de67a4535261f0336719a3709d004977b6c78b7dfe46ac4fbaeece27d64074a289760
diff --git a/www-apps/redmine/redmine-2.4.6.ebuild b/www-apps/redmine/redmine-2.4.6.ebuild
new file mode 100644
index 000000000000..ceb92df8b6bc
--- /dev/null
+++ b/www-apps/redmine/redmine-2.4.6.ebuild
@@ -0,0 +1,198 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/redmine/redmine-2.4.6.ebuild,v 1.1 2014/08/05 23:04:49 mrueg Exp $
+
+EAPI=5
+USE_RUBY="ruby19 ruby20"
+inherit eutils depend.apache ruby-ng user
+
+DESCRIPTION="Redmine is a flexible project management web application written using Ruby on Rails framework"
+HOMEPAGE="http://www.redmine.org/"
+SRC_URI="http://www.redmine.org/releases/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+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 imagemagick fastcgi passenger"
+
+#RDEPEND="$(ruby_implementation_depend jruby '>=' -1.6.7)[ssl]"
+
+ruby_add_rdepend "virtual/ruby-ssl
+	virtual/rubygems
+	>=dev-ruby/rails-3.2.19:3.2
+	>=dev-ruby/jquery-rails-2.0.2
+	dev-ruby/i18n:0.6
+	>=dev-ruby/coderay-1.0.9
+	dev-ruby/builder:3
+	dev-ruby/rake
+	ldap? ( >=dev-ruby/ruby-net-ldap-0.3.1 )
+	>=dev-ruby/ruby-openid-2.3.0
+	>=dev-ruby/rack-openid-0.2.1
+	imagemagick? ( >=dev-ruby/rmagick-2 )
+	fastcgi? ( dev-ruby/fcgi )
+	passenger? ( www-apache/passenger )"
+#	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 config/preinitializer.rb || 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
+}
+
+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}
+	dosym /var/log/${PN}/ "${REDMINE_DIR}/log"
+
+	insinto "${REDMINE_DIR}"
+	doins -r .
+	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"
+	else
+		newconfd "${FILESDIR}/${PN}.confd" ${PN}
+		newinitd "${FILESDIR}/${PN}-2.initd" ${PN}
+	fi
+	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
+}