gentoo auto-resync : 22:11:2023 - 05:13:16

4 files changed, 101 insertions, 6 deletions

diff --git a/dev-cpp/libcmis/Manifest b/dev-cpp/libcmis/Manifest
index 5e10e8141633..f0cdf049fe37 100644
--- a/dev-cpp/libcmis/Manifest
+++ b/dev-cpp/libcmis/Manifest
@@ -1,6 +1,9 @@
 AUX libcmis-0.5.2-icu-64.2.patch 378 BLAKE2B 0c3bb956dc02c1b6100e59ef771c076071db5612bfd322314346c1595a6b115e51a65eee577af586d09ab8108b1eba1b90915c7cc01d1bf4d6bdb9c4fd11e2ac SHA512 0904a529eafa8e1cfdb673e4e7f37150b0b88886cdc32096a89153cb5856d16dc5fee52f39ae5bfea86065b20690a6e14e4b9ad11b36b682c062702b797e82cd
+AUX libcmis-0.6.2-libxml2-2.12.patch 762 BLAKE2B 1c63319f018b94e4c5609b7ae53faead48afd611613d2dca5b15ac67ef83546e4e7b70a9bb9eb6576697f85019d9358ae96cdd0a8bebbc09458aa2376e1f38a0 SHA512 06e9b18d1459858692c5cc07fb6243ba0ff6af475db6f8c8fd5c7f96ca086222ecfc36043a4bb0e27e3fbce671a12d0f852dd69d6473675ea637db21bc99a66f
 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
+DIST libcmis-0.6.2.tar.gz 296218 BLAKE2B faad99e09b2721cd56b0d47d2a9589e06222ee7881006e936d0943d5e8afc588fcda721ef282ad7d55c785407a9885c90cbce1d172ca012c4a13cc51da0c15b6 SHA512 a75a69623f34149c39c382c357396b8dd719d589a78424fc3b5d9de84ffbf3f889bcaaed9a01f91b491a507c189347d3d9252db238fddbb522ff8ba9ce7b5ade
 EBUILD libcmis-0.5.2-r2.ebuild 1478 BLAKE2B 6d04f600fda81335ab75c1b3a8b67b4d22d5633cb03a7c72e1ae06e29a73268737de11e89066c51d81c8c2757d736c5a53012f605ba0b690b1c735372a92a0f8 SHA512 062157b8ff34854051dc15ccd5e3cc287e53d571c8247abde603e9157cd555b1b2792e261077ed04ae22ea411114a2f107f2fa755a5318f90abb456ec174ae1f
-EBUILD libcmis-9999.ebuild 1103 BLAKE2B 3dea8a9976e8ed70033541cf3485e91053a420b8ca2c1d07e14f4b4c18459aa445709042a2ff5ed4ed840940c869140a7efab549360956b452a763fe3ed6bc08 SHA512 3f867b5e127d6bfcd5b3c2a6e04a8647600d285c21ec3cdd4c74483bf618b21961ed244a74341b204f228114ebf255f55c77180eeb7e437ab49b5a0dc910b752
+EBUILD libcmis-0.6.2.ebuild 1205 BLAKE2B 3ff54bc0836421fed41a748e6b4c80d746ce2e985afe200ff3899d1724c33a8f36196028437f2b33d44e35356db5e0a941ea7e66581a86a37b6f34ce5980e530 SHA512 6b16b53001ac5a0b1923afd745d27b0f792b445092b9eb2c82f09856ce48ebb9203da504b9b058ac578c4a6131178668fd25ba5effb08a0f50e2426629d1446d
+EBUILD libcmis-9999.ebuild 1100 BLAKE2B 1eb20b6836ef2caed2f8bc6e0af59fed9257c4c0e930befc2f5e19dda96dfe408d3878a51d50390d98f27580ee2fc44e33290a309d192b6f992d8461ce40a637 SHA512 e7a7638e8035e76cec570ddb37bc77e2531e0dc53918205b72120b18dbeaa6bdf82f395ddf49eca0c25c8e2930a1bcc996cccaf6be3bb57202e6af68be6b222e
 MISC metadata.xml 426 BLAKE2B 182f7dffcb4df586fdf436512fdff32b98308711021e4a307c3c61262c5e68495da7d4ce833695bec7ea3f098e20fa067817895e7b4420ec19b920b249318527 SHA512 10ed11b843ba2c39fcd0519997fec47647bb45eabd0b5f6df0994748c0fb876216e7f451851dbe84a112468a7d6b38c5608c7ac7ada2ee08549ab1801ce81cc8
