[gentoo-commits] dev/dev-zero:master commit in: www-misc/mozilla-sync-server-core/files/, www-misc/mozilla-sync-server-core/

[Tiziano Müller]

commit:     6fc14b60c8959907874592c2743c60627d515f61
Author:     Tiziano Müller <dev-zero <AT> gentoo <DOT> org>
AuthorDate: Mon Dec  2 06:21:25 2013 +0000
Commit:     Tiziano Müller <dev-zero <AT> gentoo <DOT> org>
CommitDate: Mon Dec  2 06:21:25 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/dev-zero.git;a=commit;h=6fc14b60

Add mozilla-sync-server-core, based on ebuilds by klondike and Stijn Tintel

---
 www-misc/mozilla-sync-server-core/Manifest         |  4 +
 .../files/2.15.1-sqlalchemy-0.8.patch              | 65 +++++++++++++++++
 .../files/2.15.1-wsgiproxy2.patch                  | 60 +++++++++++++++
 .../mozilla-sync-server-core-2.15.1.ebuild         | 85 ++++++++++++++++++++++
 4 files changed, 214 insertions(+)

diff --git a/www-misc/mozilla-sync-server-core/Manifest b/www-misc/mozilla-sync-server-core/Manifest
new file mode 100644
index 0000000..911bb1f
--- /dev/null
+++ b/www-misc/mozilla-sync-server-core/Manifest
@@ -0,0 +1,4 @@
+AUX 2.15.1-sqlalchemy-0.8.patch 2555 SHA256 aefde0bdd4be89b6d45ff4e3256183d48a72beba998c71a5a3a37cb23ea30cbb SHA512 55c435835f7f6a2c134b4e94921959973216bb310f4405c6915069b71be286b9b7bb3c13579bc91e3e38b04a5f15c128b737c72d87d56bcb8cad9ea0ef335661 WHIRLPOOL 95aa6cb47620a4a36999bdc4df69fb13fd67d69f2b963b9fedd7027ec187b86aaa4d25427402c962dba3c47984f5cbc7917f95a595914e1fdd882134afbebbea
+AUX 2.15.1-wsgiproxy2.patch 1857 SHA256 d9dfd99d4162015eb762ebef46012ecd4f931cd104f40c4e53f653925811121f SHA512 f47ad6886415eb154437e336a8455f3a5a796cdb3ae5bb64a0326fb9deb8fcbabaa5e9425e55aeb08b55362e0bc4b2f5f5e71f34cc55cd5f8007ce42385f4307 WHIRLPOOL 0f2c5c2a195b27bef3c251125f0e388f64e413dfc4876e28b3531ac84c42ccf8c96ffaf2125ec65cdb4aab0c60154303ba93b59f851236447edeeedcf2170a59
+DIST server-core-rpm-2.15-1.tar.bz2 72312 SHA256 6976aa1d86dcfd9e06ac4b23ed1c8b72c2255886da473d219e9745fac90712f0 SHA512 aa172c7dd9ae92730c1fc7540c8fe440e1fc45a4f3314a85589213749acda642dbe37118500250d4aa5930c3d035b75bb44edd9a16f017f5b64fb341c41524cb WHIRLPOOL c4864922684a7b5100e2c0be9171c17071f9547fb01e5585751c813849250d2af96ad52306ac81007c1ef4918d8a6e09566f042e43ded02fd32b434b363c26c6
+EBUILD mozilla-sync-server-core-2.15.1.ebuild 2647 SHA256 76858f022827215a6121cc240d7897a98f077e6952d2eb574480e81481c85ce0 SHA512 2cd7c9fd7bac7a35d7072018ae9e6015730cc04745eb0226e8eb03f3f4c59a9ddf320f8731c33e3390c8ff8bd53a63965f9c86b93cde17da346e48d382d2cf46 WHIRLPOOL dd6e474162b6c84bb77f7d8426d4cfba8eb0ca23066c2cbbe9396f9e7507f2eb09bda4c59c6b8e8480a3834a7a8142b9d2bdd05ad96f13e5c8896db3955e18a6

