sope/sogo version bump, make sogo depend on memcached

Fixes #523556 and #523618 by xmw

8 files changed, 32 insertions, 33 deletions

diff --git a/gnustep-apps/sogo/Manifest b/gnustep-apps/sogo/Manifest
index e44f5e2..3dd078c 100644
--- a/gnustep-apps/sogo/Manifest
+++ b/gnustep-apps/sogo/Manifest
@@ -1,6 +1,6 @@
 AUX sogod.confd 117 SHA256 a556b2501155ebb9e2bd57fe8b32011ebca67530b4908d1cb0f87473ba80803a SHA512 d93bde8c500bf8452d5f32efc35ec12f436afc498d7cc6ac1f55769f8696c9b41cc5edec829a19ea01b24c0d3a2c7901fc797cb04ced371bc8e0c3e6e243f15b WHIRLPOOL 189dc32b8fa8f7ef2dbdec29515423ce4771ea18f1b3d539a85bb5e9b7148e26b2d37fd089ccccd4646793eaded6a01d43f2674fc98bd9537bc7b72053ec1355
-AUX sogod.initd 694 SHA256 c61cb4c1df38d162ec0c1cf06d7607d7eb1cc1345d531eadb69601a2f9736028 SHA512 8e1512eb47878809df2deb2e8748c6e8ba67fbc751f13d4e6b9eb19c164ea4d0907e28abf8ca61ac8111d92e3cbd61f16368d265e55ba183c6bf7140dc7db486 WHIRLPOOL dc1f6e19f7cfa85a131af23f967cb18fc5c6ea933824fe2f0010a4e344344b168bd438d349f094dfa2dfbbb7a0606f4a82fa94782ebad0808b752ceff42471b8
-DIST SOGo-2.1.1b.tar.gz 5846822 SHA256 ec90ace24a20bbc2ba049fdfb224fa9ed49e461559b87035609305a9451bb3de SHA512 9e9d9bcf7bc9d8a626479b25010dcac8ea44d6e6785f697da480f5595ad8bf90652ab561977c79ef59afda7e515b79b5522f86f4513547765aa2f27843c76a0f WHIRLPOOL 7dfb4eac69300cd76240323ca95883bec02f28a592f6d5bc0ccfcd8e12ebe86bd36bad1e17567caa61290f19d85eb4239196c960ae1495c4115c8582b466c4d6
-EBUILD sogo-2.1.1b.ebuild 1654 SHA256 ad8fb28db023f853a6bb33a4ee58c9a31e065321f914119fb6abc827be15a9ec SHA512 d485fcc50761ca7188be8fc38764779df93af06a606274b1ebaeed40f7ede469d3f21711fdd75b89f121288fbb3d00512d8e80715d5a221039d603ab6e0f2afd WHIRLPOOL 001728bfa335293eebc0438ffa78fe3b1c479b91fd219be7852e0ec36740172522e8f250eaaf7efcd071e116eddd71b72594d5d11a5af5727163053f72f84b1d
+AUX sogod.initd 693 SHA256 8987a106aae104d06b326a0db513a091fe1e2195e74050b70851bf450317254b SHA512 2ccf28bfa4f591532a289277659b9ee0240bc1dc338ac7e884acc24633cfb8a3a36b873cdce09bfacb5da20973dc45821b700eba60f5d5fe8c2eaddcddb7d8cf WHIRLPOOL 537ebb512940dcae7827a1baae38e67841eb680121eb11ca0538d55e3a8f06250be3d8bd95c5b5887c183799427d21de5eed9a6d95e306aabaf4475beb169f35
+DIST SOGo-2.2.9a.tar.gz 11535574 SHA256 02ff02ff0b509981049e14f4fc2f2d4d9e5cb62a53e65145fd41ab653d262e46 SHA512 e618b1b4f0b3f374abd9ec5d18bd3f4252c5642beb8a7c81cc380df5508919dad9a9dbf9de3f55a12ae9d5e603388e9a148e5d01ae41f4599aa8c82ce016d67a WHIRLPOOL 710b8f3ad273aa2f3a8c898edc12cbf9ff8d0ab6c227e793e4842a376358ebd86651625f277d66267de330c9f7f60db7222fd54442692f3d851bd40b4a0ef117
+EBUILD sogo-2.2.9a.ebuild 1659 SHA256 3c7183454778212fdf6b0800ff92f3006f4713d7ec6fe5e2cdf3e61210057b63 SHA512 0e2e1ebca6fa4ebd70947e027e006efe89d82f92d8ec97c16c55061b0c53ebfd4fac751dcc9abba7b8df350ce80751a021cbcc177b93f4e2e30e1ad632c48666 WHIRLPOOL 612f06b0a406f10d195081dfbfe727b49e8e6d1bb8d8549a164e0d8bbab2c476a8a02d314aba93801a40a3303784b3a92c0430f6a1c8bdb3b24020cbd0f0a3cb
 MISC ChangeLog 1237 SHA256 c421b1a148701d1443fbb99309d5dc3f1029e5ce7cc3f0121df28050acabcc1d SHA512 a9a558bf53886230ad4ee742bd22a903f8f78939f1f09f11056ffb5473c738ef19641d0c6f4b16ba0636eab7f6261c6f192481509e8ca052b0e16d800b1256cd WHIRLPOOL 02e52b074e9786b174a4145778c3a5f9285a0b897e7747f30b831144a251b567866a52c141edc93fd80bec5ac529f47703a58f31461a4e4795c333650b0fcf7c
 MISC metadata.xml 693 SHA256 d1322d6e93af0ad7673b6afb5c174e28b6a136f37147608a215c40d16f66782c SHA512 d7ae27144c9128e80c43c91a24ce93039d85e60c249e03b27e862543622b2f87941c1f840b13e63e4efa9f3dd3124432f847459e9a4d93a8ea885672337d5bad WHIRLPOOL baef07409968607dee6e3a5071e3b6ae12d6f4179439143e8c6b9d1cdb721b6ce08a7023d8e2b7d646977409cd0e0feca65c35b6a30c5ec52edf910dfd5db63c
