gentoo resync : 19.10.2017

12 files changed, 24 insertions, 265 deletions

diff --git a/net-misc/connman/Manifest b/net-misc/connman/Manifest
index b8546449e95a..6a5d88a9d7d5 100644
--- a/net-misc/connman/Manifest
+++ b/net-misc/connman/Manifest
@@ -12,7 +12,7 @@ DIST connman-1.35.tar.xz 686092 SHA256 66d7deb98371545c6e417239a9b3b3e3201c1529d
 EBUILD connman-1.29.ebuild 2013 SHA256 ad17727b0ae8e64e5ab1c3b8b0c703478d66e59e706a044bafbeb8ca910634de SHA512 e77846ca1759957f4d898fd76b06f126d6181c85384eed8f6ffee4d9e6845eb43f831a0db1ea349b387392e60e43dda8c364f87b1f98c5ca84652e2fa858e35b WHIRLPOOL ec43b983ec1783efb5550f9a79638d40ca367456d7b7d6e153a8cc6611151ed3a21439353a62b3d85a889faf31add4694c1e7e69931c7947e9e6823514fec64e
 EBUILD connman-1.33-r1.ebuild 2280 SHA256 a7885ad550fdac86e3d541e7498b168b63fc1c756830475b2b81c1137637a0ac SHA512 8c396fa66e67a4519d2fe067e43f11cff3cb751e7f610e6ccb2cc75836cf74784fde1f8ae291b4b2189e92c941885b3c67e55556807eb1c9fdf619c9bc247ce0 WHIRLPOOL 30b138b15c18ea13dc31a5ab652560c3a78a2197ddeec140d7314e267ab1536de596845f530965e88031b437f858fbfe8814d4f36b4c27641a4cf8e0c4ab8fb1
 EBUILD connman-1.34.ebuild 2490 SHA256 42e3495aaf082a1a2854ee1a2a170c2906b22d88676398b3497581b1ca3c6d83 SHA512 51b456ca18a681392a9ffdc44ca31d1838cfe597e43ecef28b5202f69415465ee29a70d26a6ead153acaf7028b3da18049ab7d2c465b21fffd443c8b07afe302 WHIRLPOOL bf5bde68411fb8add701602e00196fb9d9e226243b82eaf93ba406d0720b710781c779537dc9dc9f338406561cd4c08d71742392656c889b372450c4175ba351
-EBUILD connman-1.35.ebuild 2490 SHA256 42e3495aaf082a1a2854ee1a2a170c2906b22d88676398b3497581b1ca3c6d83 SHA512 51b456ca18a681392a9ffdc44ca31d1838cfe597e43ecef28b5202f69415465ee29a70d26a6ead153acaf7028b3da18049ab7d2c465b21fffd443c8b07afe302 WHIRLPOOL bf5bde68411fb8add701602e00196fb9d9e226243b82eaf93ba406d0720b710781c779537dc9dc9f338406561cd4c08d71742392656c889b372450c4175ba351
+EBUILD connman-1.35-r1.ebuild 2496 SHA256 62eb33339be7d88cc49e999b52aa38c895e8f2bee015418d9827bc9f345772cb SHA512 b32d306828bcb2d9a7691ae2b3e833cad5df5d6965744792c068c93b2edf8baec621c473ae51e198328c5d8a3836d4465f177089b4001045ac886d09fcef5220 WHIRLPOOL 6f744beda159805c0afa4dcf6de731a639d407d9b7b896eb45f6a365afcebeda2a7e091e2f1797516a2eab99d7d3b0844308954d6e3f91df48fe00b689bcc8a7
 MISC ChangeLog 8119 SHA256 381c030744556e3d11ecd4ecf2042c63b5641be71fbe19112779e585c0bccb8e SHA512 a10468b98027b1e847ea2ea665a2f56415279bb3dcfd6cc04f33bd19a342d5e586ce28da1963a1dd6af3845a5e4a0bad84e3723ef6533a71a1e4e79634d89545 WHIRLPOOL d763544ef27f8741d1138834dca76ee9d48fb312eb643637b34eff96d236bea7f3368555fd18822c23e631ab56f536bee66fa8b6c552539a669fb14ed8276f5f
 MISC ChangeLog-2015 17832 SHA256 679dbb203e1a94d59ea486874f1a91031a972c5d68ecc8e126eb111aa05133ca SHA512 1de0542901b13ac1d4c8bd36d89477e42a7bfc7222fb503b3adbb7a16317b923616f6a674b9c478cba735c16ffadbc4f540a2fdcbd58cb9cd4875f138cee16f4 WHIRLPOOL b73fbce83f9883ddc90e4346b44a7adce8410182ae7b2074ca0b54c4019c28c45c04ddfe1be724995d301221ea19a4d3fb4c26ce9162c5fb8828a02a21202bf9
 MISC metadata.xml 1087 SHA256 386df42a5334cd2f73807ba47bb6c72c81dc56d05f9834d8022e884d97eec679 SHA512 8f02d9cf4194c9e24edaa9a0427d63db483bbf559ea119a043a70a759f583aec42203bedd12c91364e1c24850e9cb6b1831054294c3837a0c3a50cb75dc1de42 WHIRLPOOL 53aa8b09358eff213671e99fb00d331ee253a710a58dd81902bbe7960daac50c2bcef77b22ccb371c7fe7f1e1a5b80c0e5092254475048b39be90c08b5c8e5f5
