gentoo resync : 28.04.2019

5 files changed, 101 insertions, 21 deletions

diff --git a/dev-cpp/libcmis/Manifest b/dev-cpp/libcmis/Manifest
index 322580263011..c65bb9ffc563 100644
--- a/dev-cpp/libcmis/Manifest
+++ b/dev-cpp/libcmis/Manifest
@@ -1,4 +1,6 @@
+AUX libcmis-0.5.2-icu-64.2.patch 378 BLAKE2B 0c3bb956dc02c1b6100e59ef771c076071db5612bfd322314346c1595a6b115e51a65eee577af586d09ab8108b1eba1b90915c7cc01d1bf4d6bdb9c4fd11e2ac SHA512 0904a529eafa8e1cfdb673e4e7f37150b0b88886cdc32096a89153cb5856d16dc5fee52f39ae5bfea86065b20690a6e14e4b9ad11b36b682c062702b797e82cd
 DIST libcmis-0.5.2.tar.gz 295020 BLAKE2B 325eacedd87eb1888a439c727a648c5aeb8d58c9b80add9761ffc55381193b71b589865d13ecd55177faafa935642685001f60456c1354e037989b29e9451c05 SHA512 45d8cd6d420a9593b46e1f2d6fbf384ea248cb218b0db6326ee2f082ff29100b65a2cc999ccb849e61df4f4ed7c3721b09addc6c322ef03c6c93f8c0acc02bde
+EBUILD libcmis-0.5.2-r1.ebuild 1244 BLAKE2B a9683d29808ee2ac3ab918b1bd3ddcffd3100e7676649d7b1c7d80722a849c510901699ca15a639a4027898bb3cc6c8fe9afcc278137761e7758b86cc46a442c SHA512 5e11619a749158e56e87a5856b0b213afd67509c6a1a9a66031161eb06bf81bfc727e4e7bf44a221a275b2a3b76e9b4ef6662752896919c8f55bd9a1ff7b41c5
 EBUILD libcmis-0.5.2.ebuild 1179 BLAKE2B 0494be5eac19549e7893016a0e3093e58ff720ed0d471657513f82eb875a6aa5eba976b28b64e81ab945640c60afd30300a97531492df401773e8412e91b0abb SHA512 9193c38528178a608e4fc6ce74438d50bbe7a470d68b7a3db492e729c25837373d2fb73b1c74ead90e814fc1cac9a09e8af82b0992e0dfbb85664e6805702ac8
