Add mozilla sync ebuilds and run dependencies (test dependencies missing)

17 files changed, 434 insertions, 0 deletions

diff --git a/www-misc/mozilla-sync-server-core/ChangeLog b/www-misc/mozilla-sync-server-core/ChangeLog
new file mode 100644
index 0000000..c09d356
--- /dev/null
+++ b/www-misc/mozilla-sync-server-core/ChangeLog
@@ -0,0 +1,11 @@
+# ChangeLog for www-misc/mozilla-sync-server-core
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*mozilla-sync-server-core-2.15.1 (08 Sep 2013)
+
+  08 Sep 2013; Francisco Blas Izquierdo Riera (klondike)
+  +mozilla-sync-server-core-2.15.1.ebuild,
+  +files/mozilla-sync-server-core-2.15.1_wsgiproxy2.patch, +metadata.xml:
+  Initial version, using propper dependencies
+
diff --git a/www-misc/mozilla-sync-server-core/Manifest b/www-misc/mozilla-sync-server-core/Manifest
new file mode 100644
index 0000000..49a74ac
--- /dev/null
+++ b/www-misc/mozilla-sync-server-core/Manifest
@@ -0,0 +1,4 @@
+AUX mozilla-sync-server-core-2.15.1_wsgiproxy2.patch 1857 SHA256 d9dfd99d4162015eb762ebef46012ecd4f931cd104f40c4e53f653925811121f SHA512 f47ad6886415eb154437e336a8455f3a5a796cdb3ae5bb64a0326fb9deb8fcbabaa5e9425e55aeb08b55362e0bc4b2f5f5e71f34cc55cd5f8007ce42385f4307 WHIRLPOOL 0f2c5c2a195b27bef3c251125f0e388f64e413dfc4876e28b3531ac84c42ccf8c96ffaf2125ec65cdb4aab0c60154303ba93b59f851236447edeeedcf2170a59
+EBUILD mozilla-sync-server-core-2.15.1.ebuild 2836 SHA256 ada988f0ff94af20f156bbcac4081a618da14fca28efec46efc8a5a8efc78eb1 SHA512 597f1032d2c4bfde14497f752862629822bbcd6f4fe193e5260e3ba596b11316d31e5e3cfa76af62a361d666bcc4e394378552878fc71c5a4261639ffc683303 WHIRLPOOL 59aa5a276588c971358d2e12f8f28e9b001849dc5e476497ec28d2c5dafd3bffcb87b3631a3648b2654fe1ce083719bf28032308e150444a8f3f384a70eba1c6
+MISC ChangeLog 403 SHA256 fb00e15fe0d6830a61384ba93bf84424d0cf4ce9c985ef1f61a4422907d96c32 SHA512 4e8e9ac38ed793cb7cf9b2529da5ebd0b4955b1dbb0a0bea9d36c876206d0ae199c5eea26423b4f7fa3943fb9853ee5e55239750655f00ade9d25471ff11f519 WHIRLPOOL 03c2a1bd9aed6ebb308c3b2240ba7e3df6a37d317dfc9f2af868ff407f07ebea218f7bcd0256f72d9fad282b5212a141c57ff4d82ec26846f369bfb8a9a7f1ba
+MISC metadata.xml 359 SHA256 d1231134dd527f83709453c5fa496d097bfd11d1a401464eeaefb73526823421 SHA512 3449312da12df9a2b085374c49edd3b233710fe11ceab524a5117edcb53af62f569048dd88d07ddba74502929c0e2b9fe5d026e5fdd78f3861ad130cf62ec855 WHIRLPOOL 32fdf0d924da2cdfbc45dafdad983cbaabcfa76a73ccb52d0136ffc0be4b9c5d8aabb6df17aac8587b30a20fc17bc296cfa00905d020225ebefdee92c08a3c72
diff --git a/www-misc/mozilla-sync-server-core/files/mozilla-sync-server-core-2.15.1_wsgiproxy2.patch b/www-misc/mozilla-sync-server-core/files/mozilla-sync-server-core-2.15.1_wsgiproxy2.patch
new file mode 100644
index 0000000..980f016
--- /dev/null
+++ b/www-misc/mozilla-sync-server-core/files/mozilla-sync-server-core-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/metadata.xml b/www-misc/mozilla-sync-server-core/metadata.xml
new file mode 100644
index 0000000..91f1a24
--- /dev/null
+++ b/www-misc/mozilla-sync-server-core/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+        <use>
+                <flag name='memcached'>Add support for
+                        <pkg>net-misc/memcached</pkg></flag>
+        </use>
+	<maintainer>
+		<email>maintainer-wanted@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
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..0c9e047
--- /dev/null
+++ b/www-misc/mozilla-sync-server-core/mozilla-sync-server-core-2.15.1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+PYTHON_COMPAT=(python2_{6,7})
+
+inherit distutils-r1 mercurial
+
+DESCRIPTION="Mozilla Sync Server Core libraries"
+HOMEPAGE="https://hg.mozilla.org/services/server-core/"
+
+EHG_REPO_URI="https://hg.mozilla.org/services/server-core"
+
+case ${PV} in
+9999)
+	EHG_REVISION="default"
+	;;
+*)
+	inherit versionator
+	MY_PV=$(replace_version_separator 2 '-' "${PV}")
+	MY_P="${PN}-${MY_PV}"
+	EHG_REVISION="rpm-${MY_PV}"
+	S="${WORKDIR}/${PN}"
+	;;
+esac
+
+LICENSE="MPL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ldap memcached profile test"
+
+# Test require LDAP populated with mozilla data on ldap://localhost
+RESTRICT="test"
+#These packages are required but not used
+#A single hash means non dependent on other packages required or on the list, double hash implies the contrary
+##	>=dev-python/cef-0.5[${PYTHON_USEDEP}]
+##	>=dev-python/beaker-1.6.4[${PYTHON_USEDEP}]
+##	>=dev-python/docopt-0.5[${PYTHON_USEDEP}]
+#	>=dev-python/mako-0.7.2[${PYTHON_USEDEP}]
+##	>=dev-python/markupsafe-0.15[${PYTHON_USEDEP}]
+##	>=dev-python/pastedeploy-1.5.0
+##	>=dev-python/repoze-lru-0.5
+#pastescript is required to get the paster command
+
+#These packages are rquired when profile is enabled but I haven't made an ebuild yet
+#	profile? ( dev-python/repoze-profiler[${PYTHON_USEDEP}] )
+#	profile? ( dev-python/meliae[${PYTHON_USEDEP}] )
+
+RDEPEND="memcached? ( >=dev-python/pylibmc-1.2.3[${PYTHON_USEDEP}] )
+	memcached? ( >=dev-python/python-memcached-1.48[${PYTHON_USEDEP}] )
+	ldap? ( >=dev-python/python-ldap-2.3.13 )
+	>=dev-python/metlog-cef-0.2[${PYTHON_USEDEP}]
+	>=dev-python/metlog-py-0.9.8[${PYTHON_USEDEP}]
+	>=dev-python/paste-1.7.5.1[${PYTHON_USEDEP}]
+	>=dev-python/pastescript-1.7.5[${PYTHON_USEDEP}]
+	>=dev-python/recaptcha-client-1.0.6[${PYTHON_USEDEP}]
+	>=dev-python/repoze-who-2.0[${PYTHON_USEDEP}]
+	>=dev-python/routes-1.13[${PYTHON_USEDEP}]
+	>=dev-python/scrypt-0.6.1[${PYTHON_USEDEP}]
+	>=dev-python/simplejson-2.6.2[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-0.7.9
+	<=dev-python/sqlalchemy-0.7.999
+	>=dev-python/webob-1.0.7[${PYTHON_USEDEP}]
+	>=dev-python/wsgiproxy2-0.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}]"
+DEPEND="${RDEPEND}
+	test? ( >=dev-python/pylibmc-1.2.3[${PYTHON_USEDEP}] )
+	test? ( >=dev-python/python-memcached-1.48[${PYTHON_USEDEP}] )
+	test? ( dev-python/wsgiintercept[${PYTHON_USEDEP}] )
+	test? ( >=dev-python/wsgiproxy2-0.1[${PYTHON_USEDEP}] )
+	test? ( dev-python/webtest[${PYTHON_USEDEP}] )
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+PATCHES=( ${FILESDIR}/${P}_wsgiproxy2.patch )
+
+python_test() {
+	nosetests || die "Tests fail with ${EPYTHON}"
+}
diff --git a/www-misc/mozilla-sync-server-full/ChangeLog b/www-misc/mozilla-sync-server-full/ChangeLog
new file mode 100644
index 0000000..d38b3a5
--- /dev/null
+++ b/www-misc/mozilla-sync-server-full/ChangeLog
@@ -0,0 +1,10 @@
+# ChangeLog for www-misc/mozilla-sync-server-full
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*mozilla-sync-server-full-1.0.9 (08 Sep 2013)
+
+  08 Sep 2013; Francisco Blas Izquierdo Riera (klondike)
+  +mozilla-sync-server-full-1.0.9.ebuild, +metadata.xml:
+  Initial version, using propper dependencies
+
diff --git a/www-misc/mozilla-sync-server-full/Manifest b/www-misc/mozilla-sync-server-full/Manifest
new file mode 100644
index 0000000..fb0a829
--- /dev/null
+++ b/www-misc/mozilla-sync-server-full/Manifest
@@ -0,0 +1,3 @@
+EBUILD mozilla-sync-server-full-1.0.9.ebuild 2103 SHA256 594b69bc5a2ddc7796cfb5fae032181e97f2db3540147a7eb4240687c873f543 SHA512 5f68528cfd00452b3f55df5eebbaa71d3a54f03aaf3bc0caccf190f2dab92eefd439ba042029bce58a763143bb1e98ed0f1022bdab33431d8d6d39c0c0a2f6d0 WHIRLPOOL fcc05425b8e627ade08015b1cf7b0650b2820138e21c858f988cc67a6d251b37d5e7fdaa934742911d2fe0481ba7fe6c4e8db83256145780810ee3be23a0fead
+MISC ChangeLog 342 SHA256 0dfbfcdff8498d73a7bbf9323c7f06dfe61b65044342f815aaa1c5332e58f1cf SHA512 0ae16734707ec37b17e03f390d0012c9e5926dd4b1f8e1074c2221a214c146049e31556a15db9c7422a981ccff8ecf2615d17894150a8f82d21d5fa06aeac30c WHIRLPOOL 4e0a1fed7a591af7eb668a405ead566fde7fc811d15a4e412d71f47b15c5e985231e5b30e048b8c26444014cd6f42704f7f3fd1b89ce2319a6e391fde0b5a1d8
+MISC metadata.xml 525 SHA256 e80c9062a6cb63dd7b2884e7136b2fd425afcfd1e10b5f3d3b1975d46ef2ad48 SHA512 bf73a5efaaf5d01056c6a0eccdd25b16beef75b4e46928b79685e5bf294f115a8eb9961238f58d58f04396087ef03ce4f6268e110cd8f33aae5710a55ff899f6 WHIRLPOOL d80e8a5c2b8487e4333771b785eb92cd1a3ea63e3393b91e4488668bc0b66d2a82ef284a5dd3d2da72842553382fb42dbec8348d4f2783bb451b8dd3044c5c3e
diff --git a/www-misc/mozilla-sync-server-full/metadata.xml b/www-misc/mozilla-sync-server-full/metadata.xml
new file mode 100644
index 0000000..0f013dd
--- /dev/null
+++ b/www-misc/mozilla-sync-server-full/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>maintainer-wanted@gentoo.org</email>
+	</maintainer>
+	<use>
+		<flag name='memcached'>Add support for 
+			<pkg>net-misc/memcached</pkg></flag>
+		<flag name='tools'>Add a tool using 
+			<pkg>dev-python/fabric</pkg></flag>
+		<flag name='wsgi'>Install wsgi file to enable serving via
+			<pkg>www-apache/mod_wsgi</pkg> or
+			<pkg>www-servers/uwsgi</pkg></flag>
+	</use>
+</pkgmetadata>
diff --git a/www-misc/mozilla-sync-server-full/mozilla-sync-server-full-1.0.9.ebuild b/www-misc/mozilla-sync-server-full/mozilla-sync-server-full-1.0.9.ebuild
new file mode 100644
index 0000000..aa0945e
--- /dev/null
+++ b/www-misc/mozilla-sync-server-full/mozilla-sync-server-full-1.0.9.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+PYTHON_COMPAT=(python2_{6,7})
+
+inherit distutils-r1 mercurial
+
+DESCRIPTION="Mozilla Sync Server"
+HOMEPAGE="https://hg.mozilla.org/services/server-full"
+
+EHG_REPO_URI="https://hg.mozilla.org/services/server-full"
+
+case ${PV} in
+9999)
+	EHG_REVISION="default"
+	;;
+*)
+	inherit versionator
+	MY_PV=$(replace_version_separator 2 '-' "${PV}")
+	MY_P="${PN}-${MY_PV}"
+	EHG_QUIET="OFF"
+	EHG_REVISION="rpm-${MY_PV}"
+	S="${WORKDIR}/${PN}"
+	;;
+esac
+
+LICENSE="MPL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ldap memcached mysql sqlite test tools +wsgi"
+
+#Missing packages
+RESTRICT="test"
+
+REQUIRED_USE="|| ( ldap memcached mysql sqlite )"
+
+RDEPEND="www-misc/mozilla-sync-server-reg[${PYTHON_USEDEP}]
+	www-misc/mozilla-sync-server-storage[${PYTHON_USEDEP},ldap?,mysql?,sqlite?]
+	tools? ( dev-python/fabric[${PYTHON_USEDEP}] )
+	wsgi? (
+		|| ( www-apache/mod_wsgi www-servers/uwsgi[python] )
+	)
+	>=dev-python/mako-0.7.2[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.0.7[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( >=dev-python/simplejson-2.6.2[${PYTHON_USEDEP}] )
+	test? ( dev-python/twisted-core[${PYTHON_USEDEP}] )
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+#Not available
+#	test? ( dev-python/funkload[${PYTHON_USEDEP}] )
+#	test? ( dev-python/webunit[${PYTHON_USEDEP}] )
+
+src_prepare() {
+	sed -i 's_file:%(here)s/etc/_file:%(here)s/_' *.ini
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	keepdir /etc/mozilla-sync-server
+	insinto /etc/mozilla-sync-server
+	use ldap && (
+		doins etc/ldap.conf
+		newins tests_ldap.ini ldap.ini
+
+		use memcached && (
+			doins etc/memcachedldap.conf
+			newins tests_memcachedldap.ini memcached_ldap.ini
+		)
+	)
+	use memcached && (
+		doins etc/memcached.conf
+		newins tests_memcached.ini memcached.ini
+	)
+	use mysql && (
+		doins etc/mysql.conf
+		newins tests_mysql.ini mysql.ini
+	)
+	use sqlite && (
+		newins etc/sync.conf sqlite.conf
+		newins development.ini sqlite.ini
+	)
+	use wsgi && newins sync.wsgi server.wsgi
+}
diff --git a/www-misc/mozilla-sync-server-reg/ChangeLog b/www-misc/mozilla-sync-server-reg/ChangeLog
new file mode 100644
index 0000000..882d63f
--- /dev/null
+++ b/www-misc/mozilla-sync-server-reg/ChangeLog
@@ -0,0 +1,10 @@
+# ChangeLog for www-misc/mozilla-sync-server-reg
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*mozilla-sync-server-reg-1.2.6 (08 Sep 2013)
+
+  08 Sep 2013; Francisco Blas Izquierdo Riera (klondike)
+  +mozilla-sync-server-reg-1.2.6.ebuild, +metadata.xml:
+  Initial version, using propper dependencies
+
diff --git a/www-misc/mozilla-sync-server-reg/Manifest b/www-misc/mozilla-sync-server-reg/Manifest
new file mode 100644
index 0000000..561392c
--- /dev/null
+++ b/www-misc/mozilla-sync-server-reg/Manifest
@@ -0,0 +1,3 @@
+EBUILD mozilla-sync-server-reg-1.2.6.ebuild 1226 SHA256 1a3f2352975a463493f57d7369293d6c99d61ce52d445085f9a93b613e316e16 SHA512 2c898e8c13402f52e17deacb6e926d8257ff0767e1d16ba949cd3fc36406c809b53b434953bec19c507f49dcad34063a334258057376a729faff45fd130d0293 WHIRLPOOL 7367320f315f1ce395ff9c41327d8f0c2db1082788a09c6d2311529fda3183f15f78b978fec7ce5336d11b64090241e575d848926575f3ad1820d34e1ba9b242
+MISC ChangeLog 339 SHA256 3281643cf9327f85d67b6482874e99d9d215be57446bd7488d2892e3852c07ff SHA512 fe9c981a80131459764580a00fefb7e5cd809b2ff34fc8e2913aa47ae6e35a691fa58784ba49138d2315d4226a9598b209ade66ae7d21b5ee66e63ccfb46989d WHIRLPOOL 5d0c9799749cddb26a5dd4bf4e7077fc72e501fdd1f38b0815828b98bba760cb72dcaf86adca0134279d12bcac03edb4f9ce0d39bcf895b854338ca607461bef
+MISC metadata.xml 214 SHA256 c1f09dc7d5313cd2da7b82259c7846ed23144d62b15e59680ada90e2b6b4d154 SHA512 aeb2fb354a9ddf41c45a071091a58b91eaf8b25d6d2c49e3e3daa547b591a54530144de4533573160b48dc356289c909612c4e3c80e387f081f88cb39263e130 WHIRLPOOL 54d8861daedd18ca38e4ada0fb71026c612b63946d47a9b34de90d1d6d85c8ce05c0a4b97730f554ea637d73ccce8ed207d33e707c2b8c1dd28af24cf44dd186
diff --git a/www-misc/mozilla-sync-server-reg/metadata.xml b/www-misc/mozilla-sync-server-reg/metadata.xml
new file mode 100644
index 0000000..cc3fe24
--- /dev/null
+++ b/www-misc/mozilla-sync-server-reg/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>maintainer-wanted@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/www-misc/mozilla-sync-server-reg/mozilla-sync-server-reg-1.2.6.ebuild b/www-misc/mozilla-sync-server-reg/mozilla-sync-server-reg-1.2.6.ebuild
new file mode 100644
index 0000000..f6eb2c9
--- /dev/null
+++ b/www-misc/mozilla-sync-server-reg/mozilla-sync-server-reg-1.2.6.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+PYTHON_COMPAT=(python2_{6,7})
+
+inherit distutils-r1 mercurial
+
+DESCRIPTION="Mozilla Sync Reg Server"
+HOMEPAGE="https://hg.mozilla.org/services/server-reg"
+
+EHG_REPO_URI="https://hg.mozilla.org/services/server-reg"
+
+case ${PV} in
+9999)
+	EHG_REVISION="default"
+	;;
+*)
+	inherit versionator
+	MY_PV=$(replace_version_separator 2 '-' "${PV}")
+	MY_P="${PN}-${MY_PV}"
+	EHG_QUIET="OFF"
+	EHG_REVISION="rpm-${MY_PV}"
+	S="${WORKDIR}/${PN}"
+	;;
+esac
+
+LICENSE="MPL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="www-misc/mozilla-sync-server-core[${PYTHON_USEDEP}]
+	>=dev-python/simplejson-2.6.2[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.0.7[${PYTHON_USEDEP}]
+	>=dev-python/routes-1.13[${PYTHON_USEDEP}]
+	>=dev-python/recaptcha-client-1.0.6[${PYTHON_USEDEP}]
+	>=dev-python/cef-0.5[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.5.0
+	>=dev-python/mako-0.7.2[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( >=dev-python/webtest-1.4.3[${PYTHON_USEDEP}] )
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	nosetests || die "Tests fail with ${EPYTHON}"
+}
diff --git a/www-misc/mozilla-sync-server-storage/ChangeLog b/www-misc/mozilla-sync-server-storage/ChangeLog
new file mode 100644
index 0000000..2131238
--- /dev/null
+++ b/www-misc/mozilla-sync-server-storage/ChangeLog
@@ -0,0 +1,10 @@
+# ChangeLog for www-misc/mozilla-sync-server-storage
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*mozilla-sync-server-storage-1.15.3 (08 Sep 2013)
+
+  08 Sep 2013; Francisco Blas Izquierdo Riera (klondike)
+  +mozilla-sync-server-storage-1.15.3.ebuild, +metadata.xml:
+  Initial version, using propper dependencies
+
diff --git a/www-misc/mozilla-sync-server-storage/Manifest b/www-misc/mozilla-sync-server-storage/Manifest
new file mode 100644
index 0000000..43627fe
--- /dev/null
+++ b/www-misc/mozilla-sync-server-storage/Manifest
@@ -0,0 +1,3 @@
+EBUILD mozilla-sync-server-storage-1.15.3.ebuild 1510 SHA256 d362574f1b8b0a56872350c29769f8759a97d6a4770875b42ba8bef2fb7af5d2 SHA512 2470dc0f87cc70bf419193f861174fa850186756702a60ee39d40ed0c893b2c74a430014a301d014da83480b521a9406ddc49b339ccd4f90066576b1ce9247b4 WHIRLPOOL 763d73818cda83a8e4ca7adb51dac5afb947aaa1d5382af1b6e9790bb34e7c5ae90e9f5b61b21f962f08f32118d836a9ac82eda88fff790d72d4ea66dab31fdc
+MISC ChangeLog 353 SHA256 9bc1057db7a69ca7116fce51dbcb4675ed98dfee2ebfb4ac26f5864cb14aa792 SHA512 28ad6992de96160cd68eee5a53cc653a3ad560a4b145b49fbfa1c33e916cdd0598aa48040574dca24f3f467ed90a1cf1a6a4f124f66fcaed2519159705fdaf4d WHIRLPOOL 9b19eb3b6c5a96b5dacc75ff4bc0eb60127f1f2c863d97c80d25fd5ff6d179c04035128eb4e33fbbd389c76450f07e8be9759e2975ce264126921e8b65171421
+MISC metadata.xml 311 SHA256 47591f3d9cbbbe6ab4e4a94ea797e3e561315ed96296e183715942ad475a27d0 SHA512 bbc72fc331b29193f457f2905c2d87afefc2f86fe6888789fd5022102c89eacd3290ad5056f2f5948810c64e28138da53e14681d50fd7127c408b330d60f2db7 WHIRLPOOL 58e92ad02457fe098eeea657620e3bf6ac91daecd0e54783da68d81308ec4a6ba066155b8506b218da7417bfa045367d5d4ed979c218e5f039a08b292160a4df
diff --git a/www-misc/mozilla-sync-server-storage/metadata.xml b/www-misc/mozilla-sync-server-storage/metadata.xml
new file mode 100644
index 0000000..bc662a3
--- /dev/null
+++ b/www-misc/mozilla-sync-server-storage/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>maintainer-wanted@gentoo.org</email>
+	</maintainer>
+	<use>
+		<flag name='memcached'>Add support for 
+			<pkg>net-misc/memcached</pkg></flag>
+	</use>
+</pkgmetadata>
diff --git a/www-misc/mozilla-sync-server-storage/mozilla-sync-server-storage-1.15.3.ebuild b/www-misc/mozilla-sync-server-storage/mozilla-sync-server-storage-1.15.3.ebuild
new file mode 100644
index 0000000..8141e95
--- /dev/null
+++ b/www-misc/mozilla-sync-server-storage/mozilla-sync-server-storage-1.15.3.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+PYTHON_COMPAT=(python2_{6,7})
+
+inherit distutils-r1 eutils mercurial
+
+DESCRIPTION="Mozilla Sync Storage Server"
+HOMEPAGE="https://hg.mozilla.org/services/server-storage/"
+
+EHG_REPO_URI="https://hg.mozilla.org/services/server-storage"
+
+case ${PV} in
+9999)
+	EHG_REVISION="default"
+	;;
+*)
+	inherit versionator
+	MY_PV=$(replace_version_separator 2 '-' "${PV}")
+	MY_P="${PN}-${MY_PV}"
+	EHG_QUIET="OFF"
+	EHG_REVISION="rpm-${MY_PV}"
+	S="${WORKDIR}/${PN}"
+	;;
+esac
+
+LICENSE="MPL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ldap memcached mysql sqlite test"
+
+#Missing package
+RESTRICT="test"
+
+REQUIRED_USE="|| ( ldap memcached mysql sqlite )"
+
+RDEPEND="www-misc/mozilla-sync-server-core[${PYTHON_USEDEP},memcached?,ldap?]
+	memcached? ( >=dev-python/pylibmc-1.2.3[${PYTHON_USEDEP}] )
+	>=dev-python/simplejson-2.6.2
+	>=dev-python/webob-1.0.7[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-0.7.9[mysql?,sqlite?]
+	>=dev-python/metlog-py-0.9.8[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.5.0"
+DEPEND="${RDEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+	test? ( >=dev-python/webtest-1.3.3[${PYTHON_USEDEP}] )
+	test? ( >=dev-python/wsgiproxy2-0.1[${PYTHON_USEDEP}] )
+	test? ( >=dev-python/pylibmc-1.2.3[${PYTHON_USEDEP}] )
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+#Not available
+#	test? ( dev-python/funkload[${PYTHON_USEDEP}] )
+
+python_test() {
+	nosetests || die "Tests fail with ${EPYTHON}"
+}