diff --git a/dev-cpp/libcmis/files/libcmis-0.6.2-libxml2-2.12.patch b/dev-cpp/libcmis/files/libcmis-0.6.2-libxml2-2.12.patch
new file mode 100644
index 000000000000..a00fb863dcb5
--- /dev/null
+++ b/dev-cpp/libcmis/files/libcmis-0.6.2-libxml2-2.12.patch
@@ -0,0 +1,26 @@
+From 72618e63433c7243e4d9e79a638f19a09402eecc Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Tue, 21 Nov 2023 23:10:07 +0100
+Subject: [PATCH] Fix build with libxml2-2.12 (missing include)
+
+See also: https://github.com/tdf/libcmis/issues/51
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ inc/libcmis/xml-utils.hxx | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/inc/libcmis/xml-utils.hxx b/inc/libcmis/xml-utils.hxx
+index 929385e..9bd99ae 100644
+--- a/inc/libcmis/xml-utils.hxx
++++ b/inc/libcmis/xml-utils.hxx
+@@ -34,6 +34,7 @@
+ #include <string>
+ 
+ #include <boost/date_time.hpp>
++#include <libxml/parser.h>
+ #include <libxml/tree.h>
+ #include <libxml/xpathInternals.h>
+ #include <libxml/xmlwriter.h>
+-- 
+2.43.0
+
diff --git a/dev-cpp/libcmis/libcmis-0.6.2.ebuild b/dev-cpp/libcmis/libcmis-0.6.2.ebuild
new file mode 100644
index 000000000000..6c8abf60f12d
--- /dev/null
+++ b/dev-cpp/libcmis/libcmis-0.6.2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2023 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"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~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/0.6"
+IUSE="man test tools"
+
+RESTRICT="test"
+
+DEPEND="
+	dev-libs/boost:=
+	dev-libs/libxml2
+	net-misc/curl
+"
+RDEPEND="${DEPEND}
+	!dev-cpp/libcmis:0.5
+"
+BDEPEND="
+	virtual/pkgconfig
+	man? (
+		app-text/docbook2X
+		dev-libs/libxslt
+	)
+	test? (
+		dev-util/cppcheck
+		dev-util/cppunit
+	)
+"
+
+# https://github.com/tdf/libcmis/pull/52
+PATCHES=( "${FILESDIR}/${P}-libxml2-2.12.patch" ) # bug 917523
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--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 10de5182674b..1d4b60e4cd0e 100644
--- a/dev-cpp/libcmis/libcmis-9999.ebuild
+++ b/dev-cpp/libcmis/libcmis-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -8,7 +8,7 @@ if [[ ${PV} == *9999* ]]; then
 	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"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 fi
 inherit autotools
 
@@ -16,7 +16,7 @@ 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"
+SLOT="0/0.6"
 IUSE="man test tools"
 
 RESTRICT="test"
@@ -26,7 +26,9 @@ DEPEND="
 	dev-libs/libxml2
 	net-misc/curl
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	!dev-cpp/libcmis:0.5
+"
 BDEPEND="
 	virtual/pkgconfig
 	man? (
@@ -46,7 +48,6 @@ src_prepare() {
 
 src_configure() {
 	local myeconfargs=(
-		--program-suffix=-$(ver_cut 1-2)
 		--disable-werror
 		$(use_with man)
 		$(use_enable test tests)