5 files changed, 142 insertions, 2 deletions
diff --git a/app-office/openerp/ChangeLog b/app-office/openerp/ChangeLog
index 11a5285b4033..a85484d84522 100644
--- a/app-office/openerp/ChangeLog
+++ b/app-office/openerp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/openerp
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openerp/ChangeLog,v 1.4 2013/02/19 09:31:41 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openerp/ChangeLog,v 1.5 2013/02/19 09:45:53 patrick Exp $
+
+*openerp-7.0.20130219-r1 (19 Feb 2013)
+
+  19 Feb 2013; Patrick Lauer <patrick@gentoo.org> +files/openerp-2,
+  +files/openerp-confd-2, +openerp-7.0.20130219-r1.ebuild:
+  Fixing for /run migration
 
 *openerp-7.0.20130219 (19 Feb 2013)
 
diff --git a/app-office/openerp/Manifest b/app-office/openerp/Manifest
index 05f91e5224dc..9d4adf84e3f4 100644
--- a/app-office/openerp/Manifest
+++ b/app-office/openerp/Manifest
@@ -1,6 +1,8 @@
 AUX openerp 489 SHA256 3a4cd680b3a4497f76e1c015e4ba36972f099e14f17cb04da3ff14cedb017618 SHA512 a57a4711dc1eb34ccc14aa32542f3e2093948556358bd00b04db6ab8cbb23b1e1a1bfc98ee05c6f8203958ca3af43f9044c097027d26592dd50f08effac45697 WHIRLPOOL acead075805334affc8ad4e46d8b4ec1ab8f7a5bd3f05970d04e4cdd71011b18d5553e3d4c771a1ca47c6a76976c353c05a26e5cd3c60be23880c8910e452012
+AUX openerp-2 546 SHA256 a3fdd0b7292f957957eb02525a63786ec243403885d14e4332c1af88bba4abe6 SHA512 ce778a3aaae577dbb9fb23bef112181a82daafd79c2f52c28cd2faf6fbe84a6d28a7f7ff9e3a94f1485e785e48492849ec98df3fe2191b87fbf0b99d87c28ffe WHIRLPOOL 5eca9e98826989a1ed324bb9670948b16ed00c7af42d6f158d5976935be693ee549e5a26d39337eb236fa51a671efa049a3e3433c01011dbd5907007caddd4c2
 AUX openerp-6.1-setup.py.patch 1009 SHA256 a4e47a30186ee12136a0506d9b087787def94ffc98eda257f8549838673319fe SHA512 9affa8e3a93257792f44607e0bdf4b81ad517e50d1abd2d9848fa27642c5ef21b3a737d4d05b530694154404939f61dea935b91b002fed92e33059de7e221864 WHIRLPOOL 8364bf04ea6fb957b7493adcf6fb6aeaba5462d1778059f225f7bc0b5896667ef701407eea9b07a29d756d9d44c6b5ecac69141848217e851e791e835e0c60b5
 AUX openerp-confd 92 SHA256 bf970b49b905c7dc85399040c6e8a355de4a8ba50b03487a0de6575cd1dbd5a6 SHA512 8e1e47263247a340add6e97f45c11e2e629da564dfe600b31ba75f922f9a9311e3799f8896ac9eae53361cbe7f5e763bcff46ea52bc1884444457696f989e925 WHIRLPOOL f144f7d9307ab0197428a2e9a49895cdb904fb844aeb56cc4100c49544b78bcb6e5ca718f5c313b21d589a26885d6aa071f2675103d13ad729c5adbec0cde1bb
