www-apps/redmine: update ebuild.

svn path=/; revision=370

5 files changed, 84 insertions, 122 deletions

diff --git a/www-apps/redmine/Manifest b/www-apps/redmine/Manifest
index a65d9fc..c27ec89 100644
--- a/www-apps/redmine/Manifest
+++ b/www-apps/redmine/Manifest
@@ -1,6 +1,5 @@
+AUX redmine-9999-postinst.en.txt 716 RMD160 704d3ea9b32a3824003060b0f12076c05f83e196 SHA1 a415ce1e0b53f3d424010264dd198669ff41a550 SHA256 b6e8bbda2af63be181e3922ec17a9225a67b9d056000dcb33b9cfb9465f4dfdd
 AUX redmine.confd 177 RMD160 8ac3d7c625cc017ee5e5fceac7dbc0e4ba2fb815 SHA1 72971942aed5bd9c890c6174b2f8c88babcce414 SHA256 d683eea51973ce3d959019befcfbea2dd553b1a435957944e34519595dfc3dec
 AUX redmine.initd 621 RMD160 b1cd406788b820602ef5487c077e21e440d3134b SHA1 1567397e16216ac123bff2f8fcc5583e94f34894 SHA256 7c52ee1f5a753c88edab5b0314dfa3656774b3a6ddf02bf25471ac2f75855998
-DIST redmine-0.8.0_RC1.tar.gz 3155626 RMD160 50e1489907673c4ec4e3ad08d99d948adc27bcaa SHA1 8440c43986edf6103b668237d8858a1a569fa36b SHA256 6f93daffbca501ee2b466acba0efee7a50596bcf0bc59a8f2709814de3e5ddda
-EBUILD redmine-0.8.0_rc1.ebuild 2320 RMD160 b03e34ff1b828c0e53afddca63fbede98bcfc565 SHA1 d662e7af04f5aa058202227dde9acd6625ce11ea SHA256 ce130bf01686cda870a23c77aac4a25fb3580bbe5ec392a78751f3a51495eca7
-EBUILD redmine-9999.ebuild 2320 RMD160 b03e34ff1b828c0e53afddca63fbede98bcfc565 SHA1 d662e7af04f5aa058202227dde9acd6625ce11ea SHA256 ce130bf01686cda870a23c77aac4a25fb3580bbe5ec392a78751f3a51495eca7
-MISC metadata.xml 448 RMD160 b06d41abc0a57138e8e7ae9120b2a74e7b8a9770 SHA1 4960fa91fc82cda0d77f5cb67a8f46dcc6bc5969 SHA256 ddaa521432f9e642e78a8d82e898dacc05971a20600164609dbf061d70bff0b5
+EBUILD redmine-9999.ebuild 3104 RMD160 de85171426a52a5dbe3817103bf26c2a8008b6b3 SHA1 8e838eb3720ec19e258e07e9d9a159f6b2124a02 SHA256 f561eafec07e78b0e03d316d87e2d98dd0b64b773d0250e0ac2ea3a7b80b9134
+MISC metadata.xml 700 RMD160 3835f0e06da39f2234b9947e3ed9cf1e118345c4 SHA1 f295fae1c6ad348d962c3c4f94a8c28176a0ed21 SHA256 4d0c82b5dd6b8a2f50044ab1af2e6eb4bc99fe9cb4e46bc0a976b74d432c4c35
diff --git a/www-apps/redmine/files/redmine-9999-postinst.en.txt b/www-apps/redmine/files/redmine-9999-postinst.en.txt
new file mode 100644
index 0000000..c9f5bbf
--- /dev/null
+++ b/www-apps/redmine/files/redmine-9999-postinst.en.txt
@@ -0,0 +1,26 @@
+1. Create empty database (in this example MySQL):
+
+ create database redmine character set utf8;
+ create user 'redmine'@'localhost' identified by 'my_password';
+ grant all privileges on redmine.* to 'redmine'@'localhost';
+
+2. Edit ${VHOST_ROOT}/${P}/config/database.yml:
+
+ production:
+   adapter: mysql
+   database: redmine
+   host: localhost
+   port: 3306
+   username: redmine
+   password: my_password
+
+3. Generate a session store secret:
+
+ rake ${VHOST_ROOT}/${P}/config/initializers/session_store.rb
+
+4. Create database structure and fill it wit default data:
+ rake db:migrate RAILS_ENV="production"
+ rake redmine:load_default_data RAILS_ENV="production"
+
+5. Log in to redmine with login admin and password admin
+
diff --git a/www-apps/redmine/metadata.xml b/www-apps/redmine/metadata.xml
index a9b631b..104acbb 100644
--- a/www-apps/redmine/metadata.xml
+++ b/www-apps/redmine/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ruby</herd>
 <herd>www-apps</herd>
 <use>
