Version bumps, mostly stability fixes

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x00F7AB331B0F097F

5 files changed, 82 insertions, 33 deletions

diff --git a/www-apps/owncloud/ChangeLog b/www-apps/owncloud/ChangeLog
index 5f6fe271c517..dd780c9d7969 100644
--- a/www-apps/owncloud/ChangeLog
+++ b/www-apps/owncloud/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for www-apps/owncloud
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/owncloud/ChangeLog,v 1.65 2015/05/04 08:36:09 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/owncloud/ChangeLog,v 1.66 2015/06/10 13:18:32 voyageur Exp $
+
+*owncloud-8.0.4 (10 Jun 2015)
+*owncloud-7.0.6 (10 Jun 2015)
+*owncloud-6.0.8 (10 Jun 2015)
+
+  10 Jun 2015; Bernard Cafarelli <voyageur@gentoo.org> +owncloud-6.0.8.ebuild,
+  +owncloud-7.0.6.ebuild, -owncloud-8.0.0.ebuild, -owncloud-8.0.2.ebuild,
+  +owncloud-8.0.4.ebuild:
+  Version bumps, mostly stability fixes
 
   04 May 2015; Bernard Cafarelli <voyageur@gentoo.org> +owncloud-8.0.3.ebuild:
   Version bump, drop depend.php eclass use
diff --git a/www-apps/owncloud/Manifest b/www-apps/owncloud/Manifest
index 2db08001df6e..c08ff427e87f 100644
--- a/www-apps/owncloud/Manifest
+++ b/www-apps/owncloud/Manifest
@@ -3,34 +3,36 @@ Hash: SHA256
 
 DIST owncloud-5.0.19.tar.bz2 10657208 SHA256 38888db65938c9b62816a6a54f52247e12c8909ea0976631eb60a4d92c1b9577 SHA512 c09c56db98ca0f36372c16c799839ebe488fecba57179814378bd1bd3cc1569cacaad48cfe7bed5cf592ccef5e46052c0cd90934a43eab008a0458d279634a56 WHIRLPOOL a212d60158b3f9a3dd1846a9b3f80444656d2afbf7f5c4d0df4ca8fb1a524bd091abc22db5026e7cb5587fe5777af8eac71fd93bdfb2e27d9ff513c36f0561da
 DIST owncloud-6.0.7.tar.bz2 30850009 SHA256 eefc03bc782c243c220e4d42faeb4017b2e5b6aac65dbfc9b9a549d1c4a169c5 SHA512 9f22a1b6f7ceb4643a6ef69af118dc35050206e3941f3028844fee8ea080d7ad295913b082309fa20d66e781d9b12fccc62d1e8cfd31a7fd4714896df452f031 WHIRLPOOL edf670df59ef36f325a3df04c0de7da4bc208e42a830ac9eeadaf9c5f43ee4a53e3d499399504399a42f7a74c221b51a3dcec0309a4c83e61b1f7b7419b0f13e
+DIST owncloud-6.0.8.tar.bz2 30853189 SHA256 055719b0f020f7c27ac636e15cfdc53b09658c26437d08536eae746ed33ee0ba SHA512 314b0ca9ac4a3f05135f15f514248d1fce463d4852a4645fc96de76dd027c6a8e0db452f072103163160c1cab5af6117abeaeec9d585897e909f5a81d93c870c WHIRLPOOL 5af292194550fb45155ba972255235cd7ba35b62c6022ea761ed5fa8627edc9d5ef07dae200ecfefeacb1b97164fda37993c50684ba1a7b94548b5b067ef0db1
 DIST owncloud-7.0.5.tar.bz2 28236574 SHA256 3e45edb216afe12a84908106ad3cd36678a921fd978505688a16ae2de95941c8 SHA512 77c7519c8df1a892c143d1fc9e84901d6fb2e8920bf00300b43dbc2aaaf25b3539e189e2b75bd30db9c40963e3e98b00ef9ca6d7caffdec8a75257a0342e7b3a WHIRLPOOL 52cd6dbe005f3ab33b15fc8bbb6e40c4254ebd2c986a894cc07075f51b892026548b71a5503a391f0d0372a93e4b0d942800d7f7874ddcba2f8cae19b7bb8085
