Bug #348712, version bump too.

Package-Manager: portage-2.1.9.25/cvs/Linux i686

6 files changed, 168 insertions, 6 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/Manifest b/app-office/openerp-server/Manifest
index a617c373f5e1..61887f323b1f 100644
--- a/app-office/openerp-server/Manifest
+++ b/app-office/openerp-server/Manifest
@@ -1,6 +1,10 @@
-AUX openerp-server 670 RMD160 b4bdc5f638ec77789f8a1bc2ab896afa19ca7f2c SHA1 d5e19d3ca2de1cbc8d53fd78ff3f41f1c3579645 SHA256 b220b298328062a899f6358c479f72feb1d9404a3fad6de9059c2c9e8bc4aab8
+AUX openerp-server 682 RMD160 0c9fd79469433ae675bf61eb16cffe68f74849ab SHA1 fa05c51decaa8fdd48731bb18ed6425a205dddc3 SHA256 7b92073d29dc00ce81c1586e78285cd995cbca0c1ea0f9330373a6c00c542cc0
 AUX openerp-server-confd 105 RMD160 a43bebb092ae8b5ba7f24abe735cbb7b0879ab30 SHA1 6a3a0c2c7f7e0e6215a379a523387188237bb2bd SHA256 d2a001ed22e104eaf68c64f0fecb18d50a6aa6439050fe7da2ba6def584135bf
+AUX openerp-server.cfg 1026 RMD160 930ff0e4434b5a0aa36269aa066486572cea400c SHA1 3bac0e9714f1f984fba37c5e1977eaab2e7e66af SHA256 1a5e9cf33372cd66823fc2681f46000d2381e0b9e52301e85037f1b38e7fa665
+AUX openerp-server.logrotate 341 RMD160 e3f08d24390d29982ea727cf43006651a959f213 SHA1 57d1d6cb9ffac4f0f06ba62a3095fa4cb8e132ed SHA256 7b6f0e33b6aa897d5c07a2e5f7e2edfec5e7238c4724483f12a341e56ae3fc4d
+DIST openerp-server-5.0.15.tar.gz 10529558 RMD160 11679778890aefb05182a41981750ea5d011d83b SHA1 45ecc01e826f8c10b7de97d155492a4dcff8026a SHA256 021dd27f352e1c92c0912d8b50f05cfcee39052551a2c6d90ee1677f4e361504
 DIST openerp-server-5.0.6.tar.gz 8733610 RMD160 1feffe5db442d503744fcf2e8c7eacf8b9fe670e SHA1 8f9a180d560c3d0f612663f09348923a22644c0d SHA256 5812b3199e2ecc473a265af0fc33626079351f3d119281e84df4edba5b5a0df4
+EBUILD openerp-server-5.0.15.ebuild 2025 RMD160 8ee4f1b79e9a4296123820b2b4214ab9c0c5e50f SHA1 c80b530363b7cd7ec2594f89a81c7a6fc4022e88 SHA256 1b7c2386e92d8b1d8eee9e59c01ef61431d20a9388b4ee07d3b39205827eebd9
 EBUILD openerp-server-5.0.6.ebuild 1776 RMD160 b7c2e5fbf11402b8b84322ba197a793b68d53cde SHA1 2db127f8d6c3ab1334b1406bb2c22c1f23100047 SHA256 ef70d73d80525b94b8cc5ba3128b3d63361479393855510aa121191462438e3e
-MISC ChangeLog 428 RMD160 9edbd59ee5b333a869755b7e76456599db0a1204 SHA1 06f179f2bf5ba3e1e3dfcafa14aad9b489f8c261 SHA256 443d867a8b60b977c2c2f2c37bc34c75d3739569b6e10c6d5aba1831e251316c
+MISC ChangeLog 684 RMD160 2d6626004450690e39d0cfd154226d6ac72606c9 SHA1 335a295597d08d78ef4edeb17eef89358c3fb8c3 SHA256 cc36f298e3ee7868e254c190d8ccbdf47629884433ef24ddd828a55afaa61728
 MISC metadata.xml 323 RMD160 e814c8bef9e7078c47c44aa8492bcd984cae8f79 SHA1 fa18189f20b8118eab7498fa5ab94b5a5984bb76 SHA256 439632562128324755ba89695bf93de377c64c3e7a81c6819c7694d5b3d78c39
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
+}