summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Lauer <patrick@gentoo.org>2013-01-21 08:54:18 +0000
committerPatrick Lauer <patrick@gentoo.org>2013-01-21 08:54:18 +0000
commit926098ce51b27900793be6d8c5bd0b54c47bd674 (patch)
tree1707df55be103f560606135619811e9db961884e /app-office/openerp
parentadding dev-python/colorama for dev-python/openstack-nose-plugins (diff)
downloadgentoo-2-926098ce51b27900793be6d8c5bd0b54c47bd674.tar.gz
gentoo-2-926098ce51b27900793be6d8c5bd0b54c47bd674.tar.bz2
gentoo-2-926098ce51b27900793be6d8c5bd0b54c47bd674.zip
Bump
(Portage version: 2.2.0_alpha158/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'app-office/openerp')
-rw-r--r--app-office/openerp/ChangeLog10
-rw-r--r--app-office/openerp/openerp-7.0.20130118.ebuild (renamed from app-office/openerp/openerp-6.2_pre20121029.ebuild)21
2 files changed, 17 insertions, 14 deletions
diff --git a/app-office/openerp/ChangeLog b/app-office/openerp/ChangeLog
index b3a72544801b..6d943e6182af 100644
--- a/app-office/openerp/ChangeLog
+++ b/app-office/openerp/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for app-office/openerp
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openerp/ChangeLog,v 1.2 2012/10/30 13:42:07 patrick Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/openerp/ChangeLog,v 1.3 2013/01/21 08:54:18 patrick Exp $
+
+*openerp-7.0.20130118 (21 Jan 2013)
+
+ 21 Jan 2013; Patrick Lauer <patrick@gentoo.org> +openerp-7.0.20130118.ebuild,
+ -openerp-6.2_pre20121029.ebuild:
+ Bump
*openerp-6.2_pre20121029 (30 Oct 2012)
diff --git a/app-office/openerp/openerp-6.2_pre20121029.ebuild b/app-office/openerp/openerp-7.0.20130118.ebuild
index 27664456008d..8bbd28da5c36 100644
--- a/app-office/openerp/openerp-6.2_pre20121029.ebuild
+++ b/app-office/openerp/openerp-7.0.20130118.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# 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-6.2_pre20121029.ebuild,v 1.1 2012/10/30 13:42:07 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openerp/openerp-7.0.20130118.ebuild,v 1.1 2013/01/21 08:54:18 patrick Exp $
EAPI="3"
PYTHON_DEPEND="2"
@@ -10,13 +10,14 @@ inherit eutils distutils
DESCRIPTION="Open Source ERP & CRM"
HOMEPAGE="http://www.openerp.com/"
#yes, this is definitely a horrible URI
-FNAME="${PN}-${PV/_*/}dev-${PV/*_pre/}-000101"
-SRC_URI="http://nightly.openerp.com/trunk/nightly/src/${FNAME}.tar.gz"
+MY_PV=${PV/7.0./7.0-}
+FNAME="${PN}-${MY_PV}-002240"
+SRC_URI="http://nightly.openerp.com/7.0/nightly/src/${FNAME}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS=""
-IUSE="postgres ldap ssl"
+KEYWORDS="~x86 ~amd64"
+IUSE="+postgres ldap ssl"
CDEPEND="postgres? ( dev-db/postgresql-server )
dev-python/psutil
@@ -55,10 +56,6 @@ pkg_setup() {
python_pkg_setup
}
-src_prepare() {
- epatch "${FILESDIR}/${PN}-6.1-setup.py.patch"
-}
-
src_install() {
distutils_src_install
@@ -95,13 +92,13 @@ pkg_postinst() {
elog "Be sure the database is started before"
}
-pquery() {
+psqlquery() {
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
+ 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"