diff --git a/net-misc/connman/connman-1.35.ebuild b/net-misc/connman/connman-1.35-r1.ebuild
index 12b9cd9901a4..8d406d12dd1f 100644
--- a/net-misc/connman/connman-1.35.ebuild
+++ b/net-misc/connman/connman-1.35-r1.ebuild
@@ -22,8 +22,8 @@ RDEPEND=">=dev-libs/glib-2.16
 	bluetooth? ( net-wireless/bluez )
 	l2tp? ( net-dialup/xl2tpd )
 	nftables? (
-		>=net-libs/libnftnl-1.0.4
-		>=net-libs/libmnl-1.0.0 )
+		>=net-libs/libnftnl-1.0.4:0=
+		>=net-libs/libmnl-1.0.0:0= )
 	ofono? ( net-misc/ofono )
 	openconnect? ( net-vpn/openconnect )
 	openvpn? ( net-vpn/openvpn )
diff --git a/net-misc/geomyidae/Manifest b/net-misc/geomyidae/Manifest
index 21ded8ed1a8d..a7c410530fae 100644
--- a/net-misc/geomyidae/Manifest
+++ b/net-misc/geomyidae/Manifest
@@ -1,7 +1,5 @@
-DIST geomyidae-0.26.2.tar.gz 15399 SHA256 49b4fbc437321e31a3b073cf8b88ddd4482b35a144a4289b4849e2242b991465 SHA512 337665350ee9fc09a88c83ebc8dd8d53ead9c5542c90c23f519bc99c1a1055e4751e78dbb70578325ba42d9aa59adcbbf4e32629fc75744b70e7ddc4c8266dce WHIRLPOOL 9e2409c7f5d5be2b46e43908db065a56db2e488b0769415cce9fb4b828d0f213a836e48068812d2e7aa9ee7cfd00d1970e04c504e18e9186b573e275a0c0ae2e
-DIST geomyidae-0.26.3.tar.gz 15556 SHA256 162f55ab059ab0a9be8e840497795293bbd51c34b1f4564dcdf3f0ddd5c0db31 SHA512 fcee0133547881f6df173a24eac0fd3007436365375f11c572c50cf2e77c2033d441209f7f20dab1d291b0e9305de245da409351a02df4ca92d7b158768424b3 WHIRLPOOL 79385698ddd1c9c99fbb03c77ac6e817e157e3d8779f9929fe5ae281472bbc00eec81a18b2fe02c27fd96377e6b20e5e2d0b18d9bb747a3004aa96db076bcaf3
-EBUILD geomyidae-0.26.2.ebuild 902 SHA256 b8efa0f9f2c22d1042e245e4f963aed47889f759238d989a21d1a518c7261dda SHA512 d0cb2c36f7d2d2e4896006f92a1ee624e4d94188c891dd85c0d0cd2075bbeb06dc62299119190beb713c67e41ad4230ad0e3aca8ce1a54268852821c156a7b70 WHIRLPOOL d8084ea5526681340a5a2aaa77afe9de5ed70da5805158f0d551458115f1e3cf4365b2ffbef879189c5a6a75db95e8f234e3e9d7238f9a01d45832b68f206bec
-EBUILD geomyidae-0.26.3.ebuild 902 SHA256 b8efa0f9f2c22d1042e245e4f963aed47889f759238d989a21d1a518c7261dda SHA512 d0cb2c36f7d2d2e4896006f92a1ee624e4d94188c891dd85c0d0cd2075bbeb06dc62299119190beb713c67e41ad4230ad0e3aca8ce1a54268852821c156a7b70 WHIRLPOOL d8084ea5526681340a5a2aaa77afe9de5ed70da5805158f0d551458115f1e3cf4365b2ffbef879189c5a6a75db95e8f234e3e9d7238f9a01d45832b68f206bec
+DIST geomyidae-0.29.tar.bz2 16279 SHA256 4a2e63c65ff2007179ebb63549f7ae19876549f902fb6621762f3b7dcdedaf63 SHA512 00bc7c4b5c1cd58d7e36cc5bce9a8d2e3dd70ccfd2f3c2729527ed7c55ced04aa0f9cf024b825f6f3317b2c1b35b4f3fd4dd88c83b14369e98b72b59965b0aa2 WHIRLPOOL 266b1f3c16604a6f963b535be2bfdd00a31d9174002f1eed39c2579b4d72fa866be30b3c8655e4a8b70fd8e3cfb4d74a42b08193809e6e64aa4cb70964e3b0ac
+EBUILD geomyidae-0.29.ebuild 1155 SHA256 7c6cf9ad02830cd2cbd769047d8d248af3a9d1e511b8ffd335327061294c7907 SHA512 dc20c4e2e198695df054931968dd81ce23a7e36a01ce5b184069e67a2a4112d5bb1de693dfd0d6ccb460849d1a643f15a27fd90ce3a3b0164c0a3c362d1cd70d WHIRLPOOL d1ac11e5a037ff55f22bca87fcf8a56e4cdaf33acbfd486f9567808bcaef4940c70515c9c0bb59f068f5ed6ce5e40c8b25c283b2147dae001ffbc0866ed2968f
 MISC ChangeLog 2242 SHA256 699fd57a47b460ce591723fd3a05fd0f2f91f8fb427a4bae018c89714769f661 SHA512 5f87aa244fa0f539f7907b40b0e0b36751f072ec6a8250d971c53efa655c38d77fbe1ec5464bfcf6104c19f74512ec0017ac99ff96de11802edd9ad15ebbf2ff WHIRLPOOL 7d236b3c1a3e21b2831b6b6d160578b52bf1eb3a4e252317d59e048534aaa236bd4a6785e2a24e2a9f37429915e5dc60b9d1e023486905c620f2c48186907ef7
 MISC ChangeLog-2015 887 SHA256 ccdf33ec986ea035f828a57db2ed77ac0bb7dfbdd9ae48173189ae22e4d4ff9d SHA512 c9bd2bc96dacfffeefdea47d5c8d5a33d9d1770377478a9a20ba4a658bb1f70cf981084607a104a52f5125828a97c21e42be7e42227e93f1b7a1b83d8e4d20c0 WHIRLPOOL 73efc19fc1b0c99a41307d7b6bce1b188c869e7cf5fbc25c8bc0a027894591163762796ed7ce0a29a87e89b1c1aff664a97383facb80e35ccf56b41e5ca2adc2
 MISC metadata.xml 247 SHA256 fb925313d1ae70feaa6db91150f34a2157b48e884e8f47d773640af149e3744b SHA512 96c55c2979dd6a4c4761fce9b5a0be387b11fcf197ef903d8680ae82f01a2caea93b1238bed1ac96d3eb250744e2149a507e0424ac017b4324f0806a54e72c4a WHIRLPOOL 142b4295733faec48b0ca9eb6d3561799ff743481aabf2b74ecf6d717d972b4961979c7b6bf32b9840cb34e47d22fe2befb9b0ef8ec0d3f28f6416069128d3c7