-DIST owncloud-8.0.0.tar.bz2 17200380 SHA256 0c62cb06fe4c3eb107bccc4302f2bb3b9f7e5373cf7c9dd307fea8e823e6342f SHA512 bc92f4341cb4b6b2f7b5f9218d8bb7f4321008d6f2391f237ea07303ffafef5aebc94317c690daea2f81d408b0278198c84cfbfc40192158ef5f08b482efa5a3 WHIRLPOOL 0a58336903e173962d6f308f955d95da9ef32d3ac2d9b7045ef212014a30862ed03a3af8f6c2dfc9e97cdfdcdf068f55057dd92a8436ce893a39e2e00fa5ed25
-DIST owncloud-8.0.2.tar.bz2 20422855 SHA256 46c73b6ae3841e856d139537d21e1c7029c64d79fd7c45c794e27cb1469d7f01 SHA512 780a9e3c2d8b62dab83681716b830cdc660621f0316b2c87a1f9472b72e8e69b4a48e29a344d4c7ed9d2dc6244b84806cfa9cd1a878669b51256cc8da40ee8a0 WHIRLPOOL 3ef1dd9bc92794f792fa9d55800f16a709ae2087d6a608ad84721364666027b08fcaed01e6a62854f25c36d4d29217ac9afb7138159c2544314d8db865e68112
+DIST owncloud-7.0.6.tar.bz2 28624928 SHA256 0c7afc0cb334ef4b57b11bc1e3afcca5495425cd5902089b2cf5c6934d290117 SHA512 2cb872b07d01106204b32dbbea5f46041e4de57b7063c454d974088f1c348591473f5858e5175a9c60ee101805ff09a3fa2679c1e273750b1a6e8d38279c127b WHIRLPOOL 4bdf5c40ea8c4e35cb51d6b54151deac5573bd018ba3d30925b6ef3900296fee7f333059350bf2d855201a8e0620a257b4571c8e27030e8e10163f096154e645
 DIST owncloud-8.0.3.tar.bz2 20403786 SHA256 ba3556a652e653e30b73810abf18f48d2b4e612bc89d7020610f88e65f94d68b SHA512 3e66e499e1144b17f1386a12a3da2a15f32ff07d3208f545b15b3e3c295399f3fb5f5d7187111b0e13288010f1a939d97e6d50d4c3360f29c4b4a76787aa68ee WHIRLPOOL 07de165043faa876ccf82ba791dad0f8e33ca8cd123d55bb731215b92d0c9c7b8bdb3da99a483f0914532a78e201d6c0523f9d53d246ebbc0708220700676b71
+DIST owncloud-8.0.4.tar.bz2 24518670 SHA256 0a99df7d6c6cdf3d5654b306d337c5d5980fa3b490e7791d357ffd82f2249179 SHA512 6ce8c86fe7a145ac8ca1e2316f50e8f719f154554a161942b999674f111dd5afb54f1a7065ce8f53e1d31a8d17cd571d285fbfd6e6eb939fde2f637328f420fa WHIRLPOOL 8a9fdbb686b3dc357a7eecfdcb77e5b07779422e2cd6588c8b6fe87d00da57355435f854653f2c5dc299a895c4143059a4bd3e297ab24abf9e72e94045c66947
 EBUILD owncloud-5.0.19.ebuild 1194 SHA256 42205ff25a3e4c14289f8271617c6c821fbebce6dededa485b9bfcc15ba4bead SHA512 2f96330b1ef4d32bccf63c1b5ab49d53912e9a030a84d9b4ef971aa7420f47be999cf6b104d1c3bcb2142358e7aeb7800a13290c13e1731a4054a5b7cf895365 WHIRLPOOL fbfcc737ec9f353631a7f511456fb38758ead30c316957be72935295c2be007e56860d1f3c98d79772c87fe830d750bf8a60e6915cd0fe9e6149e8a460c3615f
 EBUILD owncloud-6.0.7.ebuild 1141 SHA256 1735f739dc54a31ab523b7a34d54443bc5da95d1e5287cb55bed81b387705866 SHA512 b68fd772e939207e579bdebdaf932fef9e2d3090f71048a2c9fe6caea7ffd7480179e0eaefd6c9629e3275cdefbdf6dac0386082cb44b22c4481505225d9cfb9 WHIRLPOOL 0ea4b79d8999fb216097ba958de6d1a2c77fe0b12bfd27a58da15a744ade8121d30b71d490eff6a52d92ef460f53b5c81ffe7aa1d9bb05a4090620426010f9bc