diff --git a/www-misc/mozilla-sync-server-core/files/2.15.1-sqlalchemy-0.8.patch b/www-misc/mozilla-sync-server-core/files/2.15.1-sqlalchemy-0.8.patch
new file mode 100644
index 0000000..afff2cf
--- /dev/null
+++ b/www-misc/mozilla-sync-server-core/files/2.15.1-sqlalchemy-0.8.patch
@@ -0,0 +1,65 @@
+diff -r 4daa9cf904bb services/auth/ldapsql.py
+--- a/services/auth/ldapsql.py	Fri Sep 27 10:28:41 2013 +1000
++++ b/services/auth/ldapsql.py	Sun Dec 01 16:40:21 2013 +0100
+@@ -42,7 +42,8 @@
+ 
+ import ldap
+ 
+-from sqlalchemy.ext.declarative import declarative_base, Column
++from sqlalchemy.ext.declarative import declarative_base
++from sqlalchemy.schema import Column
+ from sqlalchemy import Integer, String, SmallInteger
+ from sqlalchemy.sql import select, insert, update, and_
+ 
+diff -r 4daa9cf904bb services/auth/resetcode.py
+--- a/services/auth/resetcode.py	Fri Sep 27 10:28:41 2013 +1000
++++ b/services/auth/resetcode.py	Sun Dec 01 16:40:21 2013 +0100
+@@ -41,7 +41,8 @@
+ """
+ import datetime
+ 
+-from sqlalchemy.ext.declarative import declarative_base, Column
++from sqlalchemy.ext.declarative import declarative_base
++from sqlalchemy.schema import Column
+ from sqlalchemy import String, DateTime
+ from sqlalchemy.sql import bindparam, select, insert, delete
+ 
+diff -r 4daa9cf904bb services/auth/sqlmappers.py
+--- a/services/auth/sqlmappers.py	Fri Sep 27 10:28:41 2013 +1000
++++ b/services/auth/sqlmappers.py	Sun Dec 01 16:40:21 2013 +0100
+@@ -36,7 +36,8 @@
+ """ SQL Mappers
+ """
+ from sqlalchemy.schema import UniqueConstraint
+-from sqlalchemy.ext.declarative import declarative_base, Column
++from sqlalchemy.ext.declarative import declarative_base
++from sqlalchemy.schema import Column
+ from sqlalchemy import Integer, String, DateTime, Text
+ 
+ _Base = declarative_base()
+diff -r 4daa9cf904bb services/resetcodes/rc_sql.py
+--- a/services/resetcodes/rc_sql.py	Fri Sep 27 10:28:41 2013 +1000
++++ b/services/resetcodes/rc_sql.py	Sun Dec 01 16:40:21 2013 +0100
+@@ -42,7 +42,8 @@
+ """
+ import datetime
+ 
+-from sqlalchemy.ext.declarative import declarative_base, Column
++from sqlalchemy.ext.declarative import declarative_base
++from sqlalchemy.schema import Column
+ from sqlalchemy import String, DateTime
+ from sqlalchemy.sql import bindparam, select, insert, delete, and_
+ 
+diff -r 4daa9cf904bb services/user/sql.py
+--- a/services/user/sql.py	Fri Sep 27 10:28:41 2013 +1000
++++ b/services/user/sql.py	Sun Dec 01 16:40:21 2013 +0100
+@@ -43,7 +43,8 @@
+ 
+ from sqlalchemy import Integer, String
+ from sqlalchemy.interfaces import PoolListener
+-from sqlalchemy.ext.declarative import declarative_base, Column
++from sqlalchemy.ext.declarative import declarative_base
++from sqlalchemy.schema import Column
+ from sqlalchemy.sql import bindparam, select, insert, update, delete
+ from sqlalchemy.sql import text as sqltext
+ from sqlalchemy.exc import IntegrityError