diff --git a/net-misc/geomyidae/geomyidae-0.26.3.ebuild b/net-misc/geomyidae/geomyidae-0.26.3.ebuild
deleted file mode 100644
index f6c4c90a5a2d..000000000000
--- a/net-misc/geomyidae/geomyidae-0.26.3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs user
-
-DESCRIPTION="A daemon to serve the gopher protocol"
-HOMEPAGE="http://r-36.net/src/geomyidae/"
-SRC_URI="http://r-36.net/src/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-
-pkg_setup(){
-	enewgroup gopherd
-	enewuser gopherd -1 -1 /var/gopher gopherd
-}
-
-src_prepare() {
-	# enable verbose build
-	# drop -O. from CFLAGS
-	sed -i \
-		-e 's/@${CC}/${CC}/g' \
-		-e '/CFLAGS/s/-O. //' \
-		Makefile || die 'sed on Makefile failed'
-
-	epatch_user
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	dosbin ${PN}
-
-	newinitd rc.d/Gentoo.init.d ${PN}
-	newconfd rc.d/Gentoo.conf.d ${PN}
-
-	insinto /var/gopher
-	doins index.gph
-	fowners -R root.gopherd /var/gopher
-	fperms -R g=rX,o=rX /var/gopher
-
-	doman ${PN}.8
-	dodoc CGI README
-}
diff --git a/net-misc/geomyidae/geomyidae-0.26.2.ebuild b/net-misc/geomyidae/geomyidae-0.29.ebuild
index f6c4c90a5a2d..57dec0d5956e 100644
--- a/net-misc/geomyidae/geomyidae-0.26.2.ebuild
+++ b/net-misc/geomyidae/geomyidae-0.29.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-inherit eutils toolchain-funcs user
+inherit toolchain-funcs user
 
 DESCRIPTION="A daemon to serve the gopher protocol"
