gentoo auto-resync : 27:12:2022 - 02:09:02

3 files changed, 84 insertions, 17 deletions

diff --git a/dev-cpp/libcmis/Manifest b/dev-cpp/libcmis/Manifest
index e2a3911be6cb..16a63d2b9dc3 100644
--- a/dev-cpp/libcmis/Manifest
+++ b/dev-cpp/libcmis/Manifest
@@ -1,5 +1,7 @@
 AUX libcmis-0.5.2-icu-64.2.patch 378 BLAKE2B 0c3bb956dc02c1b6100e59ef771c076071db5612bfd322314346c1595a6b115e51a65eee577af586d09ab8108b1eba1b90915c7cc01d1bf4d6bdb9c4fd11e2ac SHA512 0904a529eafa8e1cfdb673e4e7f37150b0b88886cdc32096a89153cb5856d16dc5fee52f39ae5bfea86065b20690a6e14e4b9ad11b36b682c062702b797e82cd
+DIST libcmis-0.5.2-patchset.tar.xz 16632 BLAKE2B 0a9802955059214428e7c2d6171093b171e47899de05404ee462bbf2c68c808927759a0808d79aa3aa9c8b9cd1a60b55686f7596b121701704a2d9720d6a8ba8 SHA512 bca4cc908e5510a9f597d6f1b560b3bbfdcda185b79d21320c6e3f7e5c559b7dda375407dfd6f05420b6f4edd666f6e7e70b7b72808506acc22fdfdab344f52c
 DIST libcmis-0.5.2.tar.gz 295020 BLAKE2B 325eacedd87eb1888a439c727a648c5aeb8d58c9b80add9761ffc55381193b71b589865d13ecd55177faafa935642685001f60456c1354e037989b29e9451c05 SHA512 45d8cd6d420a9593b46e1f2d6fbf384ea248cb218b0db6326ee2f082ff29100b65a2cc999ccb849e61df4f4ed7c3721b09addc6c322ef03c6c93f8c0acc02bde
 EBUILD libcmis-0.5.2-r1.ebuild 1248 BLAKE2B b922f3f944c46762358076c4ad130693548e3b5f74d7fbd1b7384cb6d0825a0b4b0999ab8102bde5895a59ffe75c6548375a4cef9b12b0d2f5637e66a20d0536 SHA512 fa588428663bd13e149aa37d0a439de92d8204dc451000f0ce3aaf1bdf30a2ca9e3213775566c861fa57bc7744782c8535cb83860a530b41a68a72f5be32f84a
-EBUILD libcmis-9999.ebuild 1204 BLAKE2B 2018f33948625f81d784220066bd0f15c151af2ba6272807feed94326b23a537f5022a7f01d716cc2ced77ab53a9e7941fedfc709ec06b20151f7606d4d8f000 SHA512 95f1372f36598cac25c4831db6f9fa3c87e2009851062e8a6e731e9ab400bebc4fa7a83e3cc884979d8e4b9a1b4fec614ca5dff9e7522e1416da5843f4faba31
+EBUILD libcmis-0.5.2-r2.ebuild 1474 BLAKE2B e7dd8e3f86c060d83a47cfa509df064a8a70943e2b7877dbbe4b2d553def55ce40109aa62e6097192691888de08efbc2f78a726fa2d4a6a6ff0a68db1219b310 SHA512 367d89797eb15709bc10916a160696ef058d24da5fe4c5d251132dfb79ffeb32fc010d6079ae5640b61d30fc40d54b764659bd53f7d5683f4562d071a68c6fc0
+EBUILD libcmis-9999.ebuild 1103 BLAKE2B 3dea8a9976e8ed70033541cf3485e91053a420b8ca2c1d07e14f4b4c18459aa445709042a2ff5ed4ed840940c869140a7efab549360956b452a763fe3ed6bc08 SHA512 3f867b5e127d6bfcd5b3c2a6e04a8647600d285c21ec3cdd4c74483bf618b21961ed244a74341b204f228114ebf255f55c77180eeb7e437ab49b5a0dc910b752
 MISC metadata.xml 426 BLAKE2B 182f7dffcb4df586fdf436512fdff32b98308711021e4a307c3c61262c5e68495da7d4ce833695bec7ea3f098e20fa067817895e7b4420ec19b920b249318527 SHA512 10ed11b843ba2c39fcd0519997fec47647bb45eabd0b5f6df0994748c0fb876216e7f451851dbe84a112468a7d6b38c5608c7ac7ada2ee08549ab1801ce81cc8