+AUX openerp-confd-2 88 SHA256 6a9f1b6849ca8d3e47023fd02ec0dab295542d9c430914b2f876bc3a4c1a3d79 SHA512 789db9fbfcc90e4302f98c8fb81438767bdd17dc3351d2d706cabeea7b1f92bbd9efce2deb570295798a2358fa4bafd8cdf9e1ab311e0673c943b36aabe50d15 WHIRLPOOL 183347d60ac5324b295aeefde8ac60187b8fc216238fbbc02c719eae032c843ca88a3ef32fb113b3ea26215b3bd81c854d51a6da2e7e3751e7e8a5568afbea14
 AUX openerp.cfg 1115 SHA256 8ae3d8c38d7f991128c8b040c583bebe1b797a9c264c8bbd24f52107d488f9fc SHA512 6ca4638ee2bc00d2572366416aa8107e7045b10c7f89b383efe1b782e7c6d9190f5423633884dce647944bd297431eeeb194b433a21955c4542b75ab7d820a66 WHIRLPOOL 3a57f655c2252b7bf7c2aff9d5ac91a5310f9a34e3f823a883ab2ec2f4cd4e4bef0473fd8676cb4d2d82b3dd52e9b2d82acaac63bf7f084fe67fa9f0d9b8faf3
 AUX openerp.logrotate 315 SHA256 5d411eb1f6feb5347f7c54c94dfd091d657a6b87a72b4d1c7cd69222ead49bd8 SHA512 64c9daeaac7cd47690434922767d8b8df8ee2454450e68d6a7aa7658b6e2f500d0f35367d058700360f1a97ec46b8887e07a245a27192019ed958419869c58d5 WHIRLPOOL 49f494ffa41a882062f6754ac9f4180f10b0c4dc4f1ce2d95e8ab3e2440067f96f4917ab04284789ae2ecfb8b6d53e0d6396c1d52b94006394cad760db6ce0fc
 DIST openerp-6.1-1.tar.gz 73310629 SHA256 a89016d706f1693833590d2ce5cf7768fb3586213661014adad5ed16cdc77cd7 SHA512 0cf407fda4d7ce414b548310018609381157e656069b5224bb05ae6dbf7d534b9acbbb5be561ec1f9a26786ec6fc9b917fb78faff3c67340916f663ccb5297cf WHIRLPOOL 384ae795df9d23c07a6e06c0c468cb6d9af0c2625648bda5d895271f2d1e07d00b81e7da3d4255f709d5eed299166c65b29ec335a71307ea1a3f6775b590befe
@@ -8,6 +10,7 @@ DIST openerp-7.0-20130118-002240.tar.gz 58331061 SHA256 adaa96dca146f55efa97f654
 DIST openerp-7.0-20130219-002614.tar.gz 60420142 SHA256 e4408348259fa8bf86909035a4f86417671f09ac6c4a9ec50c4a55a69e5a3674 SHA512 15cb43d1a698da751a0109c256dd8875b7a064541ee7550c66d70c03143aa6486eb39b05966b1ef77e4cf9b0d333101e84fb8508411a7acf9b0a44a0f8897f3a WHIRLPOOL c4a5840fa9d76840f0da645e4a107296750d32161f21d81b22ba579b35172d2abe2fb24126e2c69de18e0b13a4555a82e938291728f6c370451a150a218fbbeb
 EBUILD openerp-6.1.1.ebuild 2743 SHA256 1db92a3315b43f38c22841e6419a68b5dda1be205dfb391c31744b611fd2237f SHA512 80d592bb20031e88247879343c326b3e509482fe074b43b2657fbd34c9c11752994670f47705d56f5e597e1eecda579665dfe38705fcce18883ef37a9475beb0 WHIRLPOOL bf1885879184f9e4fe3345da48af363112e36d217d495b767d2bfa57000b80b9fd427d6d51e78cbbec4cbf473b277ba738a8261446d7b92523235817ad4c47ba
 EBUILD openerp-7.0.20130118.ebuild 2806 SHA256 daf917aaaba259c6380483ea96a71ca2c8f831da91e6812aa8b1040ff14070fa SHA512 c0165b00b7f5b824b60adfb1cba4c87e7d75a875607369dfbab02fbb443605bbe7a9f3564724881dfff24bf58f49c66baac136ab18e1873ab4469de0b5d1c559 WHIRLPOOL 1b5ed9974b4630ef27cf64044f65ba331096bdac055211c0f42c4eb426d130640718fd6da25c1695e817511d714eb1eb2f41beb55197e57fadf54deabdfe7cd9