-HOMEPAGE="http://r-36.net/src/geomyidae/"
-SRC_URI="http://r-36.net/src/${PN}/${P}.tar.gz"
+HOMEPAGE="http://git.r-36.net/geomyidae/"
+SRC_URI="http://git.r-36.net/geomyidae/snapshot/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
@@ -25,8 +25,15 @@ src_prepare() {
 		-e 's/@${CC}/${CC}/g' \
 		-e '/CFLAGS/s/-O. //' \
 		Makefile || die 'sed on Makefile failed'
+	# fix for correctly start/stop daemon
+	# fix path for pid file
+	sed -i \
+		-e 's:start-stop-daemon -Sb:start-stop-daemon -Sbm:' \
+		-e 's:start-stop-daemon -S -p:start-stop-daemon -K -p:' \
+		-e 's:/var/run:/run:g' \
+		rc.d/Gentoo.init.d || die
 
-	epatch_user
+	eapply_user
 }
 
 src_compile() {
diff --git a/net-misc/nextcloud-client/Manifest b/net-misc/nextcloud-client/Manifest
index 8ed2407740d6..9f6c12aa0e77 100644
--- a/net-misc/nextcloud-client/Manifest
+++ b/net-misc/nextcloud-client/Manifest
@@ -1,8 +1,5 @@
-DIST nextcloud-client-2.3.1.tar.gz 654810 SHA256 5fc6f9f981d68110982ab006cdf9d68caa0c59015e57f4491b9a705fb6c83dd6 SHA512 f8210c8cc08e0bfb80e63b18af305c2a8e2309f673caca5bc748c130d960d444ab2db3fad3e43dbfffbe072748c85e15a50d0ebe1fd491dec7553ac8d9552cfe WHIRLPOOL 5a38a708647758ddb54d7d47dd30a71e59b03c3c45e6cfd9ac218c013da9dfc56d07b247982056f58e083d82c138576679525d994665717c739cc9f5cdd0238b
 DIST nextcloud-client-2.3.2.tar.gz 671944 SHA256 fbebbcfc538654d7a5373062d2165638a9bd9e5dbe62b5f4552a942b0b931617 SHA512 0447a3e5ee3338cb98b9d503a94d32c926f9092a25fee11e3686e5d662362137dce09865350cdc3c9af62ac8a6ebfa7fcd00f817edbb10189512a6df8e587628 WHIRLPOOL f5bf0526ffad6eb12be7169f8b61b35be31e01b44bb5fee4ab03c5d3449e3e30496719cc4f84c587b62a0638d99a70fd2fa1723231f6f7fa9c7ba80d095daeec
-DIST owncloudclient-2.3.1.tar.xz 12260696 SHA256 93143752234a0bc4c9798b69d8239996d92130eecdc1d93b75e3d49b899f3914 SHA512 2dec3d4b452faca32e15c1a461d3fec97fc1c2e85bbfe2cb02035371a5426b8458be1382ed6b4a1102a4f38241580c3d49980ea388344365297a4a84f8dc9add WHIRLPOOL 49abeb9b9843a024338cd2d7c3a87625f7cd4f832db03513dc4d7b0d5d1908a5691d6f1e7b7437175084c30a5e3e18d837785afa5647971fdcb8e963db2d54b5
 DIST owncloudclient-2.3.2.tar.xz 12266008 SHA256 a1199d2b957a28081aff11a2a7e471ca09c965bbb1b51b1b7b7a8706304f5f09 SHA512 8abe071c28b365c100eb30ed91610640a25a7385f4347f5527289f4664788bda375e9618396ffa3e441c7e473da55bdaf7a5cdd99c8fd5801de78cb945fabb9c WHIRLPOOL 099c963940b6fec67d5d14b8d3a62eaf378617a7e8a73ca9b82c6f82451a6e80a6da4f0f0ea44e6064d5fceada68f6e1591e499e3ea2f6dfe14c6e0efa01537a
-EBUILD nextcloud-client-2.3.1-r2.ebuild 2474 SHA256 f5c397e9512b17f80b9b0466dba8294605290248046c69f8d85dca1fe37bffd6 SHA512 8cad340d97bee8bc20d3d49a8796ab0da92689487dbf5fb0e2d39a24df5cc599f807661b142650b3fd80bf23581e23fe3710f5b6a62711f3fe2f5eebd4ea49ba WHIRLPOOL 6f5365e1ce5245f0a2bdbfd30452bd4a39e382761e2d8131ec9492f11a4b807c29329131c108f0644b77e9aeda179b2f2cb2ccb674e7c7501cc2bf809ea707fd
-EBUILD nextcloud-client-2.3.2.ebuild 2492 SHA256 b8dbcae35054dcb20c939c644c7ef691c59b5a527167b4e8303201d15934cb7d SHA512 511bb30b06975fc585eaac6ad50581689997a9b9575aaf35dec607ed35211f43d207abfecd1c0eed1fae5bcffc037cdcc9c3b3bffd2a814d4a00d90785dd2fc6 WHIRLPOOL f00ca0209ef1f19e37c1cf1dda18c4f7b33dc090351393a96e0c0a744b2dc5ca8a08fb1abcb67ef1dd430af1aa1193a59d1c142b3c682bba353545a96b6812ce
+EBUILD nextcloud-client-2.3.2-r1.ebuild 2508 SHA256 861cb056714c91c79b3a1f692418c4f397dd854236114bb5637d47f5d8aaaa72 SHA512 563c8391302c808bdc1f513882be4e876533a1dba958c20f33a1fa76ed05375ef5e4d57e902a2c817335e18d226bbbff89ca05e20a5c7d7f6cb605861a17ca45 WHIRLPOOL 05731be35a47719611588f0d4979d883a73c4c4fa9b06514726b0863fdfbc2fd817fbc144765bc2e3419ce3476bef2d82d0479ebae6ccd997f1bfd19750a3292
 MISC ChangeLog 1236 SHA256 eb0a61a70ba44c3ed03b635747bb00f7aa58a9a6dbf5b0e5b443b5678cc40be7 SHA512 d9545757f9886ac6d9b879c65dfe03964953f63abecf552cfa2390f346fe149993824c8688c428f0163d9f724a5d78a85f3cf3048a2b54f5927236ff188c6884 WHIRLPOOL 817122fc1fdcd790fd67625a6d6637532ad400795d6cabaf6b9b3f527277c867e8e7435e69ab0dac888a4f131e1d48958de6045fcd8b205a6003007413eb9f6f
 MISC metadata.xml 684 SHA256 40590dbeba611ac96fab673d198b0a6843d3b0dceecaf00e1a01171af72ed14b SHA512 914f49b010493ae3019d678fcaf92e2d41a2cdd7cee3b7041db7a65a8c122dba81fc3e6df237201d6a69b8755768fee5b65fb9df83c977449a48eb5fc1479b29 WHIRLPOOL 63ad89fc1c3fdcf6cbeca2bb243dc841f292cac37cf80c2e27c14ab7e14ad1899b89b59b1e81def7f211995c4bffdfa2eb91ea892b91a5bd85149c7898ddf746
diff --git a/net-misc/nextcloud-client/nextcloud-client-2.3.1-r2.ebuild b/net-misc/nextcloud-client/nextcloud-client-2.3.1-r2.ebuild
deleted file mode 100644
index 01e8d34e1547..000000000000
--- a/net-misc/nextcloud-client/nextcloud-client-2.3.1-r2.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Nextcloud themed desktop client"
-HOMEPAGE="https://github.com/nextcloud/client_theming"
-SRC_URI="http://download.owncloud.com/desktop/stable/owncloudclient-${PV}.tar.xz
-	https://github.com/nextcloud/client_theming/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="CC-BY-3.0 GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc dolphin nautilus samba +sftp shibboleth test"
-
-COMMON_DEPEND=">=dev-db/sqlite-3.4:3
-	dev-libs/qtkeychain[qt5(+)]
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtsql:5
-	dev-qt/qtwidgets:5
-	sys-fs/inotify-tools
-	virtual/libiconv
-	dolphin? (
-		kde-frameworks/kcoreaddons:5
-		kde-frameworks/kio:5
-	)
-	nautilus? ( dev-python/nautilus-python )
-	samba? ( >=net-fs/samba-3.5 )
-	sftp? ( >=net-libs/libssh-0.5 )
-	shibboleth? ( dev-qt/qtwebkit:5 )
-"
-RDEPEND="${COMMON_DEPEND}
-	!net-misc/ocsync
-	!net-misc/owncloud-client
-"
-DEPEND="${COMMON_DEPEND}
-	dev-qt/linguist-tools:5
-	doc? (
-		dev-python/sphinx
-		dev-texlive/texlive-latexextra
-		virtual/latex-base
-	)
-	dolphin? ( kde-frameworks/extra-cmake-modules )
-	test? (
-		dev-util/cmocka
-		dev-qt/qttest:5
-	)
-"
-
-S=${WORKDIR}/client_theming-${PV}
-
-src_unpack() {
-	default
-
-	rmdir "${S}"/client || die
-	mv "${WORKDIR}"/owncloudclient-${PV} "${S}"/client \
-		|| die
-}
-
-src_prepare() {
-	CMAKE_USE_DIR="${S}"/client
-	# Keep tests in ${T}
-	sed -i -e "s#\"/tmp#\"${T}#g" client/test/test*.cpp || die
-	# Fix icon name
-	sed -e "/^Icon.*=/s/@APPLICATION_EXECUTABLE@/Nextcloud/" \
-		-i client/mirall.desktop.in || die
-
-	if ! use nautilus; then
-		pushd client/shell_integration > /dev/null || die
-		cmake_comment_add_subdirectory nautilus
-		popd > /dev/null || die
-	fi
-
-	default
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
-		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
-		-DWITH_ICONV=ON
-		-DWITH_DOC=$(usex doc)
-		-DCMAKE_DISABLE_FIND_PACKAGE_KF5=$(usex !dolphin)
-		-DBUILD_WITH_QT4=OFF
-		-DCMAKE_DISABLE_FIND_PACKAGE_Libsmbclient=$(usex !samba)
-		-DCMAKE_DISABLE_FIND_PACKAGE_LibSSH=$(usex !sftp)
-		-DNO_SHIBBOLETH=$(usex !shibboleth)
-		-DUNIT_TESTING=$(usex test)
-		-DOEM_THEME_DIR="${S}"/nextcloudtheme
-	)
-
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	if ! use doc ; then
-		elog "Documentation and man pages not installed"
-		elog "Enable doc USE-flag to generate them"
-	fi
-}
diff --git a/net-misc/nextcloud-client/nextcloud-client-2.3.2.ebuild b/net-misc/nextcloud-client/nextcloud-client-2.3.2-r1.ebuild
index 67f8b9ea2be2..cdb6c39811b5 100644
--- a/net-misc/nextcloud-client/nextcloud-client-2.3.2.ebuild
+++ b/net-misc/nextcloud-client/nextcloud-client-2.3.2-r1.ebuild
@@ -24,6 +24,7 @@ COMMON_DEPEND=">=dev-db/sqlite-3.4:3
 	dev-qt/qtnetwork:5[ssl]
 	dev-qt/qtsql:5
 	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
 	sys-fs/inotify-tools
 	virtual/libiconv
 	dolphin? (
diff --git a/net-misc/owncloud-client/Manifest b/net-misc/owncloud-client/Manifest
index 47dfeaa5048b..eacf30e03f3f 100644
--- a/net-misc/owncloud-client/Manifest
+++ b/net-misc/owncloud-client/Manifest
@@ -1,9 +1,7 @@
-DIST owncloudclient-2.3.1.tar.xz 12260696 SHA256 93143752234a0bc4c9798b69d8239996d92130eecdc1d93b75e3d49b899f3914 SHA512 2dec3d4b452faca32e15c1a461d3fec97fc1c2e85bbfe2cb02035371a5426b8458be1382ed6b4a1102a4f38241580c3d49980ea388344365297a4a84f8dc9add WHIRLPOOL 49abeb9b9843a024338cd2d7c3a87625f7cd4f832db03513dc4d7b0d5d1908a5691d6f1e7b7437175084c30a5e3e18d837785afa5647971fdcb8e963db2d54b5
 DIST owncloudclient-2.3.2.tar.xz 12266008 SHA256 a1199d2b957a28081aff11a2a7e471ca09c965bbb1b51b1b7b7a8706304f5f09 SHA512 8abe071c28b365c100eb30ed91610640a25a7385f4347f5527289f4664788bda375e9618396ffa3e441c7e473da55bdaf7a5cdd99c8fd5801de78cb945fabb9c WHIRLPOOL 099c963940b6fec67d5d14b8d3a62eaf378617a7e8a73ca9b82c6f82451a6e80a6da4f0f0ea44e6064d5fceada68f6e1591e499e3ea2f6dfe14c6e0efa01537a
 DIST owncloudclient-2.3.3.tar.xz 33801712 SHA256 aac1bbc16629041795ebb67151abfe109b0c220161e1f7a3f431311e2c6dade4 SHA512 8cbffd4fdd4bd3bbbfb947498ec9bfbaceac3966ac29d61dea3db82405976230c1067c3a3afc9ddc4ce152c69c530ad44be154615a391f63524dc2fb40d5e5d2 WHIRLPOOL bbfb895d9724868c941fa178f6d350f0091254aad0552c73f78d30daa199dacfe8068e1a94d07349b1c3f355712eb2c1f12e06877466dc56260180489d8b2ec2
-EBUILD owncloud-client-2.3.1.ebuild 1990 SHA256 4eb4d5662a4ccb493bd4605bc53f18e6e07f434f947c0e01844a25850f7a1c7c SHA512 ca3e03abbfbf9a8e36d78790899d9e73df5961153754f548ab5cd54709f3c3c53a3145b9e1fc903bf718d1f1ed07d7d0a2cf12a2928ad6a35c62ad5fa2ee928f WHIRLPOOL d779b0b2c7c2c3716efcfdd0b1a6e13496bc48bd1560c3de6f21dfdfc3ac8dce1a05a61db7327fa42c986617044956a42cfcab022562e763d82415ed00a3dee6
-EBUILD owncloud-client-2.3.2-r1.ebuild 2075 SHA256 98bd702df9e1b9ec409b636946182481a77ff9f0493f5a558fa1eb4e0849cc9a SHA512 753debe97f113725fb94db37e60a370fdbdf25c790b78ba576d1f2cdd2dff5e41dd883ab67eb3ee3796af70c103aeb267e81b34f03947bccbd3a4384f440cd26 WHIRLPOOL 62b3ffe4fd5263f1e3fb385465f0677621478602f8385a22a961b0f2b4f630bb238c78365222e7883be42386c4655036a157dbcf0a700c79de4282d0618533c7
-EBUILD owncloud-client-2.3.3.ebuild 2093 SHA256 1884c9cda7c7ddc83dd1d451ae5ba9ca27ea28b1cbdede1fc62ab785172e4741 SHA512 d9122c03b40f780d5efc866adc4ecfc77767f3f0bbfc06276c38b8e9d54b6ec5198f4f046c162584a2edb728b509af9548ad280dcf15eac9d01f80491afcaa6f WHIRLPOOL a6ca2673763dff323b2d3656322246d0fa2f026b01964d3755b0148323378bb50f7bf3393ba013cad2335664357e32b8410d678dcd3a3ab6cc274ec142c3b9ff
+EBUILD owncloud-client-2.3.2-r2.ebuild 2091 SHA256 3b5a3cc722a96070fe3faacbeabd0a31cc42c3f72fc6934b5f272c87512be178 SHA512 2932984e45006b625032674bf5d38d2b3f8decdd70f6c3a307492fc9cafbdf197b03388189d25c7fb848fa019470aa7cd5d65957a01b8ffd0ece20b0c88b5d00 WHIRLPOOL 4b8e9aca566c775046052f9c6bded020965b367fbbc9a6c3ab86984833a1d49d39880dacaae30dcbcb26e5038208916a3f891f7a51dfa01bca28a2086c71154a
+EBUILD owncloud-client-2.3.3-r1.ebuild 2109 SHA256 c3edd1a597c3a1bcec1076b5aac6ef0471b7231698f65bbc0c4ee0ae873c5db4 SHA512 3723864eddf5fb24d52c778287ed68c5d8f262dd4358bfc484307af5267cfdcd0a89de2d2a48d8dd3cdecffb797a5fd190cd852cad0a372f55eaa0b02bc1b88a WHIRLPOOL 2fce84d49792c495e38a7bbed29726bd6eb7ea9e5d46f78fae1d92adef3e8a1e657338c3aed6858aea23e87b7a8432c2a7d1c11126d20da33529811931332ce4
 MISC ChangeLog 6990 SHA256 3fe0fff70b8b24b3b5321a1720175c42f87de6d5a870329421e3f91838701d51 SHA512 890741b1efe2f672f17541e959be5924b7bf6a82802f6b79db950569bd892ccc65e352a479973322582889aa2829a0e70d9376e466cb594fa2ebc1097dad362e WHIRLPOOL e4b11e5eef0d97edd114407da52a317bc5115000899031bbe7f38ecfc9fd9916b5ae27661b28e597db0679c7aeab6b2a1f026bc0a77369bc5881638dafecc155
 MISC ChangeLog-2015 10097 SHA256 673578e906e89dac0261e0ddf19c7e75826c7279aad31055a31442bfc41b4d97 SHA512 10a22ef76af33e303a040d7b679e5cfc1cf55aaeba44d9af9b0baa6ec5a487c98ee2d1fe9fc3cb9b81573f04e53fb0817205e73891613d03204cf22b13e0aa98 WHIRLPOOL bbaf12ebee36097cb213298ae6602027b0e3a0459e6d6bf943e39c77b40e9d3a6e01f3f0e8a4f2eca7c5385b7cf817b47aa3228b73f2754403aa18bbed84e232
 MISC metadata.xml 595 SHA256 43f756c2fd8954f0dc2fbd6a329254c4c203a897488030153aa31ee94ff18dee SHA512 3c79d7e86cdd5451171bc649488559cb028dfafbda29e260bb92af2db3ae0c60a486c4643bbe8685b8499be07b51424223b57f8da6437eac948ede96dffc12cc WHIRLPOOL c53e446ffb0ee45385187e873a47ea10fd83cdbddba7a07a9d9e5d810a951364eea30cd06f2c63f3373184aef6f496c3634b83959901c508d53a25198e654506
diff --git a/net-misc/owncloud-client/owncloud-client-2.3.1.ebuild b/net-misc/owncloud-client/owncloud-client-2.3.1.ebuild
deleted file mode 100644
index 819a6751f1ca..000000000000
--- a/net-misc/owncloud-client/owncloud-client-2.3.1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Synchronize files from ownCloud Server with your computer"
-HOMEPAGE="http://owncloud.org/"
-SRC_URI="http://download.owncloud.com/desktop/stable/${P/-}.tar.xz"
-
-LICENSE="CC-BY-3.0 GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc dolphin nautilus samba +sftp test"
-
-COMMON_DEPEND=">=dev-db/sqlite-3.4:3
-	dev-libs/qtkeychain[qt5(+)]
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsql:5
-	dev-qt/qtwebkit:5
-	sys-fs/inotify-tools
-	virtual/libiconv
-	dolphin? (
-		kde-frameworks/kcoreaddons:5
-		kde-frameworks/kio:5
-	)
-	nautilus? ( dev-python/nautilus-python )
-	samba? ( >=net-fs/samba-3.5 )
-	sftp? ( >=net-libs/libssh-0.5 )
-"
-RDEPEND="${COMMON_DEPEND}
-	!net-misc/ocsync
-	!net-misc/nextcloud-client
-"
-DEPEND="${COMMON_DEPEND}
-	dev-qt/linguist-tools:5
-	doc? (
-		dev-python/sphinx
-		dev-texlive/texlive-latexextra
-		virtual/latex-base
-	)
-	dolphin? ( kde-frameworks/extra-cmake-modules )
-	test? (
-		dev-util/cmocka
-		dev-qt/qttest:5
-	)
-"
-
-S=${WORKDIR}/${P/-}
-
-src_prepare() {
-	# Keep tests in ${T}
-	sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die "sed failed"
-
-	if ! use nautilus; then
-		pushd shell_integration > /dev/null || die
-		cmake_comment_add_subdirectory nautilus
-		popd > /dev/null || die
-	fi
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
-		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
-		-DWITH_ICONV=ON
-		-DWITH_DOC=$(usex doc)
-		-DCMAKE_DISABLE_FIND_PACKAGE_KF5=$(usex !dolphin)
-		-DBUILD_WITH_QT4=OFF
-		-DCMAKE_DISABLE_FIND_PACKAGE_Libsmbclient=$(usex !samba)
-		-DCMAKE_DISABLE_FIND_PACKAGE_LibSSH=$(usex !sftp)
-		-DUNIT_TESTING=$(usex test)
-	)
-
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	if ! use doc ; then
-		elog "Documentation and man pages not installed"
-		elog "Enable doc USE-flag to generate them"
-	fi
-}
diff --git a/net-misc/owncloud-client/owncloud-client-2.3.2-r1.ebuild b/net-misc/owncloud-client/owncloud-client-2.3.2-r2.ebuild
index 26efb0fcf18f..6c54b7309917 100644
--- a/net-misc/owncloud-client/owncloud-client-2.3.2-r1.ebuild
+++ b/net-misc/owncloud-client/owncloud-client-2.3.2-r2.ebuild
@@ -23,6 +23,7 @@ COMMON_DEPEND=">=dev-db/sqlite-3.4:3
 	dev-qt/qtnetwork:5
 	dev-qt/qtsql:5
 	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
 	sys-fs/inotify-tools
 	virtual/libiconv
 	dolphin? (
diff --git a/net-misc/owncloud-client/owncloud-client-2.3.3.ebuild b/net-misc/owncloud-client/owncloud-client-2.3.3-r1.ebuild
index 4bce7edfa29f..4652bd7a7a88 100644
--- a/net-misc/owncloud-client/owncloud-client-2.3.3.ebuild
+++ b/net-misc/owncloud-client/owncloud-client-2.3.3-r1.ebuild
@@ -23,6 +23,7 @@ COMMON_DEPEND=">=dev-db/sqlite-3.4:3
 	dev-qt/qtnetwork:5
 	dev-qt/qtsql:5
 	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
 	sys-fs/inotify-tools
 	virtual/libiconv
 	dolphin? (