Update to 11.0, move to Python 3

3 files changed, 111 insertions, 142 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0ddbc806cc3..2ace035acff 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,74 +1,64 @@
-# Generated by mksrcinfo v8
-# Tue Oct 24 17:50:37 UTC 2017
 pkgbase = odoo
 	pkgdesc = Web-based Open Source Business Apps
-	pkgver = 10.0
-	pkgrel = 10
-	url = http://odoo.com/
+	pkgver = 11.0
+	pkgrel = 1
+	url = https://www.odoo.com/
 	install = odoo.install
 	arch = any
 	license = GPL3
-	depends = gzip
 	depends = nodejs-less-plugin-clean-css
-	depends = postgresql
-	depends = python2
-	depends = python2-argparse
-	depends = python2-babel
-	depends = python2-dateutil
-	depends = python2-docutils
-	depends = python2-decorator
-	depends = python2-feedparser
-	depends = python2-gdata
-	depends = python2-gevent
-	depends = python2-greenlet
-	depends = python2-jcconv
-	depends = python2-jinja
-	depends = python2-ldap
-	depends = python2-lxml
-	depends = python2-mako
-	depends = python2-markupsafe
-	depends = python2-mock
-	depends = python2-openid
-	depends = python2-passlib
-	depends = python2-paramiko
-	depends = python2-pillow
-	depends = python2-psutil
-	depends = python2-psycopg2
-	depends = python2-psycogreen
-	depends = python2-pychart
-	depends = python2-pydot
-	depends = python2-pyparsing
-	depends = python2-pyqrcode
-	depends = python2-pyserial
-	depends = python2-pyusb
-	depends = python2-reportlab
-	depends = python2-pypdf
-	depends = python2-pytz
-	depends = python2-requests
-	depends = python2-six
-	depends = python2-suds-jurko
-	depends = python2-unittest2
-	depends = python2-vatnumber
-	depends = python2-vobject
-	depends = python2-werkzeug
-	depends = python2-wsgiref
-	depends = python2-xlwt
-	depends = python2-xlsxwriter
-	depends = python2-xlrd
-	depends = python2-yaml
-	depends = python2-zsi
-	depends = wkhtmltopdf-static
-	optdepends = python2-ofxparse
-	optdepends = python2-qrcode
-	provides = odoo
+	depends = postgresql-libs
+	depends = wkhtmltopdf
+	depends = python
+	depends = python-babel
+	depends = python-decorator
+	depends = python-docutils
+	depends = python-ebaysdk
+	depends = python-feedparser
+	depends = python-gevent
+	depends = python-greenlet
+	depends = python-html2text
+	depends = python-jinja
+	depends = python-lxml
+	depends = python-mako
+	depends = python-markupsafe
+	depends = python-mock
+	depends = python-num2words
+	depends = python-ofxparse
+	depends = python-passlib
+	depends = python-pillow
+	depends = python-psutil
+	depends = python-psycogreen
+	depends = python-psycopg2
+	depends = python-pydot
+	depends = python-ldap
+	depends = python-pyparsing
+	depends = python-pypdf2
+	depends = python-pyserial
+	depends = python-dateutil
+	depends = python-openid
+	depends = python-pytz
+	depends = python-pyusb
+	depends = python-yaml
+	depends = python-qrcode
+	depends = python-reportlab
+	depends = python-requests
+	depends = python-six
+	depends = python-suds
+	depends = python-vatnumber
+	depends = python-vobject
+	depends = python-werkzeug
+	depends = python-xlsxwriter
+	depends = python-xlwt
+	depends = python-xlrd
 	conflicts = openerp
 	replaces = openerp
 	backup = etc/odoo/odoo.conf
-	source = http://nightly.odoo.com/10.0/nightly/src/odoo_10.0.20171024.tar.gz
+	source = https://nightly.odoo.com/11.0/nightly/src/odoo_11.0.20180404.tar.gz
 	source = odoo.confd
 	source = odoo.service
 	source = odoo.conf
-	md5sums = a9405026619feb777ba5f6fa101137e7
+	md5sums = e4c74c4b3a4f0fa8695d70a96de65344
 	md5sums = 742fa9ad94a92ac2aa910197a26af4e8
 	md5sums = 5bddcc6edbdefdd07cae945165c63604
 	md5sums = 863418f31f0fb982cde0008fa63f35f0
diff --git a/PKGBUILD b/PKGBUILD
index 65104e1e936..3da50d0d60e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,95 +1,83 @@
-# Maintainer: Bidossessi Sodonon
+# Maintainer: Sebastiaan Lokhorst <sebastiaanlokhorst@gmail.com>
+# Contributor: Bidossessi Sodonon
 
 pkgname=odoo
-pkgver=10.0
-_pkgsubver=20171024
-pkgrel=10
+pkgver=11.0
+_pkgsubver=20180404
+pkgrel=1
 pkgdesc="Web-based Open Source Business Apps"
-url=http://odoo.com/
+url=https://www.odoo.com/
 arch=('any')
 license=(GPL3)