+EBUILD openerp-7.0.20130219-r1.ebuild 2715 SHA256 e801797e05a37b8165a5553fda5d67a5e88b86133d5b55d6d43827eb5c24f31d SHA512 1b5d81ac47cccc6577049580d15838bca26f580dfd9b30baf975506d847aa0bd3026455d032f2b777c3e036c68bd2971957948783feabfde59b69ea7512e7f49 WHIRLPOOL 994eb55de97319f0178374ba45cab929bbd5ef80edeb1c367ae1f33f2ac7a187039507a2c274160d63df7a066c368945c58f3e9e360a03b73f6811958349ee4e
 EBUILD openerp-7.0.20130219.ebuild 2845 SHA256 87f578b2faf73114bb9054174b0868df99343e9452b5e06cb5701ebffd9e8a7b SHA512 03aeb4b2047845ff053bf939ade8cc89abd116e8aa9246e233dfa337a0cd28c53ed7b6984cc2b8f1b8f5bf6a32ade0e776da4e7b33da17e7edcd020ea481f8c6 WHIRLPOOL 448d4309110db756bf9dd3eef8349ad5480331836449dc96ec6628f26d4eee159d38ad17bce587ebc12ab426ee2420e520357c24337b5e80b509b46cee6cf4b2
-MISC ChangeLog 996 SHA256 b36700dd041eb3c4e52b16841b2ec62889d6ce5618403bfe8f6434a01c604d8b SHA512 1f20b156f6ad4961087cceb796866e2f77a20be92ada6d6175941b157c7ddd051042416644adae7d5f666e53c3029c52ebbe6f8bfc6ce21a3351ede79c116d9e WHIRLPOOL bfe6c4cecbc0623bd62270fea4b18464ad4fb6e65317daf6f252deb312db82f62d11b0b6f3fb6e0e3cf1022a2976bf5f0cedaf46a2e5063c9b7f557f7445830b
+MISC ChangeLog 1192 SHA256 d4d45f05c18e5eb99d2ddd797f32050bbc0c74ed8b6c2461eb418e77cbfc3d0a SHA512 823040e0a729493e51c049a1cd603f75b2d71e207dcc0782116a6c036c57b838ea18173163e999c1ba04a6df8cd107210655306abd04502d5f470788b0ac3c69 WHIRLPOOL 07ba40039303b9bf0c091b6a123ad91dd1e4cc62b49713786ab53e5c78fd8cbdd8768835598b99a6b37c9105b543e311b37c85ef48b812ffcf355e9ac5f36cc9
 MISC metadata.xml 233 SHA256 65209e280ca6de32a92e1a57301ff69fb3472e55ba07848d6f80405d35e92d47 SHA512 0d30bfb39315a04767e07896409f5d3954f8e954e20fcbac7b92bb9a636c9f61c50b1b2cf55e6c1db9a199a0edc159b5c8cc8f541efb9c4adafa28e3652cff7b WHIRLPOOL 027c5101e1cbc665c9d2ef240f73a874c9f49a9b70175c5947e012df61de484585088a46b6ce9078816e548e6bcc326e7223539cc999159eee2757d0a2eb1480