-	<flag name='imagemagick'>Allows gantt export to a png image</flag>
+  <flag name='darcs'>Support dev-util/darcs based repositories.</flag>
+  <flag name='imagemagick'>Allows gantt export to a png image</flag>
+  <flag name='git'>Support dev-util/git based repositories.</flag>
+  <flag name='openid'>Enable OpenID support.</flag>
+  <flag name='mercurial'>Support dev-util/mercurial based repositories.</flag>
 </use>
 <longdescription lang="en">
 	Redmine is a flexible project management web application. Written using Ruby
diff --git a/www-apps/redmine/redmine-0.8.0_rc1.ebuild b/www-apps/redmine/redmine-0.8.0_rc1.ebuild
deleted file mode 100644
index 0d85476..0000000
--- a/www-apps/redmine/redmine-0.8.0_rc1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-inherit eutils confutils
-
-DESCRIPTION="Redmine is a flexible project management web application written using Ruby on Rails framework"
-HOMEPAGE="http://www.redmine.org/"
-if [[ ${PV} = 9999 ]]; then
-	inherit subversion
-	ESVN_REPO_URI="svn://rubyforge.org/var/svn/${PN}/trunk"
-	KEYWORDS=""
-else
-	SRC_URI="mirror://rubyforge/${PN}/${P/rc/RC}.tar.gz"
-	KEYWORDS="" # 0.8.0rc1 is broken. USE SVN VERSION!.
-	S=${WORKDIR}/${P/rc/RC}
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="cvs darcs git imagemagick +mysql postgres sqlite3 subversion"
-
-# TODO: 
-# 1. separate plugins....
-#	dev-ruby/actionwebservice (rm vendor/plugins/{actionwebservice)
-#	dev-ruby/coderay - coderay-0.7.6.227 is bundled, it's newer then in tree
-DEPEND=">=virtual/ruby-1.8.6_p200
-	>=dev-ruby/rails-2.1.2:2.1
-	mysql? ( dev-ruby/activerecord:2.1[mysql] )
-	postgres? ( dev-ruby/activerecord:2.1[postgres] )
-	sqlite3? ( dev-ruby/activerecord:2.1[sqlite3] )
-	www-servers/mongrel
-	dev-ruby/ruby-net-ldap
-	imagemagick? ( dev-ruby/rmagick )"
-
-RDEPEND="${DEPEND}
-	cvs? ( >=dev-util/cvs-1.12 )
-	darcs? ( dev-util/darcs )
-	git? ( dev-util/git )
-	mercurial? ( dev-util/mercurial )
-	subversion? ( >=dev-util/subversion-1.3 )"
-
-pkg_preinst() {
-	confutils_require_any mysql postgres sqlite3
-
-	enewgroup redmine
-	enewuser  redmine -1 -1 -1 redmine
-}
-
-src_install() {
-	dodoc doc/{UPGRADING,INSTALL,CHANGELOG}
-	#rm -fr doc vendor/plugins/{coderay-*,ruby-net-ldap-*}
-	rm -fr doc vendor/plugins/ruby-net-ldap-*
-
-	mv config/database.yml{.example,}
-	mv config/email.yml{.example,}
-	insinto /etc/${PN}
-	doins -r config/*
-	rm -rf config log
-	dosym /etc/${PN}/ /var/lib/${PN}/config
-	keepdir /var/log/${PN}
-	dosym /var/log/${PN} /var/lib/${PN}/log
-
-	rm files/delete.me
-	insinto /var/lib/${PN}
-	doins -r .
-	keepdir /var/lib/${PN}/files
-	fowners -R redmine:redmine /var/lib/${PN}/{files,tmp,public} /var/log/${PN}
-
-	newconfd "${FILESDIR}/redmine.confd" redmine
-	newinitd "${FILESDIR}/redmine.initd" redmine
-}
-
-pkg_postinst() {
-	einfo
-	elog "Installation notes are at official site"
-	elog "http://www.redmine.org/wiki/redmine/RedmineInstall"
-	elog
-	elog "For upgrade instructions take a look at:"
-	elog "http://www.redmine.org/wiki/redmine/RedmineUpgrade"
-	einfo
-}
diff --git a/www-apps/redmine/redmine-9999.ebuild b/www-apps/redmine/redmine-9999.ebuild
index 0d85476..2b0ce0b 100644
--- a/www-apps/redmine/redmine-9999.ebuild
+++ b/www-apps/redmine/redmine-9999.ebuild
@@ -1,71 +1,88 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 EAPI="2"
 inherit eutils confutils
+#inherit webapp
 
-DESCRIPTION="Redmine is a flexible project management web application written using Ruby on Rails framework"
-HOMEPAGE="http://www.redmine.org/"
+DESCRIPTION="Flexible project management web application written using Ruby on Rails framework"
+HOMEPAGE="http://www.redmine.org"
 if [[ ${PV} = 9999 ]]; then
 	inherit subversion
-	ESVN_REPO_URI="svn://rubyforge.org/var/svn/${PN}/trunk"
+	ESVN_REPO_URI="http://redmine.rubyforge.org/svn/trunk/"
 	KEYWORDS=""
 else
 	SRC_URI="mirror://rubyforge/${PN}/${P/rc/RC}.tar.gz"
-	KEYWORDS="" # 0.8.0rc1 is broken. USE SVN VERSION!.
+	KEYWORDS="~amd64"
 	S=${WORKDIR}/${P/rc/RC}
 fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="cvs darcs git imagemagick +mysql postgres sqlite3 subversion"
+IUSE="cvs darcs git imagemagick mercurial +mysql openid postgres sqlite3 subversion"
+
 
 # TODO: 
-# 1. separate plugins....
-#	dev-ruby/actionwebservice (rm vendor/plugins/{actionwebservice)
-#	dev-ruby/coderay - coderay-0.7.6.227 is bundled, it's newer then in tree
-DEPEND=">=virtual/ruby-1.8.6_p200
-	>=dev-ruby/rails-2.1.2:2.1
-	mysql? ( dev-ruby/activerecord:2.1[mysql] )
-	postgres? ( dev-ruby/activerecord:2.1[postgres] )
-	sqlite3? ( dev-ruby/activerecord:2.1[sqlite3] )
-	www-servers/mongrel
-	dev-ruby/ruby-net-ldap
-	imagemagick? ( dev-ruby/rmagick )"
+# 1. dev-ruby/actionwebservice (rm vendor/plugins/{actionwebservice)
+# 2. tests: doc/RUNNING_TESTS
+DEPEND="dev-ruby/rails:2.3
+	dev-ruby/activerecord:2.2[mysql?,postgres?,sqlite3?]"
 
 RDEPEND="${DEPEND}
+	www-servers/mongrel
+	>=dev-ruby/ruby-net-ldap-0.0.4
+	>=dev-ruby/coderay-0.7.6.227
 	cvs? ( >=dev-util/cvs-1.12 )
 	darcs? ( dev-util/darcs )
 	git? ( dev-util/git )
+	imagemagick? ( dev-ruby/rmagick )
 	mercurial? ( dev-util/mercurial )
+	openid? ( >=dev-ruby/ruby-openid-2 )
 	subversion? ( >=dev-util/subversion-1.3 )"
 
-pkg_preinst() {
+pkg_setup() {
+#	webapp_pkg_setup
 	confutils_require_any mysql postgres sqlite3
-
 	enewgroup redmine
-	enewuser  redmine -1 -1 -1 redmine
+	# home directory is required for SCM.
+	enewuser redmine -1 -1 -1 redmine
 }
 
 src_install() {
+	rm files/delete.me
 	dodoc doc/{UPGRADING,INSTALL,CHANGELOG}
-	#rm -fr doc vendor/plugins/{coderay-*,ruby-net-ldap-*}
-	rm -fr doc vendor/plugins/ruby-net-ldap-*
+	rm -fr doc log vendor/plugins/{coderay-*,ruby-net-ldap-*}
+
+	# redmine does not work in case config is symlink. Moving only really
+	# important files into /etc/redmine.
+	dodir /etc/${PN}
+	mv config/database.yml.example "${D}/etc/${PN}/database.yml"
+	mv config/email.yml.example "${D}/etc/${PN}/email.yml"
+#########################################################
+	#webapp_src_preinst
+	#cp -R * "${D}/${MY_HTDOCSDIR}"
+	#dodir "${MY_HTDOCSDIR}"/{tmp,public/plugin_assets}
+	#webapp_serverowned -R ${MY_HTDOCSDIR}/{files,log,tmp,public/plugin_assets}
+	#fperms 0755 -R ${MY_HTDOCSDIR}/{files,log,tmp,public/plugin_assets}
+	#webapp_configfile "${MY_HTDOCSDIR}/config/database.yml"
+	#webapp_configfile "${MY_HTDOCSDIR}/config/email.yml"
+	#webapp_configfile "${MY_HTDOCSDIR}/config/settings.yml"
+	#webapp_postinst_txt en "${FILESDIR}"/${P}-postinst.en.txt
 
-	mv config/database.yml{.example,}
-	mv config/email.yml{.example,}
-	insinto /etc/${PN}
-	doins -r config/*
-	rm -rf config log
-	dosym /etc/${PN}/ /var/lib/${PN}/config
-	keepdir /var/log/${PN}
+	#webapp_src_install
+#########################################################
+
+	dodir /var/log/${PN}
 	dosym /var/log/${PN} /var/lib/${PN}/log
 
-	rm files/delete.me
-	insinto /var/lib/${PN}
-	doins -r .
-	keepdir /var/lib/${PN}/files
+	# This should work in EAPI=3, but not yet... using cp instead :)
+	#insinto /var/lib/${PN}
+	#doins -r .
+	cp -r * "${D}/var/lib/${PN}"
+	dosym /etc/${PN}/database.yml /var/lib/${PN}/config/
+	dosym /etc/${PN}/email.yml /var/lib/${PN}/config/
+	dodir /var/lib/${PN}/files
 	fowners -R redmine:redmine /var/lib/${PN}/{files,tmp,public} /var/log/${PN}
 
 	newconfd "${FILESDIR}/redmine.confd" redmine