+EBUILD owncloud-6.0.8.ebuild 1141 SHA256 8257fa38d73f62fe9ea8e6ff6184d0c07ad0b32310b8ee61d61c9591ec497706 SHA512 564e3de6df658dfcfdc0ffe4484e39825d599b91bbb5e552178887316c762e349207864781d99c136fd336eb82549132b6a06770a00596c9f5dffc86e88f5c26 WHIRLPOOL a9b12bf73405cfede8f052ebaf486bc00db0ac08a0f7e2c5153a0f72e1099c5e125d128ff227c87fd35c2638e409bbe3f21dd352afe918d8610ca4ee87f096ad
 EBUILD owncloud-7.0.5.ebuild 1141 SHA256 6c5ae082dbf187c4903d89759d158094646155e1b58a740d0a9fe1ae5b331144 SHA512 d30bb2fe375044c7d0349a73e9c6e7c640a5d1e7912fc734dd438cc69fefcff3f1af57550362afc506add8bf56435f6092b318ee3fc6edcc65905912d167f67b WHIRLPOOL fdcf0bbfb34f63f4adbd437b9e95a559586b4ec8fe8da88dba6078af8dbcf8ef23425c0ace5ba9cb1d15b29985ff938f2880c383bd23fee81e3a922b78eef8b3
-EBUILD owncloud-8.0.0.ebuild 1409 SHA256 942569d49c49f4e8ee6bad9b7f01df6a15d57be33240d75c453ff9fb03f0aa8e SHA512 a84ec0a615391d13466e6e7f1ddf88d89d7eaf172cfa2424270c5aff24b0bd91a5c9508903b83163c6aa2a74926ec41e32eefd903daf023e95062b010701e34c WHIRLPOOL c5ea96f8016a150701a9e23f00182e12e260d2966d8f0fac8032bf404f101e1e6485eafe6a12dcb64c2923eec0ad2b3bf36fb15028d168b0cebc8decd5b6a35d
-EBUILD owncloud-8.0.2.ebuild 1409 SHA256 613f9028f432c147350d4e5e888868f5d94c05c8c9a6df74b33e1303cd1874f5 SHA512 2b447a2bcd8c18388db0217b8a47a0582a604c8156ae009975550ba038fb611cb861ea556d22598e4e282c662196f33a16f263c0d64a8c35612322b39549b0a8 WHIRLPOOL d7e5d3888e70f76597d2f246573ef776b23955ae430f7d1003ac464101ce9739ec26394190a97fa5be01cf8330259588480b3fe4c5a7fad3c6f72469b4819b5e
+EBUILD owncloud-7.0.6.ebuild 1141 SHA256 0d33ab82a2ff0b7471e01e0ff8e020d18145bae267934d59897ae9630b5a598e SHA512 37eba8b8ce61dab309e0b2fa9be5b9c9f902cacf7656e74fcf513aa4ccac09bbbaa3de6260ca8719dc69ce834276f251f981df5b4390974add414b109153240a WHIRLPOOL 07e2f90a08ccecccd509a066a96dac7f217992c90a6be147d752f08fe46c50bb1e1ffc50f3d5285937a365eb81c475da048617fcb858edf90298b59fe212d497
 EBUILD owncloud-8.0.3.ebuild 1387 SHA256 e1353e56046139dc31ab1d21e880487c15c165325e9f57f6c4f12909e3e48a6f SHA512 54fd3d5a248c213007aeb9fda1ebd12b04244bbc5ef8d553ac7c6358ce8318afeec4d88ca4e1edc0f4dedf3fe39bc4b05dd8560a03906c9cbf03ea26291e0b7a WHIRLPOOL 4c1b4f3d6333fb28b518c41f6b553202f4e5ee770f533918a6eac8d94098c12ecafdcb94b735f5ce92352e2af8410c6f5639591804869c00b3c2a376f8ac6e41