diff --git a/gnustep-apps/sogo/files/sogod.initd b/gnustep-apps/sogo/files/sogod.initd
index 2575d92..c0dfcdc 100644
--- a/gnustep-apps/sogo/files/sogod.initd
+++ b/gnustep-apps/sogo/files/sogod.initd
@@ -7,10 +7,10 @@ SOGOD_PID=/run/sogo/sogod.pid
 
 depend() {
 	need net
+	need memcached
 	after postgresql mysql
 	after slapd
 	after mta
-	after memcached
 }
 
 start() {
diff --git a/gnustep-apps/sogo/sogo-2.1.1b.ebuild b/gnustep-apps/sogo/sogo-2.2.9a.ebuild
index cc55f69..5399c66 100644
--- a/gnustep-apps/sogo/sogo-2.1.1b.ebuild
+++ b/gnustep-apps/sogo/sogo-2.2.9a.ebuild
@@ -17,9 +17,9 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="postgres mysql"
 
-DEPEND="dev-libs/libmemcached
-	dev-libs/openssl
-	gnustep-libs/sope[mysql?,postgres?]
+DEPEND="dev-libs/openssl
+	>=gnustep-libs/sope-${PV}[mysql?,postgres?]
+	net-misc/memcached
 	net-nds/openldap"
 RDEPEND="${DEPEND}"
 
diff --git a/gnustep-libs/sope/Manifest b/gnustep-libs/sope/Manifest
index a3d51a1..fe66397 100644
--- a/gnustep-libs/sope/Manifest
+++ b/gnustep-libs/sope/Manifest
@@ -1,4 +1,4 @@
-DIST SOPE-2.1.1.tar.gz 2256297 SHA256 f9b9e5a056b7d318b5ba34826e8c199421718708ae31e94714a0a6f36f74355e SHA512 f1581772d3b893ce4e1c50db9099698bc7095aa90a7d69a92d658b90afa35a16b4d20c870ebd6fddeb09a50bf4de7918a5163835f4201248d346e728d5f04880 WHIRLPOOL c8b690467028447b33b093e820868f8e5df2fa27083f055d11fa84517917f153bee9249cdfc558ca2522dcf1f0f64b8bbfd6c3fecc8b108e903f2fa020beaa8e
-EBUILD sope-2.1.1.ebuild 797 SHA256 7090ced16c975dcc817858fa15da7125f3a3ca99fbd7b46bbb7752fa557f4cea SHA512 23ff976449ee81de088703c35610ee1391603ec091c7931197d1481d87e519b8dbba3f44559e2b14da3aa6b624468a2e920a64d1871f5e54595b4894b52309c7 WHIRLPOOL eb7a4b3a1724ffff438af96876f324266222fb3031b7e202a5062a647297f852f9798c3e5cdd351b629f3c417db2559ad87e103f10cbbcf495fe9ca685873061
+DIST SOPE-2.2.9a.tar.gz 2262525 SHA256 aaeaf9c8c371dc1251e26e46ff88366b901b1fbdd5af186196742cb2aed8d451 SHA512 7a722c53353f3f661726b6f36464d277cde89d7bb406863cc193fd337fd9dcaa526ff06afe053bb6b35a0382e3846c6c2c05adfbd5ee512374518243e1edf140 WHIRLPOOL 6542dbe5d8c951f6858a99ffb3101d64440c3bbccb1577795e15b592e59ae448d025f0498aa9f96ceb973d02579f190bf99c1d658309d2fb8a375cd1e6e1ac49
+EBUILD sope-2.2.9a.ebuild 796 SHA256 f719846ab726327b78edba2c78677b56deb2fdec419e748a7bc822d8d62ae299 SHA512 3326af33c54301434e35f8d8754d6f3f6685ce06390a269800e90f423b2c9f41ab825e5460aa07eff5df3c6063bca2a9f885865800dced9b567b5a003de012a5 WHIRLPOOL de38add77f59c35c54bf03e410356ccd5038dba716ab7742b0d000605439bfb3cce805501ad1297b9ea4d56c26e9c632037199735de41dcac7c9baec6067ca4f
 MISC ChangeLog 2069 SHA256 37d0b99acc252739317bf8e877a0cfd71b762ed0b2b8995f8260f3fc354e9284 SHA512 f97d38899bac9edfa73df186baf80bf7a1d14089cebc3059baff42d8f023bb0089d66bb413d723e01d2be963d99c4b89662a318fb8a212c33c54cff82c02f2e9 WHIRLPOOL 5792192d34f09b6a95b16d7af85fec68bdb12caf23ff93d5041c206a2250809820fd190ef4be22d9514ebb450a9e200bcf1a7fb6ca261c6bdb6546297c40a049
 MISC metadata.xml 538 SHA256 abd85b369bd30229dc03b1032d04f29b900a793dca4d6b3dd0a582a9f25b426e SHA512 9c8b205c66f7f2bdd525b8dd2d5565e8c7fff65e43d4fcf3c152f1301101e988d700ea8dac2e5186fc854436308cc890cef5d3dffa7f4b41f4344a455631580e WHIRLPOOL 7452efe1975238d70b80ce29b5e971803ab59b43a2c837c5ae6721438b740d44400ca445c59547108502f0915a10ecb225b76bc3573cda3c726fe3e12adcc4ed
diff --git a/gnustep-libs/sope/sope-2.1.1.ebuild b/gnustep-libs/sope/sope-2.2.9a.ebuild
index eb047bb..0ed8eb1 100644
--- a/gnustep-libs/sope/sope-2.1.1.ebuild
+++ b/gnustep-libs/sope/sope-2.2.9a.ebuild
@@ -3,7 +3,6 @@
 # $Header: $
 
 EAPI=5
-
 inherit gnustep-2
 
 DESCRIPTION="An extensive set of frameworks which form a complete Web application server environment"
diff --git a/metadata/cache/gnustep-apps/sogo-2.1.1b b/metadata/cache/gnustep-apps/sogo-2.1.1b
deleted file mode 100644
index d6410ca..0000000
--- a/metadata/cache/gnustep-apps/sogo-2.1.1b
+++ /dev/null
@@ -1,22 +0,0 @@
-dev-libs/libmemcached dev-libs/openssl gnustep-libs/sope[mysql?,postgres?] net-nds/openldap >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
-dev-libs/libmemcached dev-libs/openssl gnustep-libs/sope[mysql?,postgres?] net-nds/openldap >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
-0
-http://www.sogo.nu/files/downloads/SOGo/Sources/SOGo-2.1.1b.tar.gz
-
-http://www.sogo.nu
-GPL-2
-Groupware server built around OpenGroupware.org and the SOPE application server
-~amd64 ~x86
-eutils flag-o-matic gnustep-2 gnustep-base multilib toolchain-funcs user
-postgres mysql debug doc
-|| ( mysql postgres )
-
-
-5
-
-compile configure install postinst prepare setup
-
-
-
-
-
diff --git a/metadata/cache/gnustep-apps/sogo-2.2.9a b/metadata/cache/gnustep-apps/sogo-2.2.9a
new file mode 100644
index 0000000..3e32156
--- /dev/null
+++ b/metadata/cache/gnustep-apps/sogo-2.2.9a
@@ -0,0 +1,22 @@
+dev-libs/openssl >=gnustep-libs/sope-2.2.9a[mysql?,postgres?] net-misc/memcached net-nds/openldap >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+dev-libs/openssl >=gnustep-libs/sope-2.2.9a[mysql?,postgres?] net-misc/memcached net-nds/openldap >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
+0
+http://www.sogo.nu/files/downloads/SOGo/Sources/SOGo-2.2.9a.tar.gz
+
+http://www.sogo.nu
+GPL-2
+Groupware server built around OpenGroupware.org and the SOPE application server
+~amd64 ~x86
+eutils flag-o-matic gnustep-2 gnustep-base multilib toolchain-funcs user
+postgres mysql debug doc
+|| ( mysql postgres )
+
+
+5
+
+compile configure install postinst prepare setup
+
+
+
+
+
diff --git a/metadata/cache/gnustep-libs/sope-2.1.1 b/metadata/cache/gnustep-libs/sope-2.2.9a
index 57b05f7..fe1276a 100644
--- a/metadata/cache/gnustep-libs/sope-2.1.1
+++ b/metadata/cache/gnustep-libs/sope-2.2.9a
@@ -1,7 +1,7 @@
 dev-libs/libxml2 dev-libs/openssl net-nds/openldap mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) sqlite? ( dev-db/sqlite:3 ) >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
 dev-libs/libxml2 dev-libs/openssl net-nds/openldap mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) sqlite? ( dev-db/sqlite:3 ) >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
 0
-http://www.sogo.nu/files/downloads/SOGo/Sources/SOPE-2.1.1.tar.gz
+http://www.sogo.nu/files/downloads/SOGo/Sources/SOPE-2.2.9a.tar.gz
 
 http://www.sogo.nu/
 LGPL-2