-EBUILD libcmis-9999.ebuild 1498 BLAKE2B ecc02d843a491f76b1dadf241e644c65b309142e60cf04190e33f787822d840fb263c75e509f683ed7535abed52d34b540236aa4374961f1e8b2c35447b0c718 SHA512 97b6b36f5b56553837ff08b00bac25ce68f33cc772ca0314079b78a8d7f6eb34c457b57ef1cb730fd4b10e8e624a72a072ebdc432b86dd6f708188817ce7bc51
-MISC metadata.xml 401 BLAKE2B 51ccbd2b64899189a740c498dee304fa62676b4673b22f5215e5e587925d74a3582f9a4206e47da42524f527cb1d36545d45c64c9a38b9783c65d2e923aba0b0 SHA512 b01b808fa630d2d02ef61b4f8e1d286c51108eb3e9120b687b8e2bdf012b05d70a32de1264c0699f9778d0cb9574b88ddd4df1cc428992c90780b4934973841b
+EBUILD libcmis-9999.ebuild 1197 BLAKE2B ce7e0e242844b6b2113ec13600f52691c6e1cf2bc3484809c9d7de875bb047f5a31976a6c7d67f2dcd71170be1e24a29948c2b5b30d7611cc94691fb51de5c10 SHA512 2c998193bf07a5d93f78d715c431283ef054cfca7b035e2ebd8110add4ec968ef57bfe635287177aaced49e92c7dc4a0ce83dc5612ba4454edaa5718b04e178a
+MISC metadata.xml 479 BLAKE2B fd8a30e8f39c1455e1dc8c14b32a74012db73dfd66b6f44a025bfebc950b65e8f94c52bff16542f50b4e3d9a1daf6e34fc24f6274c4aed6914bdfea29b542949 SHA512 612413c8d2f4a64e5021710796c465b5b9e44a54bee4d551755d520b934cccb8e6aa488d1156c66db41504d0c53b24a9b92cfffcf62d863b86a1cdfee0768e73
diff --git a/dev-cpp/libcmis/files/libcmis-0.5.2-icu-64.2.patch b/dev-cpp/libcmis/files/libcmis-0.5.2-icu-64.2.patch
new file mode 100644
index 000000000000..6ba63ee7fe76
--- /dev/null
+++ b/dev-cpp/libcmis/files/libcmis-0.5.2-icu-64.2.patch
@@ -0,0 +1,17 @@
+--- a/inc/libcmis-c/repository.h	2018-12-27 14:07:55.000000000 +0100
++++ b/inc/libcmis-c/repository.h	2019-04-21 01:29:46.504373226 +0200
+@@ -28,12 +28,12 @@
+ #ifndef _REPOSITORY_H_
+ #define _REPOSITORY_H_
+ 
++#include <libxml/tree.h>
++
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+ 
+-#include <libxml/tree.h>
+-
+ #include "libcmis-c/libcmis-c-api.h"
+ #include "libcmis-c/types.h"
+ 
diff --git a/dev-cpp/libcmis/libcmis-0.5.2-r1.ebuild b/dev-cpp/libcmis/libcmis-0.5.2-r1.ebuild
new file mode 100644
index 000000000000..c9f4938bb63f
--- /dev/null
+++ b/dev-cpp/libcmis/libcmis-0.5.2-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+fi
+inherit autotools flag-o-matic
+
+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 static-libs test tools"
+
+BDEPEND="
+	virtual/pkgconfig
+	man? (
+		app-text/docbook2X
+		dev-libs/libxslt
+	)
+	test? (
+		dev-util/cppcheck
+		dev-util/cppunit
+	)
+"
+DEPEND="
+	dev-libs/boost:=
+	dev-libs/libxml2
+	net-misc/curl
+"
+RDEPEND="${DEPEND}"
+
+RESTRICT="test"
+
+PATCHES=( "${FILESDIR}/${P}-icu-64.2.patch" )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+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)
+	)
+	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 33f9f92173ea..a060dbb78ee9 100644
--- a/dev-cpp/libcmis/libcmis-9999.ebuild
+++ b/dev-cpp/libcmis/libcmis-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,11 +6,9 @@ EAPI=7
 if [[ ${PV} = 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/tdf/libcmis.git"
 	inherit git-r3
-elif [[ ${PV} = *_pre* ]]; then
-	COMMIT=738528d790b2b1d52d9b72d673842969a852815d
-	SRC_URI="https://github.com/tdf/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 else
 	SRC_URI="https://github.com/tdf/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 fi
 inherit autotools flag-o-matic
 
@@ -20,18 +18,8 @@ HOMEPAGE="https://github.com/tdf/libcmis"
 LICENSE="|| ( GPL-2 LGPL-2 MPL-1.1 )"
 SLOT="0.5"
 
-# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
-[[ ${PV} == 9999 ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="man static-libs test tools"
 
-IUSE="man static-libs test"
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-libs/libxml2
-	net-misc/curl
-"
-DEPEND="${RDEPEND}"
 BDEPEND="
 	virtual/pkgconfig
 	man? (
@@ -43,11 +31,15 @@ BDEPEND="
 		dev-util/cppunit
 	)
 "
+DEPEND="
+	dev-libs/boost:=
+	dev-libs/libxml2
+	net-misc/curl
+"
+RDEPEND="${DEPEND}"
 
 RESTRICT="test"
 
-[[ ${PV} = *_pre* ]] && S="${WORKDIR}/${PN}-${COMMIT}"
-
 src_prepare() {
 	default
 	eautoreconf
@@ -63,7 +55,7 @@ src_configure() {
 		$(use_with man)
 		$(use_enable static-libs static)
 		$(use_enable test tests)
-		--enable-client
+		$(use_enable tools client)
 	)
 	econf "${myeconfargs[@]}"
 }
diff --git a/dev-cpp/libcmis/metadata.xml b/dev-cpp/libcmis/metadata.xml
index afb9c075be7a..02623876d9cc 100644
--- a/dev-cpp/libcmis/metadata.xml
+++ b/dev-cpp/libcmis/metadata.xml
@@ -6,7 +6,8 @@
 		<name>Gentoo Office project</name>
 	</maintainer>
 	<use>
-		<flag name="man">Build and install man pages.</flag>
+		<flag name="man">Build and install man pages</flag>
+		<flag name="tools">Build client tool for testing and viewing features</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">tdf/libcmis</remote-id>