diff --git a/www-misc/mozilla-sync-server-core/files/2.15.1-wsgiproxy2.patch b/www-misc/mozilla-sync-server-core/files/2.15.1-wsgiproxy2.patch
new file mode 100644
index 0000000..980f016
--- /dev/null
+++ b/www-misc/mozilla-sync-server-core/files/2.15.1-wsgiproxy2.patch
@@ -0,0 +1,60 @@
+diff -r ffdac52d215a Makefile
+--- a/Makefile	Fri Apr 12 15:17:15 2013 +1000
++++ b/Makefile	Tue Apr 23 13:48:15 2013 +0200
+@@ -58,7 +58,7 @@
+ build_extras:
+ 	$(INSTALL) MySQL-python
+ 	$(INSTALL) recaptcha-client
+-	$(INSTALL) wsgiproxy
++	$(INSTALL) wsgiproxy2
+ 	$(INSTALL) wsgi_intercept
+ 	$(INSTALL) "python-ldap == 2.3.13"
+ 	$(INSTALL) coverage
+diff -r ffdac52d215a dev-reqs.txt
+--- a/dev-reqs.txt	Fri Apr 12 15:17:15 2013 +1000
++++ b/dev-reqs.txt	Tue Apr 23 13:48:15 2013 +0200
+@@ -14,7 +14,7 @@
+ PyMySQL
+ pymysql_sa
+ pylibmc
+-WSGIProxy
++WSGIProxy2
+ recaptcha-client
+ metlog-py >= 0.9.5
+ metlog-cef
+diff -r ffdac52d215a prod-reqs.txt
+--- a/prod-reqs.txt	Fri Apr 12 15:17:15 2013 +1000
++++ b/prod-reqs.txt	Tue Apr 23 13:48:15 2013 +0200
+@@ -14,7 +14,7 @@
+ PyMySQL == 0.5
+ pymysql_sa == 1.0
+ pylibmc == 1.2.3
+-WSGIProxy == 0.2.2
++WSGIProxy2 == 0.1
+ recaptcha-client == 1.0.6
+ metlog-py == 0.9.8
+ metlog-cef == 0.2
+diff -r ffdac52d215a services/tests/support.py
+--- a/services/tests/support.py	Fri Apr 12 15:17:15 2013 +1000
++++ b/services/tests/support.py	Tue Apr 23 13:48:15 2013 +0200
+@@ -223,7 +223,7 @@
+     If TEST_REMOTE is set in the environ, will run against a real server.
+     """
+     import urlparse
+-    from wsgiproxy.exactproxy import proxy_exact_request
++    from wsgiproxy2.exactproxy import proxy_exact_request
+     from webtest import TestApp
+ 
+     # runs over a proxy
+diff -r ffdac52d215a setup.py
+--- a/setup.py	Fri Apr 12 15:17:15 2013 +1000
++++ b/setup.py	Tue Apr 23 13:48:15 2013 +0200
+@@ -38,7 +38,7 @@
+ from setuptools import setup, find_packages
+ 
+ install_requires = ['SQLAlchemy', 'Paste', 'PasteDeploy', 'WebOb',
+-                    'Routes', 'simplejson', 'cef', 'wsgiproxy', 'metlog-py']
++                    'Routes', 'simplejson', 'cef', 'wsgiproxy2', 'metlog-py']
+ 
+ 
+ # extracting the version number from the .spec file

diff --git a/www-misc/mozilla-sync-server-core/mozilla-sync-server-core-2.15.1.ebuild b/www-misc/mozilla-sync-server-core/mozilla-sync-server-core-2.15.1.ebuild
new file mode 100644
index 0000000..72c224b
--- /dev/null
+++ b/www-misc/mozilla-sync-server-core/mozilla-sync-server-core-2.15.1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+PYTHON_COMPAT=(python2_{6,7})
+
+MY_PN="server-core"
+
+case ${PV} in
+9999)
+	inherit distutils-r1 mercurial
+	EHG_REVISION="default"
+	EHG_REPO_URI="https://hg.mozilla.org/services/server-core"
+	;;
+*)
+	inherit distutils-r1 versionator
+	MY_PV="rpm-$(replace_version_separator 2 '-')"
+	MY_P="${MY_PN}-${MY_PV}"
+	SRC_URI="https://hg.mozilla.org/services/${MY_PN}/archive/${MY_PV}.tar.bz2 -> ${MY_P}.tar.bz2"
+	S="${WORKDIR}/${MY_P}"
+	;;
+esac
+
+
+DESCRIPTION="Mozilla Sync Server Core libraries"
+HOMEPAGE="https://hg.mozilla.org/services/server-core/"
+
+LICENSE="MPL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ldap memcached test"
+
+# keep the same order as in prod-reqs.txt
+RDEPEND=">=dev-python/webob-1.0.7[${PYTHON_USEDEP}]
+		>=dev-python/paste-1.7.5.1[${PYTHON_USEDEP}]
+		>=dev-python/pastescript-1.7.5[${PYTHON_USEDEP}]
+		>=dev-python/simplejson-2.6.2[${PYTHON_USEDEP}]
+		>=dev-python/routes-1.13[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-0.8[${PYTHON_USEDEP}]
+		>=dev-python/wsgiproxy2-0.1[${PYTHON_USEDEP}]
+		>=dev-python/recaptcha-client-1.0.6[${PYTHON_USEDEP}]
+		>=dev-python/metlog-py-0.9.8[${PYTHON_USEDEP}]
+		>=dev-python/metlog-cef-0.2[${PYTHON_USEDEP}]
+		>=dev-python/repoze-who-2.0[${PYTHON_USEDEP}]
+		>=dev-python/scrypt-0.6.1[${PYTHON_USEDEP}]
+		>=dev-python/greenlet-0.4[${PYTHON_USEDEP}]
+		>=dev-python/gevent-0.13.8[${PYTHON_USEDEP}]
+		>=net-zope/zope-interface-4.0.1[${PYTHON_USEDEP}]
+		ldap? ( >=dev-python/python-ldap-2.3.13[${PYTHON_USEDEP}] )
+		memcached? ( >=dev-python/pylibmc-1.2.3[${PYTHON_USEDEP}]
+			>=dev-python/python-memcached-1.48[${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}
+		test? ( dev-python/nose[${PYTHON_USEDEP}]
+			dev-python/wsgiintercept[${PYTHON_USEDEP}] )
+		dev-python/setuptools[${PYTHON_USEDEP}]"
+
+# filtered out from prod-reqs.txt since not really required or optional:
+# >=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}] (not required)
+# >=dev-python/repoze-lru-0.6[${PYTHON_USEDEP}] (not required)
+# mysql-python (not directly required)
+# pymysql_sa (not directly required)
+# mako (not required)
+# docopt (not required directly)
+# cef (not required directly)
+# markupsafe (not required)
+# beaker (not required)
+
+PATCHES=(
+	"${FILESDIR}/${PV}-wsgiproxy2.patch"
+	"${FILESDIR}/${PV}-sqlalchemy-0.8.patch"
+	)
+
+python_prepare_all() {
+	# remove tests mostly depending on running LDAP or memcached
+	rm services/tests/test_user.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# exclude one more test trying to hit a running memcached
+	nosetests -e reset_code_memcache || die
+}