gentoo auto-resync : 01:02:2023 - 21:05:47

7 files changed, 29 insertions, 65 deletions

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 22fae711c79d..5308dcd627b4 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/owncloud-client/Manifest b/net-misc/owncloud-client/Manifest
index de3ce5227887..46f9c6a5c513 100644
--- a/net-misc/owncloud-client/Manifest
+++ b/net-misc/owncloud-client/Manifest
@@ -1,5 +1,7 @@
+AUX owncloud-client-3.1.0.9872-no_cmake_fetch.patch 893 BLAKE2B ae76eca7b84cb04147d7f38ab9a3b3029805267508dce721437f14722fe39e14ebc5e9a3e91efb68553ebcd21da622aec135a528d4892660d8d10be08b6a8d57 SHA512 e8a89809aea2ebbf39a7b7f8df0258b7d7f1f3fd7698fc0ec9e6269c20ab9dec744caef230fa5d7a850a0887938193014b29a583ac0bdfc311b3cff5ea482028
+DIST libregraphapi-1.0.1.tar.gz 105266 BLAKE2B b5122ca5bb757c58bba0f29eaf119685c0ed119a9a72951f4098d8180e5bf05332b36fa6c884ca29b0414051c9c6d6ca081e3c7eeb7b9810202f11c1a70c5190 SHA512 aaa710642c36b4038dc61e7df4fc904a82a2ab6c34da03c3f5328075e41ab319f6616866b7f9ae472ff256b421751f8f5ce7ce0a6d3451bda75cfa3b307df082
 DIST ownCloud-2.11.1.8946.tar.xz 5654496 BLAKE2B 6b5b82730460071ae590b35d653824f4e56d506d87929c5d4ebb31eef921d0cb0141a44d7f0c996b8d1afffa5874d3e4dda75feaba740e652df2939633475fcd SHA512 b44f72e22c539a731901d9c146f00edbf0a4dabb992d6cde06be1b50506d5bc4a8aa861c6ea0207eed72aaea8c8af8651ce07f9e9154e6e44ccdecdd27e35b75
 DIST ownCloud-3.1.0.9872.tar.xz 5682584 BLAKE2B 174ffd7d441883f61817a6ab63decdd0238b9eb05d4e9cf0d5d18e69e6d2b08ad7836f7396383888f6f7d2f0d1be740c58413cd876780dba12446c6918921a47 SHA512 ca64af7c6ece1f26778a58088fcceaa68cddf1856ad7f1f5f24ee85691c813aed58339690ded1d0c535c131b2cf0343a03fe53289914bf36fa5ad4034f223b3e
 EBUILD owncloud-client-2.11.1.8946.ebuild 1471 BLAKE2B 8b0bebeef3dff9609718def2874b50fc5b9dfc35dbf23566795e691adfc303f2a36e2aae339efc29a410816bd8c436cde16895e1da1076d5f8caffa964e54953 SHA512 7b0ee28e36695a373a029aad89d40c8eef5e0cc1cac3325e9f862bcb69effc1809d76258d4f6314c3bea72231c3b177233918e8c88f73a829f3e599170dabe2e
-EBUILD owncloud-client-3.1.0.9872.ebuild 1471 BLAKE2B 597269624c73b5da4dc90675dd72cc9cc33d7c3dce8bdda338a818586b0bffc6da9abef3ab68d4c028ab7af97bf1fb420ae9af368b538496a5d280db6ddc4436 SHA512 72e82d89c0cf3724b7ad09fe880a82f3b2832baf68260d8b9d83d2a66e3304e10a6d33ec1ba1e0abff89d529f8a1a97bf4efc68c6452eda83f8a9e6027ddae79
+EBUILD owncloud-client-3.1.0.9872.ebuild 1802 BLAKE2B 837d23e145b33fa51dfae3aeec7c697aa43dd0810168e74671ef5b10caed01bf9f9596fef58048b5c342f7baba297e45ba563a17a8318f48c81568983c8b0a45 SHA512 3f5698e9d8a8829cf24e9d97a19eb61c7a6808d83e64b058cb8bef6a0f16d97092b1f33029c31f7fc48e064112db6086fb119871c9a1fac612be5893af3b6ea0
 MISC metadata.xml 432 BLAKE2B 1009c05cb07872e37fa6f8113a0586840454e09e07a8c7c40c9c4f879577e3ba1d36a7832f0789ae77fe8b882f9ccc8d2346de40c13ea77cc1404e78e8b15e6d SHA512 9f1c221258a82d7b1e6311b51cdbd5a72ff9cf4c80fdc075b3219581cd008a6a83f4066868f014ed33640bbfad68a4f4504cd9efb65119dcd176d34dc07e6ee9