diff --git a/dev-cpp/libcmis/libcmis-0.5.2-r2.ebuild b/dev-cpp/libcmis/libcmis-0.5.2-r2.ebuild
new file mode 100644
index 000000000000..51b24e07e554
--- /dev/null
+++ b/dev-cpp/libcmis/libcmis-0.5.2-r2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/tdf/libcmis.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/tdf/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~asturm/distfiles/${P}-patchset.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+fi
+inherit autotools
+
+DESCRIPTION="C++ client library for the CMIS interface"
+HOMEPAGE="https://github.com/tdf/libcmis"
+
+LICENSE="|| ( GPL-2 LGPL-2 MPL-1.1 )"
+SLOT="0.5"
+IUSE="man test tools"
+
+RESTRICT="test"
+
+DEPEND="
+	dev-libs/boost:=
+	dev-libs/libxml2
+	net-misc/curl
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	man? (
+		app-text/docbook2X
+		dev-libs/libxslt
+	)
+	test? (
+		dev-util/cppcheck
+		dev-util/cppunit
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-icu-64.2.patch" # bug 674414
+	"${WORKDIR}/${P}-patchset/${P}-fix-onedrive.patch"
+	"${WORKDIR}/${P}-patchset/${P}-gdrive-do-not-allow-copying.patch"
+	"${WORKDIR}/${P}-patchset/${P}-onedrive-do-not-allow-copying.patch"
+	"${WORKDIR}/${P}-patchset/${P}-fix-gdrive-onedrive.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--program-suffix=-$(ver_cut 1-2)
+		--disable-werror
+		$(use_with man)
+		$(use_enable test tests)
+		$(use_enable tools client)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-cpp/libcmis/libcmis-9999.ebuild b/dev-cpp/libcmis/libcmis-9999.ebuild
index 2cccc1fd0ee9..10de5182674b 100644
--- a/dev-cpp/libcmis/libcmis-9999.ebuild
+++ b/dev-cpp/libcmis/libcmis-9999.ebuild
@@ -1,25 +1,32 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-if [[ ${PV} = 9999 ]]; then
+if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/tdf/libcmis.git"
 	inherit git-r3
 else
 	SRC_URI="https://github.com/tdf/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 fi
-inherit autotools flag-o-matic
+inherit autotools
 
 DESCRIPTION="C++ client library for the CMIS interface"
 HOMEPAGE="https://github.com/tdf/libcmis"
 
 LICENSE="|| ( GPL-2 LGPL-2 MPL-1.1 )"
 SLOT="0.5"
+IUSE="man test tools"
 
-IUSE="man static-libs test tools"
+RESTRICT="test"
 
+DEPEND="
+	dev-libs/boost:=
+	dev-libs/libxml2
+	net-misc/curl
+"
+RDEPEND="${DEPEND}"
 BDEPEND="
 	virtual/pkgconfig
 	man? (
@@ -31,14 +38,6 @@ BDEPEND="
 		dev-util/cppunit
 	)
 "
-DEPEND="
-	dev-libs/boost:=
-	dev-libs/libxml2
-	net-misc/curl
-"
-RDEPEND="${DEPEND}"
-
-RESTRICT="test"
 
 src_prepare() {
 	default
@@ -46,14 +45,10 @@ src_prepare() {
 }
 
 src_configure() {
-	# bug 618778
-	append-cxxflags -std=c++14
-
 	local myeconfargs=(
 		--program-suffix=-$(ver_cut 1-2)
 		--disable-werror
 		$(use_with man)
-		$(use_enable static-libs static)
 		$(use_enable test tests)
 		$(use_enable tools client)
 	)