gentoo auto-resync : 14:11:2022 - 00:49:44

4 files changed, 2 insertions, 167 deletions

diff --git a/net-misc/owncloud-client/Manifest b/net-misc/owncloud-client/Manifest
index a13661b20dc5..ae9435256ea1 100644
--- a/net-misc/owncloud-client/Manifest
+++ b/net-misc/owncloud-client/Manifest
@@ -1,8 +1,5 @@
-AUX owncloud-client-2.10.1.7389-gcc12.patch 4473 BLAKE2B 37f9cab6489618a2d6ae7d65e01a342b2996e7d4a1b6f534bffd8b12a309923c8ed9caec34448bf355f499f116831319d69dd0d8736d637fdce2fd54486f1465 SHA512 cc1fce953fd3cc25f9214701f172b34708668b993ae5678af9e8281d487e4bd67fdcb8937c51609bdb4343c1ee77677f58efed2f8dee8a34a4a16a40d9fdc330
-DIST ownCloud-2.10.0.6519.tar.xz 5791912 BLAKE2B 3cf02ef89a6af249ab8f9d1b0a4cc899fbb11f49bf47ffb0ce042442da984d8dbf49619cf3344cf1837f1f3437e70f6e6d302f4e4c67a7df5f547368be4252ba SHA512 ab1e8aebefa049a73c436325b3b6e1d03e9a74f93ab6e090adbc71ccdd1cf56297898f004b12312ebba82158f5c2e299d9d0b13c14e291b855dcf267bac490f2
-DIST ownCloud-2.10.1.7389.tar.xz 5598044 BLAKE2B 8558a8a7b7bd4b8a0685b703f0882d6b5619c4902217d40feb4cf5587555b9a85363c7f61834e4c85a84789142fca8c73910fce66544f491ec5968818c816605 SHA512 2a0893d48786b88f8210966a2b6b48f5bdada82818d4115e68ecc6c0c926ba62bc74df03c4ab35eb271aef2f3a43b36b1a6a115585efe3739fd4a6164f9c45a1
 DIST ownCloud-2.11.1.8438.tar.xz 5655380 BLAKE2B da34adafabfc8c2b0bbfdff99a81b56f2d2639b5168b2165a847a6d5a4efe4e86578984c0f0c20564d0978aab18bb1a62330539bdd137f608a5cfc3ff8d84cf0 SHA512 fe38471f62e7233a7ba04f7fd2c7c7231957e6927c39d0bcf3f6f77fd6cbb1223618bbf6a8cc5fa15de10a35c7f07f2f5df0e49acbc2af5fe9333cda2eb41c92
-EBUILD owncloud-client-2.10.0.6519.ebuild 1471 BLAKE2B 8b0bebeef3dff9609718def2874b50fc5b9dfc35dbf23566795e691adfc303f2a36e2aae339efc29a410816bd8c436cde16895e1da1076d5f8caffa964e54953 SHA512 7b0ee28e36695a373a029aad89d40c8eef5e0cc1cac3325e9f862bcb69effc1809d76258d4f6314c3bea72231c3b177233918e8c88f73a829f3e599170dabe2e
-EBUILD owncloud-client-2.10.1.7389.ebuild 1515 BLAKE2B f012098389bc74bf9606aa7f1ea2e41823449ee2b8b849450ddffb18229a90d8c22a69949840fab6ec337dc14f287a4c6459af0603fb165bcc0736062e2d74a5 SHA512 c4854f07a12d9d4399e1814cc90ba4a749cec1e72e4bdf2cb6eaf1b6029a912b1a55efa3897a717f0bfab4ef05f0637eea8deeb61597d030f06e1f432d0c2477
+DIST ownCloud-2.11.1.8946.tar.xz 5654496 BLAKE2B 6b5b82730460071ae590b35d653824f4e56d506d87929c5d4ebb31eef921d0cb0141a44d7f0c996b8d1afffa5874d3e4dda75feaba740e652df2939633475fcd SHA512 b44f72e22c539a731901d9c146f00edbf0a4dabb992d6cde06be1b50506d5bc4a8aa861c6ea0207eed72aaea8c8af8651ce07f9e9154e6e44ccdecdd27e35b75
 EBUILD owncloud-client-2.11.1.8438.ebuild 1471 BLAKE2B 8b0bebeef3dff9609718def2874b50fc5b9dfc35dbf23566795e691adfc303f2a36e2aae339efc29a410816bd8c436cde16895e1da1076d5f8caffa964e54953 SHA512 7b0ee28e36695a373a029aad89d40c8eef5e0cc1cac3325e9f862bcb69effc1809d76258d4f6314c3bea72231c3b177233918e8c88f73a829f3e599170dabe2e
