gentoo Easter resync : 12.04.2020

4 files changed, 142 insertions, 2 deletions

diff --git a/dev-libs/libcbor/Manifest b/dev-libs/libcbor/Manifest
index b608ef8e5474..458c31e90402 100644
--- a/dev-libs/libcbor/Manifest
+++ b/dev-libs/libcbor/Manifest
@@ -1,3 +1,7 @@
 DIST libcbor-0.5.0.tar.gz 719348 BLAKE2B 57e15e648159e7858d9d57a8b4cb7f3682f8153248610c9a3385cf9cbdea8babaf81d596b25d44bf6d59c75de23e76cce462fa7860b294019f46636726206d5a SHA512 5c2e9610d9fbb0bfc59f89a180f70b58539a1760fd39cad696af372c164a87828a23bb4d3a54d8e9d846be5271204800f0ad63656ef830f06a0ccdd10edfdb2c
-EBUILD libcbor-0.5.0.ebuild 1298 BLAKE2B 2e3317055c6cddfa1e91db7f49e7c6c6be920ed460f6420104e0299ca0caa3b6ca0bb9374ac626ad894199a49d68d478248325384f40fe7f57bc7b07b47cb18a SHA512 e96c601c707f9806d8e041781330fe08bef4207b3842d6a31480fc7330273661a6a47c5154b659cd0bdfa073b4c4752de54a902fc21a515f65e8b43a2c9d88a0
+DIST libcbor-0.6.0.tar.gz 262622 BLAKE2B 2d3bc10bdb69c9205430718a8f2652672a8fa580ba7951c4012bdc8b502a9d6dcb26f398740f5fd35dfe0634f8e3d8ddf7eff5b9ec35c95cdc5383e2dce9f0ab SHA512 6adbb32780d428140388295c5d740bd77b0ae7b21e3f73629ba56a3aa4e4ee5dbb715454061b0f6f67f2b19ea8366e0e5c24f4ffb1ba629afcb7a776a15045f7
+DIST libcbor-0.6.1.tar.gz 263486 BLAKE2B 9a2415c1dde7ed611075c3b03ea1d8ab63bcb00dfc0cae3d7a3bb225b6fbee2a8f576b1f0f97eb6f0cf14c1a6e9df1c77f69320bac041287b0dec37c073f8b85 SHA512 dc9bb7d18b934fe33faabe30010425cb272d7e135f3bf233554bc934b1701f85c7b662e0d5a6a1921c21cd46acb4393600e9adc05b09d1b2a8e3c92ca9d7e4e8
+EBUILD libcbor-0.5.0.ebuild 1308 BLAKE2B 1024113bdbf7409c9e7e6644ca543edc3bb5835ba16ced60fc44a5fbd74a26c4ddef2ba46f2cdcceb975d0fbebaa31265e6753ee55d5720e1d30e6461d733646 SHA512 25cf8a6eecb5efc065447fc8d56f40fd9112e778a58738993c24a45fc6d819a339ba2fe510d742092a540433ba575b4bdd187ed66038da80afa304d439ffcb31
+EBUILD libcbor-0.6.0-r1.ebuild 1303 BLAKE2B d7caa064bea8106579e3da3267cd64f6086d10509a38cf108b0e7faff386208afb72292f9d9847a539478ca64fa1a0328b1807b50194ab409da2a5276fd4a29c SHA512 3922e922e408f6f9adca1f704ee6a0800ee7657d06276b9b17477350850e1d1933638adf7bb534d39da6e1214ea24bab37aae0c793d0cd850aea76483373d1cd
+EBUILD libcbor-0.6.1.ebuild 1309 BLAKE2B edc2449e15d584345d162d18c21aefc832f8890cc42b2f95cea0891ed69377e16cc3ddc3697e0ecc4e8f38eaffb415d06c4c321f966638b2e87a58947bfbdb99 SHA512 4d8abc7dea8dafe9d6249ccd98578d989078d1bfa46b3932b8ce7b42f51e053134678742814725e435f63d516fe9344ec5c77d843d944809f2f2ba54680211eb
 MISC metadata.xml 353 BLAKE2B ac88c66fa58046797dba48cfe47fc42a3aaf8d8a256fab563def54d126c7ad903bc2d47095ca7221b84f0fd59bcbb6677ffaef9062c9c662ef95b02bf3563b99 SHA512 56f76a4b80d8cf12f854022c2c7353119b11052bf6d454b5d2f6427a02ab64176d2d7ecfadecabafceac6b7aa5ec066145a62831d33f09a829b37cdb8bec64cf