-MISC ChangeLog 14300 SHA256 2b59c61a7d79d9deedd57f6168baed8874f05ee3c3607a8da64a730b33130856 SHA512 20f448e5f2c7715a500826f5dc1ec976f41503334dbb3ffbb7d19f32ab141d9512788b98c66d02ce11e79180f21102975d37ab5c3d096b74cdba42a58bb94ced WHIRLPOOL c6c5d0bfcbbd7801908e4d30ede52e3c52d6a9b97de4414d4690c9540adea36b2e9bbbd3c3eeba44c94e79cab74f83f278ca9e1546b6f569df41d0a10eec1677
+EBUILD owncloud-8.0.4.ebuild 1387 SHA256 cdbfce6711dccde96459c61667e9643960f0633bce7a2fe981bce870025d4f2a SHA512 6ddd978e0a903347a1fcacef316b0a22f079fe9f72d385f181a68801da125af66793910fd2baec8a3254bd461e2ae2de7c36e7abe998dd7ed5744f21bd86fcda WHIRLPOOL fa2664ae36587a54722b310999aab7e17c831433d2fe01d172469e519f46e8b66027b9733a2c0f03c03b56a0de1ab13d673bc749e18f08c7f242c741899ef3b8
+MISC ChangeLog 14611 SHA256 9cd408f215c7c791fb980e9939ed446da047cd5d4a2c6fea4ff2d1d0f5f52efa SHA512 78529b252ba4ea9f18a3625690835d343b09e4b23a019506ee47b6bcd652029e8908ca607f0d8ea2629017848e91dd5f948ff9940cae11fb60470783c3bd50e1 WHIRLPOOL 5738cc8f5a8fa88fbad069a9abd70df59a464cd94043a2c6d4d205e39a87225845f1c15c84d5cb9f7024b77f3a255f0e14c666a183383aa30794420403cee609
 MISC metadata.xml 261 SHA256 d257237b248b326cd37d437d855241aa19cb033326c8f451bba18454c37e5670 SHA512 c8626fc3a8c3ac123b6f7e4bc1a1d689f6f64918377f807e7c7be119547c494184a0c661325579a88b517ae80aa733d68b7191958598348571e5a18b5ace5341 WHIRLPOOL c695e8052351e59f30f274989a498c8000299ad0b26ccc38ead11b2d0637fd1e4fd809e81362e18bfcd973f4e0c136794e7032c64bbc0f6d5763cd263389d823
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.1
 
-iQJ8BAEBCABmBQJVRy96XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJVeDkrXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXREMzFDRDFGNEQwRTAyNjc2QzRDNjRFQzAw
-MEY3QUIzMzFCMEYwOTdGAAoJEAD3qzMbDwl/AC8QAJ0a94C+C2UBjFcabpagCkST
-ZP/H+Tf03RnxiuNozLZFfqD1IbyedqiJYpfOSK8mURzOyir3NQ92aFQREu1hj5rT
-pvTc+ncJRtc6fQO/Slo1OabXsx6uVP5E28Kj0N6JT2pzdPuZ13lF5PeJZgmKuI5e
-CThEq0Mm0P9bV90V40wzs2sW6w4FUB8sJaeW3ws2rmsKvQrLEqLfaDcXKF91geJf
-lblIE2cMcprCR3T6FV1TahHzExXWxD682Nx97kn5evWsbBMpmPFxrR2aLdv8KMEe
-M8+NkjC5CD4GfdOMivKnX9V8/Pb95Ww6Tdj8XDHCNk3fCSzulhbKzdYo1u6W7FHy
-ExvsBdH3S51nykPr8rnJ3JGJigayUvbSe8FkaOMkYA9T4YKRXgURUNkY7XFhvVc8
-TDsKPxP+m4didIczzhiGFOXArsdNsjDfv+UChwYXV+4GcjhKGVbKaAxUiMIYnxtY
-559bQoQmYce4YjbLsKPMhv4+TRlAVdaIVn//Iao3mbNKBE3Pw56rYnrluD1EGecV
-9Pd+SjzyMSI1YWMagnllZXbKedwQ3nyRHPBKJ5B6StSkwhiTGUkxY0l7FUvHPzu8
-Oov0mxcQkdKFZuDmzxs5riEfriJdMghNASr5NkHCJ963PF6TGsC1ZzfFk2jiD7Zs
-m41a5oSS8CWzuS7O2niB
-=LFRn
+MEY3QUIzMzFCMEYwOTdGAAoJEAD3qzMbDwl/F0YQALPn4ZFOU4Oln9pZ7My1OVo0
+ZQWnhkFPSjAiXYWfAFA4nPPr9KJfNgiX9dpRHOiuawkEAn2JwPYN7cYvSXRXdUTw
+1UTKlRvVat4ezuaqOjHTec1Hf1sCzrAeFxXKmFL/nuUA/v+D3/f7VgoC0StBXwhY
+xektFTN58bxTDgvtFDv6OgJDCAvgiP1nE9vCb+QFfpssrVaQVnqd9xAn44eIz1fx
+5PJF8ybnPuHsakP7HaYQR+HHiytehxhUKBw5PDZtntda+DPFh4uX1V0Ed9quHstK
+nKSCW05M0O//I3eRiW14UMvOyqw5cwl4BVuLAEtdvfs+cwR7I4OI7OrdWC5pZHnT
+3qRMDFJQRbX/9b+Y5LDuMOjqb/zVRxfcf70VLNDkaSj+B5CJ+eqQM5JblXWlPCD9
+TFjwvqdsSZ8EC2V89W3tA+5hhb/i2+zi0uNS2yezDf5ZUAQMEqm27KCnDqmqbtcl
+R7+JeiNh82gcDYT5l2ai5tsixVWz70roirzroR7FMnBf8xdB340OhaQx6pneaEZK
+aGiPCvMD+OsuLjamXsVtV1pcE6gAGEotZdwTzTPTw7kI02KBIOuXDuglexbsBe/q
+DabQHeqS/BliaTpjWQhJrbFzSPatNGiL9dHZQUodBQdKdNyfMwc1viKTNZTO9W+9
+lo0uERke1jWjUZrpQOWs
+=DoSY
 -----END PGP SIGNATURE-----