diff --git a/net-misc/owncloud-client/files/owncloud-client-3.1.0.9872-no_cmake_fetch.patch b/net-misc/owncloud-client/files/owncloud-client-3.1.0.9872-no_cmake_fetch.patch
new file mode 100644
index 000000000000..d9762292e881
--- /dev/null
+++ b/net-misc/owncloud-client/files/owncloud-client-3.1.0.9872-no_cmake_fetch.patch
@@ -0,0 +1,17 @@
+Index: ownCloud-3.1.0.9872/src/libsync/CMakeLists.txt
+--- ownCloud-3.1.0.9872/src/libsync/CMakeLists.txt.orig
++++ ownCloud-3.1.0.9872/src/libsync/CMakeLists.txt
+@@ -3,12 +3,7 @@ set(LibreGraphAPIVersion v0.13.2)
+ find_package(LibreGraphAPI QUIET)
+ if (NOT TARGET OpenAPI::LibreGraphAPI)
+     message(WARNING "Failed to find system OpenAPI::LibreGraphAPI: fetching ${LibreGraphAPIVersion}")
+-    include(FetchContent)
+-    FetchContent_Populate(LibreGraphAPISrc
+-                        QUIET
+-                        GIT_REPOSITORY https://github.com/owncloud/libre-graph-api-cpp-qt-client.git
+-                        GIT_TAG ${LibreGraphAPIVersion})
+-    add_subdirectory(${libregraphapisrc_SOURCE_DIR}/client ${libregraphapisrc_BINARY_DIR}/client EXCLUDE_FROM_ALL)
++    add_subdirectory(libregraphapisrc-src/client libregraphapisrc-src/client EXCLUDE_FROM_ALL)
+ endif()
+ 
+ set(libsync_SRCS
diff --git a/net-misc/owncloud-client/owncloud-client-3.1.0.9872.ebuild b/net-misc/owncloud-client/owncloud-client-3.1.0.9872.ebuild
index 1eed40954de2..76e9098aa16a 100644
--- a/net-misc/owncloud-client/owncloud-client-3.1.0.9872.ebuild
+++ b/net-misc/owncloud-client/owncloud-client-3.1.0.9872.ebuild
@@ -6,9 +6,12 @@ EAPI=8
 inherit cmake xdg
 
 MY_PN="ownCloud"
+REGRAPHAPI_PV="1.0.1"
 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"
+SRC_URI="https://download.owncloud.com/desktop/${MY_PN}/stable/${PV}/source/${MY_PN}-${PV}.tar.xz
+	https://github.com/owncloud/libre-graph-api-cpp-qt-client/archive/refs/tags/v${REGRAPHAPI_PV}.tar.gz
+		-> libregraphapi-${REGRAPHAPI_PV}.tar.gz"
 S=${WORKDIR}/${MY_PN}-${PV}
 
 LICENSE="CC-BY-3.0 GPL-2"
@@ -44,7 +47,12 @@ BDEPEND="
 	dev-qt/linguist-tools:5
 	kde-frameworks/extra-cmake-modules"
 
+PATCHES=( "${FILESDIR}"/${PN}-3.1.0.9872-no_cmake_fetch.patch )
+
 src_prepare() {
+	mv ../libre-graph-api-cpp-qt-client-${REGRAPHAPI_PV} \
+		src/libsync/libregraphapisrc-src || die
+
 	# Keep tests in ${T}
 	sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die
 
diff --git a/net-misc/sipp/Manifest b/net-misc/sipp/Manifest
index 74dbe56aa4ca..24da18ee0ca7 100644
--- a/net-misc/sipp/Manifest
+++ b/net-misc/sipp/Manifest
@@ -1,6 +1,3 @@
-AUX sipp-3.6.0-parallel-build.patch 309 BLAKE2B e5c790cae99c31ba4cc79800f2991787401865b41bc270ecb648a9534da0322ef0b0a4f029146c7fca013f295565bc18c8c424139782a42de779b75e775e3b3c SHA512 41b052b3612cc3cd4afbd0a1437a4502c27e3cd948d800a4229c99561a88d1dc488f1feb06aa68faae83d9acec0977e3f4be2b65fef4cd5c541e2b4a023a9ff1
-DIST sipp-3.6.0.tar.gz 1055201 BLAKE2B 48b431bfc33d3a03e6e972ef3ce184989afb12c7e0f20c6c3cf9b72ebcd65cb12cf4cab2b90e010d16e17b9bb4832f42915b104ea9bd1253242d304ab4f3cb32 SHA512 eecbc18a18558a3fbc4f7c841d1fc8bd5be4b0c5d2bb363a12faf730f3c6a0773a24f07dbf062e68baf1a93b21686fa09258d0e08b45b4f941eb5d573bb25c12
 DIST sipp-3.6.1.tar.gz 744407 BLAKE2B a201ecce624c15c51a66c3cb5ac467522755085419c2980b1f76340e7ffca5996516f34d7e52776a8aa0a2170ca2b7301030ecb50272a1c0a8e86aaf18a6de16 SHA512 58504c56ca0c14363fafc5d0598fd93857ef33cc5856f579a225fd0e38238f7d2c409127a18a368e22355cc3912758d4dba07bac7eaa3e8a0d2943ea5fdec602
-EBUILD sipp-3.6.0.ebuild 960 BLAKE2B 550163f90cd8fd1e4ad2df50ceb28865f1d04eca6e9fe1a0801994480ab05350e9f6de621adbda5935f0d1c07013be0ec9a3aec5150f4c3e18f2834f3af5be66 SHA512 5f843a13eb4c22b7032ad3945b1247b20396041ba114b9d6b73072f5378fa0a7c9ecf1eb864090fa7ada6dcd944dfa34555b897491b8c63eb0e029bea3c7215d
 EBUILD sipp-3.6.1-r1.ebuild 1146 BLAKE2B bad94a87d3d0f791d81fd81e30384497cb4ae7d6e61e969b67456db7dfbdd11e675072fc7d912b6306426e10dc6bfb1a2179bec3d50653d4ba5cafa3dbecb6f6 SHA512 0bccc850330609892e3c2200e6b181bbf58bb6c76394931fb7508e65fffeda554b3cdfb703835e87c64c79eae7395d4d8196421e82b82850618ee5720ebaeae0
 MISC metadata.xml 487 BLAKE2B a78cef4eea5698358a3f5a9272f427c45af6d3268f40ec15d074fe66cc53eddbf082452b74f84bd859ee93decc1afd90dc82c109d39027024f6111cb74d40684 SHA512 317ba183367cb851a6e3fd535038df2c0ed277f7e5e22fd025f61b9ccec7fe7d4e880e56f92fdfa25248d22808c1ebbe6e57524722f39b12ca2dfe2b52b18c53
diff --git a/net-misc/sipp/files/sipp-3.6.0-parallel-build.patch b/net-misc/sipp/files/sipp-3.6.0-parallel-build.patch
deleted file mode 100644
index 6521918339d2..000000000000
--- a/net-misc/sipp/files/sipp-3.6.0-parallel-build.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- sipp-3.6.0/Makefile.am.o	2019-12-22 10:40:37.766229344 +0200
-+++ sipp-3.6.0/Makefile.am	2019-12-22 10:42:09.006266083 +0200
-@@ -172,7 +172,7 @@
- 
- # Ensure that after a reconfigure the source is cleaned.
- .autoclean: Makefile
--	make clean
-+	$(MAKE) clean
- 	echo > .autoclean
- BUILT_SOURCES = .autoclean
- 
diff --git a/net-misc/sipp/sipp-3.6.0.ebuild b/net-misc/sipp/sipp-3.6.0.ebuild
deleted file mode 100644
index bc7ef82c8b22..000000000000
--- a/net-misc/sipp/sipp-3.6.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="A free Open Source test tool / traffic generator for the SIP protocol"
-HOMEPAGE="http://sipp.sourceforge.net/ https://github.com/SIPp/sipp/releases"
-SRC_URI="https://github.com/SIPp/sipp/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2 ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gsl +pcap sctp +ssl"
-
-PATCHES=( "${FILESDIR}/sipp-3.6.0-parallel-build.patch" )
-
-DEPEND="sys-libs/ncurses:=
-	gsl? ( sci-libs/gsl:= )
-	pcap? (
-		net-libs/libpcap
-		net-libs/libnet:1.1
-	)
-	ssl? ( dev-libs/openssl:= )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with gsl) \
-		$(use_with pcap) \
-		$(use_with sctp) \
-		$(use_with ssl openssl) \
-		--with-rtpstream
-}
-
-src_install() {
-	default
-
-	insinto /usr/share/${PN}
-	use pcap && doins pcap/*.pcap
-	dodoc CHANGES.md README.md
-}