+EBUILD owncloud-client-2.11.1.8946.ebuild 1471 BLAKE2B 8b0bebeef3dff9609718def2874b50fc5b9dfc35dbf23566795e691adfc303f2a36e2aae339efc29a410816bd8c436cde16895e1da1076d5f8caffa964e54953 SHA512 7b0ee28e36695a373a029aad89d40c8eef5e0cc1cac3325e9f862bcb69effc1809d76258d4f6314c3bea72231c3b177233918e8c88f73a829f3e599170dabe2e
 MISC metadata.xml 432 BLAKE2B 1009c05cb07872e37fa6f8113a0586840454e09e07a8c7c40c9c4f879577e3ba1d36a7832f0789ae77fe8b882f9ccc8d2346de40c13ea77cc1404e78e8b15e6d SHA512 9f1c221258a82d7b1e6311b51cdbd5a72ff9cf4c80fdc075b3219581cd008a6a83f4066868f014ed33640bbfad68a4f4504cd9efb65119dcd176d34dc07e6ee9
diff --git a/net-misc/owncloud-client/files/owncloud-client-2.10.1.7389-gcc12.patch b/net-misc/owncloud-client/files/owncloud-client-2.10.1.7389-gcc12.patch
deleted file mode 100644
index 31981415f887..000000000000
--- a/net-misc/owncloud-client/files/owncloud-client-2.10.1.7389-gcc12.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From c1e3bb8457d77619a1c31217716789e76fd06500 Mon Sep 17 00:00:00 2001
-From: Hannah von Reth <hannah.vonreth@owncloud.com>
-Date: Fri, 20 May 2022 11:19:59 +0200
-Subject: [PATCH] Fix build with gcc12
-
----
- src/common/asserts.h |  2 +-
- src/common/vfs.h     | 16 ++++++++--------
- 2 files changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/src/common/asserts.h b/src/common/asserts.h
-index 9f43c532a6d..5fa4b4da3e5 100644
---- a/src/common/asserts.h
-+++ b/src/common/asserts.h
-@@ -44,7 +44,7 @@
-     } else {                                                                                                                \
-     }
- 
--inline OC_REQUIRED_RESULT bool __OC_ENSURE(bool condition, const char *cond, const char *file, int line, const char *info)
-+OC_REQUIRED_RESULT inline bool __OC_ENSURE(bool condition, const char *cond, const char *file, int line, const char *info)
- {
-     if (Q_UNLIKELY(!condition)) {
-         OC_ASSERT_MSG("ENSURE: \"%s\" in file %s, line %d %s", cond, file, line, info);
-diff --git a/src/common/vfs.h b/src/common/vfs.h
-index 983c999106c..da04d7ed97d 100644
---- a/src/common/vfs.h
-+++ b/src/common/vfs.h
-@@ -162,17 +162,17 @@ class OCSYNC_EXPORT Vfs : public QObject
-     virtual bool isHydrating() const = 0;
- 
-     /// Create a new dehydrated placeholder. Called from PropagateDownload.
--    virtual OC_REQUIRED_RESULT Result<void, QString> createPlaceholder(const SyncFileItem &item) = 0;
-+    OC_REQUIRED_RESULT virtual Result<void, QString> createPlaceholder(const SyncFileItem &item) = 0;
- 
-     /** Discovery hook: even unchanged files may need UPDATE_METADATA.
-      *
-      * For instance cfapi vfs wants local hydrated non-placeholder files to
-      * become hydrated placeholder files.
-      */
--    virtual OC_REQUIRED_RESULT bool needsMetadataUpdate(const SyncFileItem &item) = 0;
-+    OC_REQUIRED_RESULT virtual bool needsMetadataUpdate(const SyncFileItem &item) = 0;
- 
-     /// Determine whether the file at the given absolute path is a dehydrated placeholder.
--    virtual OC_REQUIRED_RESULT bool isDehydratedPlaceholder(const QString &filePath) = 0;
-+    OC_REQUIRED_RESULT virtual bool isDehydratedPlaceholder(const QString &filePath) = 0;
- 
-     /** Similar to isDehydratedPlaceholder() but used from sync discovery.
-      *
-@@ -181,7 +181,7 @@ class OCSYNC_EXPORT Vfs : public QObject
-      *
-      * Returning true means that type was fully determined.
-      */
--    virtual OC_REQUIRED_RESULT bool statTypeVirtualFile(csync_file_stat_t *stat, void *stat_data) = 0;
-+    OC_REQUIRED_RESULT virtual bool statTypeVirtualFile(csync_file_stat_t *stat, void *stat_data) = 0;
- 
-     /** Sets the pin state for the item at a path.
-      *
-@@ -192,7 +192,7 @@ class OCSYNC_EXPORT Vfs : public QObject
-      *
-      * relFilePath is relative to the sync folder. Can be "" for root folder.
-      */
--    virtual OC_REQUIRED_RESULT bool setPinState(const QString &relFilePath, PinState state) = 0;
-+    OC_REQUIRED_RESULT virtual bool setPinState(const QString &relFilePath, PinState state) = 0;
- 
-     /** Returns the pin state of an item at a path.
-      *
-@@ -203,7 +203,7 @@ class OCSYNC_EXPORT Vfs : public QObject
-      *
-      * Returns none on retrieval error.
-      */
--    virtual OC_REQUIRED_RESULT Optional<PinState> pinState(const QString &relFilePath) = 0;
-+    OC_REQUIRED_RESULT virtual Optional<PinState> pinState(const QString &relFilePath) = 0;
- 
-     /** Returns availability status of an item at a path.
-      *
-@@ -212,7 +212,7 @@ class OCSYNC_EXPORT Vfs : public QObject
-      *
-      * folderPath is relative to the sync folder. Can be "" for root folder.
-      */
--    virtual OC_REQUIRED_RESULT AvailabilityResult availability(const QString &folderPath) = 0;
-+    OC_REQUIRED_RESULT virtual AvailabilityResult availability(const QString &folderPath) = 0;
- 
- public slots:
-     /** Update in-sync state based on SyncFileStatusTracker signal.
-@@ -240,7 +240,7 @@ public slots:
-      * If the remote metadata changes, the local placeholder's metadata should possibly
-      * change as well.
-      */
--    virtual OC_REQUIRED_RESULT Result<ConvertToPlaceholderResult, QString> updateMetadata(const SyncFileItem &item, const QString &filePath, const QString &replacesFile) = 0;
-+    OC_REQUIRED_RESULT virtual Result<ConvertToPlaceholderResult, QString> updateMetadata(const SyncFileItem &item, const QString &filePath, const QString &replacesFile) = 0;
- 
-     /** Setup the plugin for the folder.
-      *
diff --git a/net-misc/owncloud-client/owncloud-client-2.10.1.7389.ebuild b/net-misc/owncloud-client/owncloud-client-2.10.1.7389.ebuild
deleted file mode 100644
index c9f1b379477d..000000000000
--- a/net-misc/owncloud-client/owncloud-client-2.10.1.7389.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake xdg
-
-MY_PN="ownCloud"
-DESCRIPTION="Synchronize files from ownCloud Server with your computer"
-HOMEPAGE="https://owncloud.org/"
-SRC_URI="https://download.owncloud.com/desktop/${MY_PN}/stable/${PV}/source/${MY_PN}-${PV}.tar.xz"
-S=${WORKDIR}/${MY_PN}-${PV}
-
-LICENSE="CC-BY-3.0 GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="dolphin gnome-keyring nautilus test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-db/sqlite-3.4:3
-	dev-libs/qtkeychain[gnome-keyring?,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
-	dev-qt/qtxml:5
-	sys-fs/inotify-tools
-	dolphin? (
-		kde-frameworks/kcoreaddons:5
-		kde-frameworks/kio:5
-	)
-	nautilus? ( dev-python/nautilus-python )"
-
-DEPEND="${RDEPEND}
-	test? (
-		dev-util/cmocka
-		dev-qt/qttest:5
-	)"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	kde-frameworks/extra-cmake-modules"
-
-PATCHES=( "${FILESDIR}"/${P}-gcc12.patch )
-
-src_prepare() {
-	# Keep tests in ${T}
-	sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die
-
-	if ! use nautilus; then
-		pushd shell_integration > /dev/null || die
-		cmake_comment_add_subdirectory nautilus
-		popd > /dev/null || die
-	fi
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
-		-DBUILD_SHELL_INTEGRATION_DOLPHIN=$(usex dolphin)
-		-DBUILD_TESTING=$(usex test)
-	)
-
-	cmake_src_configure
-}
diff --git a/net-misc/owncloud-client/owncloud-client-2.10.0.6519.ebuild b/net-misc/owncloud-client/owncloud-client-2.11.1.8946.ebuild
index ef87f857f8d3..ef87f857f8d3 100644
--- a/net-misc/owncloud-client/owncloud-client-2.10.0.6519.ebuild
+++ b/net-misc/owncloud-client/owncloud-client-2.11.1.8946.ebuild