diff --git a/www-apps/owncloud/owncloud-8.0.2.ebuild b/www-apps/owncloud/owncloud-6.0.8.ebuild
index 13cf6dc7daf0..8c66e7dafa62 100644
--- a/www-apps/owncloud/owncloud-8.0.2.ebuild
+++ b/www-apps/owncloud/owncloud-6.0.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/owncloud/owncloud-8.0.2.ebuild,v 1.1 2015/03/11 16:21:57 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/owncloud/owncloud-6.0.8.ebuild,v 1.1 2015/06/10 13:18:32 voyageur Exp $
 
 EAPI=5
 
@@ -44,10 +44,3 @@ src_install() {
 
 	webapp_src_install
 }
-
-pkg_postinst() {
-	elog "Additional applications (calendar, ...) are no longer provided by default."
-	elog "You can install them after login via the applications management page"
-	elog "(check the recommended tab). No application data is lost."
-	webapp_pkg_postinst
-}
diff --git a/www-apps/owncloud/owncloud-7.0.6.ebuild b/www-apps/owncloud/owncloud-7.0.6.ebuild
new file mode 100644
index 000000000000..adfc270c75d9
--- /dev/null
+++ b/www-apps/owncloud/owncloud-7.0.6.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/owncloud/owncloud-7.0.6.ebuild,v 1.1 2015/06/10 13:18:32 voyageur Exp $
+
+EAPI=5
+
+inherit eutils webapp depend.php
+
+DESCRIPTION="Web-based storage application where all your data is under your own control"
+HOMEPAGE="http://owncloud.org"
+SRC_URI="http://download.owncloud.org/community/${P}.tar.bz2 -> ${PF}.tar.bz2"
+LICENSE="AGPL-3"
+
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+curl mysql postgres +sqlite"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+DEPEND=""
+RDEPEND="dev-lang/php[curl?,filter,gd,hash,json,mysql?,pdo,postgres?,simplexml,sqlite?,xmlwriter,zip]"
+need_httpd_cgi
+need_php_httpd
+
+S=${WORKDIR}/${PN}
+
+pkg_setup() {
+	webapp_pkg_setup
+}
+
+src_prepare() {
+	epatch_user
+}
+
+src_install() {
+	webapp_src_preinst
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+	dodir "${MY_HTDOCSDIR}"/data
+
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/apps
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/data
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/config
+	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
+
+	webapp_src_install
+}
diff --git a/www-apps/owncloud/owncloud-8.0.0.ebuild b/www-apps/owncloud/owncloud-8.0.4.ebuild
index d767c2a1532e..de84178d20b1 100644
--- a/www-apps/owncloud/owncloud-8.0.0.ebuild
+++ b/www-apps/owncloud/owncloud-8.0.4.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/owncloud/owncloud-8.0.0.ebuild,v 1.2 2015/03/09 16:58:58 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/owncloud/owncloud-8.0.4.ebuild,v 1.1 2015/06/10 13:18:32 voyageur Exp $
 
 EAPI=5
 
-inherit eutils webapp depend.php
+inherit eutils webapp
 
 DESCRIPTION="Web-based storage application where all your data is under your own control"
 HOMEPAGE="http://owncloud.org"
@@ -16,9 +16,8 @@ IUSE="+curl mysql postgres +sqlite"
 REQUIRED_USE="|| ( mysql postgres sqlite )"
 
 DEPEND=""
-RDEPEND="dev-lang/php[curl?,filter,gd,hash,json,mysql?,pdo,postgres?,simplexml,sqlite?,xmlwriter,zip]"
-need_httpd_cgi
-need_php_httpd
+RDEPEND="dev-lang/php[curl?,filter,gd,hash,json,mysql?,pdo,postgres?,simplexml,sqlite?,xmlwriter,zip]
+	virtual/httpd-php"
 
 S=${WORKDIR}/${PN}