diff --git a/dev-libs/libcbor/libcbor-0.5.0.ebuild b/dev-libs/libcbor/libcbor-0.5.0.ebuild
index 139a3f3a0436..fac56ccb78b6 100644
--- a/dev-libs/libcbor/libcbor-0.5.0.ebuild
+++ b/dev-libs/libcbor/libcbor-0.5.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/PJK/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 IUSE="+custom-alloc doc test"
 
 BDEPEND="
diff --git a/dev-libs/libcbor/libcbor-0.6.0-r1.ebuild b/dev-libs/libcbor/libcbor-0.6.0-r1.ebuild
new file mode 100644
index 000000000000..92997f9ab209
--- /dev/null
+++ b/dev-libs/libcbor/libcbor-0.6.0-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_6 )
+inherit python-any-r1 cmake-utils
+
+DESCRIPTION="CBOR protocol implementation for C and others"
+HOMEPAGE="https://github.com/pjk/libcbor"
+SRC_URI="https://github.com/PJK/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/1"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+IUSE="+custom-alloc doc test"
+
+BDEPEND="
+	doc? (
+		$(python_gen_any_dep '
+			dev-python/sphinx[${PYTHON_USEDEP}]
+			dev-python/breathe[${PYTHON_USEDEP}]
+		')
+	)
+	test? ( dev-util/cmocka )
+"
+
+RESTRICT="!test? ( test )"
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+
+python_check_deps() {
+	has_version "dev-python/sphinx[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/breathe[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use doc && python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local -a mycmakeargs=(
+		-DCMAKE_BUILD_TYPE=Release
+		-DCBOR_CUSTOM_ALLOC=$(usex custom-alloc 'ON' 'OFF')
+		-DWITH_TESTS=$(usex test 'ON' 'OFF')
+	)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+
+	if use doc; then
+		pushd doc >/dev/null || die
+		emake html man
+		popd >/dev/null || die
+	fi
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use doc; then
+		dodoc -r doc/build/html
+		doman doc/build/man/*
+	fi
+}
diff --git a/dev-libs/libcbor/libcbor-0.6.1.ebuild b/dev-libs/libcbor/libcbor-0.6.1.ebuild
new file mode 100644
index 000000000000..368f5493f9ea
--- /dev/null
+++ b/dev-libs/libcbor/libcbor-0.6.1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit python-any-r1 cmake-utils
+
+DESCRIPTION="CBOR protocol implementation for C and others"
+HOMEPAGE="https://github.com/pjk/libcbor"
+SRC_URI="https://github.com/PJK/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/1"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+IUSE="+custom-alloc doc test"
+
+BDEPEND="
+	doc? (
+		$(python_gen_any_dep '
+			dev-python/sphinx[${PYTHON_USEDEP}]
+			dev-python/breathe[${PYTHON_USEDEP}]
+		')
+	)
+	test? ( dev-util/cmocka )
+"
+
+RESTRICT="!test? ( test )"
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+
+python_check_deps() {
+	has_version "dev-python/sphinx[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/breathe[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use doc && python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local -a mycmakeargs=(
+		-DCMAKE_BUILD_TYPE=Release
+		-DCBOR_CUSTOM_ALLOC=$(usex custom-alloc 'ON' 'OFF')
+		-DWITH_TESTS=$(usex test 'ON' 'OFF')
+	)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+
+	if use doc; then
+		pushd doc >/dev/null || die
+		emake html man
+		popd >/dev/null || die
+	fi
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use doc; then
+		dodoc -r doc/build/html
+		doman doc/build/man/*
+	fi
+}