diff --git a/app-office/openerp/files/openerp-2 b/app-office/openerp/files/openerp-2
new file mode 100644
index 000000000000..c6e9f5a35e2e
--- /dev/null
+++ b/app-office/openerp/files/openerp-2
@@ -0,0 +1,23 @@
+#!/sbin/runscript
+
+# Additional options that are passed to the daemon.
+DAEMON_OPTS="-c ${CONFIGFILE}"
+
+depend() {
+	after postgresql
+}
+
+start() {
+	checkpath -q -d -m 0755 -o openerp:openerp /run/openerp
+	ebegin "Starting openerp server"
+	start-stop-daemon --start --quiet --pidfile "${PIDFILE}" --exec /usr/bin/openerp-server \
+		--make-pidfile --user "${USER}" --background -- ${DAEMON_OPTS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping openerp server"
+	start-stop-daemon --stop --quiet --pidfile "${PIDFILE}" --signal 9
+	rm -f "${PIDFILE}"
+	eend $?
+}
diff --git a/app-office/openerp/files/openerp-confd-2 b/app-office/openerp/files/openerp-confd-2
new file mode 100644
index 000000000000..5e84946046cd
--- /dev/null
+++ b/app-office/openerp/files/openerp-confd-2
@@ -0,0 +1,3 @@
+USER="openerp"
+CONFIGFILE="/etc/openerp/openerp.cfg"
+PIDFILE="/run/openerp/openerp.pid"
diff --git a/app-office/openerp/openerp-7.0.20130219-r1.ebuild b/app-office/openerp/openerp-7.0.20130219-r1.ebuild
new file mode 100644
index 000000000000..47526ea132e9
--- /dev/null
+++ b/app-office/openerp/openerp-7.0.20130219-r1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/openerp/openerp-7.0.20130219-r1.ebuild,v 1.1 2013/02/19 09:45:53 patrick Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2"
+
+inherit eutils distutils user
+
+DESCRIPTION="Open Source ERP & CRM"
+HOMEPAGE="http://www.openerp.com/"
+#yes, this is definitely a horrible URI
+MY_PV=${PV/7.0./7.0-}
+FNAME="${PN}-${MY_PV}-002614"
+SRC_URI="http://nightly.openerp.com/7.0/nightly/src/${FNAME}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="+postgres ldap ssl"
+
+CDEPEND="postgres? ( dev-db/postgresql-server )
+	dev-python/psutil
+	dev-python/docutils
+	dev-python/lxml
+	dev-python/psycopg:2
+	dev-python/pychart
+	dev-python/reportlab
+	media-gfx/pydot
+	dev-python/vobject
+	dev-python/mako
+	dev-python/pyyaml
+	dev-python/Babel
+	dev-python/gdata
+	ldap? ( dev-python/python-ldap )
+	dev-python/python-openid
+	dev-python/werkzeug
+	dev-python/xlwt
+	dev-python/feedparser
+	dev-python/python-dateutil
+	dev-python/pywebdav
+	ssl? ( dev-python/pyopenssl )
+	dev-python/vatnumber
+	dev-python/zsi
+	dev-python/mock
+	dev-python/unittest2"
+
+RDEPEND="${CDEPEND}"
+DEPEND="${CDEPEND}"
+
+OPENERP_USER="openerp"
+OPENERP_GROUP="openerp"
+
+S="${WORKDIR}/${FNAME}"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_install() {
+	distutils_src_install
+
+	doinitd "${FILESDIR}/${PN}-2"
+	newconfd "${FILESDIR}/openerp-confd-2" "${PN}"
+	keepdir /var/log/openerp
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/openerp.logrotate openerp || die
+	dodir /etc/openerp
+	insinto /etc/openerp
+	newins "${FILESDIR}"/openerp.cfg openerp.cfg || die
+}
+
+pkg_preinst() {
+	enewgroup ${OPENERP_GROUP}
+	enewuser ${OPENERP_USER} -1 -1 -1 ${OPENERP_GROUP}
+
+	fowners ${OPENERP_USER}:${OPENERP_GROUP} /var/log/openerp
+	fowners -R ${OPENERP_USER}:${OPENERP_GROUP} "$(python_get_sitedir)/${PN}/addons/"
+
+	use postgres || sed -i '6,8d' "${D}/etc/init.d/openerp" || die "sed failed"
+}
+
+pkg_postinst() {
+	chown ${OPENERP_USER}:${OPENERP_GROUP} /var/log/openerp
+	chown -R ${OPENERP_USER}:${OPENERP_GROUP} "$(python_get_sitedir)/${PN}/addons/"
+
+	elog "In order to setup the initial database, run:"
+	elog " emerge --config =${CATEGORY}/${PF}"
+	elog "Be sure the database is started before"
+}
+
+psqlquery() {
+	psql -q -At -U postgres -d template1 -c "$@"
+}
+
+pkg_config() {
+	einfo "In the following, the 'postgres' user will be used."
+	if ! psqlquery "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
+}