Bug #348712, version bump too.

(Portage version: 2.1.9.25/cvs/Linux i686)

5 files changed, 162 insertions, 4 deletions

diff --git a/app-office/openerp-server/ChangeLog b/app-office/openerp-server/ChangeLog
index 0ffbecc220da..36e3f93e56aa 100644
--- a/app-office/openerp-server/ChangeLog
+++ b/app-office/openerp-server/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-office/openerp-server
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openerp-server/ChangeLog,v 1.1 2010/12/13 11:02:20 elvanor Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/openerp-server/ChangeLog,v 1.2 2011/01/14 10:32:36 elvanor Exp $
+
+*openerp-server-5.0.15 (14 Jan 2011)
+
+  14 Jan 2011; <elvanor@gentoo.org> +openerp-server-5.0.15.ebuild,
+  files/openerp-server, +files/openerp-server.cfg,
+  +files/openerp-server.logrotate:
+  Bump to 5.0.15, some improvements / suggestions from #348712.
 
 *openerp-server-5.0.6 (13 Dec 2010)
 
diff --git a/app-office/openerp-server/files/openerp-server b/app-office/openerp-server/files/openerp-server
index e67ac2ba1b91..724192b62649 100755
--- a/app-office/openerp-server/files/openerp-server
+++ b/app-office/openerp-server/files/openerp-server
@@ -4,7 +4,7 @@
 DAEMON_OPTS="-c ${CONFIGFILE}"
 
 depend() {
-	need postgresql
+	after postgresql
 }
 
 start() {
@@ -17,7 +17,7 @@ start() {
 
 stop() {
 	ebegin "Stopping openerp-server"
-	start-stop-daemon --stop --quiet --pidfile "${PIDFILE}" --oknodo
+	start-stop-daemon --stop --quiet --pidfile "${PIDFILE}" --oknodo --signal 9
 	rm -f "${PIDFILE}"
 	eend $?
 }
diff --git a/app-office/openerp-server/files/openerp-server.cfg b/app-office/openerp-server/files/openerp-server.cfg
new file mode 100644
index 000000000000..12e7b11e4fff
--- /dev/null
+++ b/app-office/openerp-server/files/openerp-server.cfg
@@ -0,0 +1,63 @@
+[options]
+
+# General options:
+admin_passwd = admin
+
+pidfile = /var/run/openerp/openerp-server.pid
+interface =
+port = 8069
+netinterface =
+netport = 8070
+netrpc = True
+xmlrpc = True
+init =
+without_demo = False
+demo = {}
+update =
+cache_timeout = 100000
+stop_after_init = False
+debug_mode = False
+assert_exit_level = warn
+price_accuracy = 2
+
+# SSL Configuration:
+secure = False
+secure_cert_file = server.cert
+secure_pkey_file = server.pkey
+
+# Logging Configuration:
+logfile = /var/log/openerp/openerp-server.log
+syslog = False
+log_level = debug
+
+# SMTP Configuration:
+email_from = False
+smtp = localhost
+smtp_port = 25
+smtp_ssl = False
+smtp_user = False
+smtp_password = False
+
+# Database related options:
+db_user = openerp
+db_password = change_this
+pg_path = None
+db_name = False
+db_host = False
+db_port = False
+db_maxconn = 64
+import_partial =
+
+# Internationalisation options:
+language =
+translate_out =
+translate_in =
+translate_modules = ['all']
+
+# Security-related options:
+list_db = True
+server_actions_allow_code = False
+
+
+
+
diff --git a/app-office/openerp-server/files/openerp-server.logrotate b/app-office/openerp-server/files/openerp-server.logrotate
new file mode 100644
index 000000000000..9e86fe66175e
--- /dev/null
+++ b/app-office/openerp-server/files/openerp-server.logrotate
@@ -0,0 +1,10 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/openerp-server/files/openerp-server.logrotate,v 1.1 2011/01/14 10:32:36 elvanor Exp $
+
+/var/log/openerp/openerp-server.log {
+ monthly
+ create 660 openerp openerp
+ missingok
+ copytruncate
+}
\ No newline at end of file
diff --git a/app-office/openerp-server/openerp-server-5.0.15.ebuild b/app-office/openerp-server/openerp-server-5.0.15.ebuild
new file mode 100644
index 000000000000..8705521241ac
--- /dev/null
+++ b/app-office/openerp-server/openerp-server-5.0.15.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/openerp-server/openerp-server-5.0.15.ebuild,v 1.1 2011/01/14 10:32:36 elvanor Exp $
+
+EAPI="2"
+
+inherit eutils distutils
+
+DESCRIPTION="Open Source ERP & CRM"
+HOMEPAGE="http://www.openerp.com/"
+SRC_URI="http://www.openerp.com/download/stable/source/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CDEPEND="dev-db/postgresql-server
+	dev-python/lxml
+	dev-python/psycopg
+	dev-python/pychart
+	dev-python/pytz
+	dev-python/pyxml
+	dev-python/pyopenssl
+	dev-python/reportlab
+	media-gfx/pydot
+	dev-libs/libxslt[python]
+	dev-libs/libxml2[python]"
+
+RDEPEND="${CDEPEND}"
+DEPEND="${CDEPEND}"
+
+OPENERP_USER="openerp"
+OPENERP_GROUP="openerp"
+
+src_install() {
+	distutils_src_install
+
+	doinitd "${FILESDIR}/${PN}"
+	newconfd "${FILESDIR}/openerp-server-confd" "${PN}"
+	keepdir /var/run/openerp
+	keepdir /var/log/openerp
+
+	rm "${D}/usr/bin/openerp-server"
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/openerp-server.logrotate openerp-server || die
+	dodir /etc/openerp
+	insinto /etc/openerp
+	newins "${FILESDIR}"/openerp-server.cfg openerp-server.cfg || die
+}
+
+pkg_preinst() {
+	enewgroup ${OPENERP_GROUP}
+	enewuser ${OPENERP_USER} -1 -1 -1 ${OPENERP_GROUP}
+
+	fowners ${OPENERP_USER}:${OPENERP_GROUP} /var/run/openerp
+	fowners ${OPENERP_USER}:${OPENERP_GROUP} /var/log/openerp
+}
+
+pkg_postinst() {
+	elog "In order to setup the initial database, run:"
+	elog " emerge --config =${CATEGORY}/${PF}"
+	elog "Be sure the database is started before"
+}
+
+pquery() {
+	psql -q -At -U postgres -d template1 -c "$@"
+}
+
+pkg_config() {
+	einfo "In the following, the 'postgres' user will be used."
+	if ! pquery "SELECT usename FROM pg_user WHERE usename = '${OPENERP_USER}'" | grep -q ${OPENERP_USER}; then
+		ebegin "Creating database user ${OPENERP_USER}"
+		createuser --username=postgres --createdb --no-adduser ${OPENERP_USER}
+		eend $? || die "Failed to create database user"
+	fi
+}