-provides=("${pkgname}")
 conflicts=('openerp')
 replaces=('openerp')
 depends=(
-    'gzip'
-    'nodejs-less-plugin-clean-css'
-    'postgresql'
-    'python2'
-    'python2-argparse'
-    'python2-babel'
-    'python2-dateutil'
-    'python2-docutils'
-    'python2-decorator'
-    'python2-feedparser'
-    'python2-gdata'
-    'python2-gevent'
-    'python2-greenlet'
-    'python2-jcconv'
-    'python2-jinja'
-    'python2-ldap'
-    'python2-lxml'
-    'python2-mako'
-    'python2-markupsafe'
-    'python2-mock'
-    'python2-openid'
-    'python2-passlib'
-    'python2-paramiko'
-    'python2-pillow'
-    'python2-psutil'
-    'python2-psycopg2'
-    'python2-psycogreen'
-    'python2-pychart'
-    'python2-pydot'
-    'python2-pyparsing'
-    'python2-pyqrcode'
-    'python2-pyserial'
-    'python2-pyusb'
-    'python2-reportlab'
-    'python2-pypdf'
-    'python2-pytz'
-    'python2-requests'
-    'python2-six'
-    'python2-suds-jurko'
-    'python2-unittest2'
-    'python2-vatnumber'
-    'python2-vobject'
-    'python2-werkzeug'
-    'python2-wsgiref'
-    'python2-xlwt'
-    'python2-xlsxwriter'
-    'python2-xlrd'
-    'python2-yaml'
-    'python2-zsi'
-    'wkhtmltopdf-static'
-)
-optdepends=(
-    'python2-ofxparse'
-    'python2-qrcode'
+  nodejs-less-plugin-clean-css
+  postgresql-libs
+  wkhtmltopdf
+  python
+  python-babel
+  python-decorator
+  python-docutils
+  python-ebaysdk
+  python-feedparser
+  python-gevent
+  python-greenlet
+  python-html2text
+  python-jinja
+  python-lxml
+  python-mako
+  python-markupsafe
+  python-mock
+  python-num2words
+  python-ofxparse
+  python-passlib
+  python-pillow
+  python-psutil
+  python-psycogreen
+  python-psycopg2
+  python-pydot
+  python-ldap
+  python-pyparsing
+  python-pypdf2
+  python-pyserial
+  python-dateutil
+  python-openid
+  python-pytz
+  python-pyusb
+  python-yaml
+  python-qrcode
+  python-reportlab
+  python-requests
+  python-six
+  python-suds
+  python-vatnumber
+  python-vobject
+  python-werkzeug
+  python-xlsxwriter
+  python-xlwt
+  python-xlrd
 )
 
-source=(
-  "http://nightly.odoo.com/10.0/nightly/src/${pkgname}_${pkgver}.${_pkgsubver}.tar.gz"
-  odoo.confd
-  odoo.service
-  odoo.conf
-)
+source=("https://nightly.odoo.com/${pkgver}/nightly/src/${pkgname}_${pkgver}.${_pkgsubver}.tar.gz"
+        odoo.confd
+        odoo.service
+        odoo.conf)
+md5sums=('e4c74c4b3a4f0fa8695d70a96de65344'
+         '742fa9ad94a92ac2aa910197a26af4e8'
+         '5bddcc6edbdefdd07cae945165c63604'
+         '863418f31f0fb982cde0008fa63f35f0')
+
 backup=('etc/odoo/odoo.conf')
 install=odoo.install
 
 package()
 {
   cd ${srcdir}/${pkgname}-${pkgver}.post${_pkgsubver}
-  # Force package data inclusion
-  sed -i -e s/#include_package_data/include_package_data/ setup.py
-  python2 setup.py install --root="${pkgdir}"
+  python setup.py install --root="${pkgdir}"
   mkdir ${pkgdir}/etc/{conf.d,odoo} -p
   mkdir ${pkgdir}/usr/lib/systemd/system/ -p
   install -Dm 644 ${srcdir}/odoo.confd ${pkgdir}/etc/conf.d/odoo
   install -Dm 644 ${srcdir}/odoo.service ${pkgdir}/usr/lib/systemd/system/odoo.service
   install -Dm 644 ${srcdir}/odoo.conf ${pkgdir}/etc/odoo/odoo.conf
 }
-md5sums=('a9405026619feb777ba5f6fa101137e7'
-         '742fa9ad94a92ac2aa910197a26af4e8'
-         '5bddcc6edbdefdd07cae945165c63604'
-         '863418f31f0fb982cde0008fa63f35f0')
diff --git a/odoo.install b/odoo.install
index 4ed8ccd1af5..7aa74107c43 100644
--- a/odoo.install
+++ b/odoo.install
@@ -1,4 +1,4 @@
-pre_install(){
+pre_install() {
   if [ ! `grep odoo /etc/group` ]; then
     groupadd odoo &>/dev/null;
   fi
@@ -7,16 +7,9 @@ pre_install(){
 
 post_install() {
   systemctl --system daemon-reload
-  echo "This package requires a functional PostgreSQL server. "
-  echo "To use with a locally installed PostgreSQL:
-  echo "-- Make sure PostgreSQL is correctly installed (see wiki), start it,"
-  echo "-- create user with database creation rights for odoo in PostgreSQL"
-  echo "-- e.g: # su - postgres -c \"createuser -dRSP <myodoouser>\""
-  echo "-- then edit '/etc/odoo/odoo-server.conf' accordingly."
 }
 
 post_upgrade() {
-  post_install
   systemctl --system daemon-reload
 }
 
@@ -25,5 +18,3 @@ post_remove() {
   groupdel odoo &> /dev/null
   systemctl --system daemon-reload
 }
-
-# vim:set ts=2 sw=2 et: