gentoo resync : 16.06.2018

6 files changed, 40 insertions, 186 deletions

diff --git a/dev-libs/libarcus/Manifest b/dev-libs/libarcus/Manifest
index 34e12f5fc9fb..da13ec413200 100644
--- a/dev-libs/libarcus/Manifest
+++ b/dev-libs/libarcus/Manifest
@@ -1,8 +1,3 @@
-AUX libarcus-1.0.0-fix-install-paths.patch 2987 BLAKE2B 5302e2f8fabefb0b20a5baf93b02f5e4d3f5ed79b3a009de292b3549974e5a0cbd13f579ced0e88ae1d339d8669724c4f2524ad7886d3fc1940ba2dc3c720266 SHA512 971da6d467f9843a9e86c49cff63b517a1666d23277ccbb90a7a87d0c1ea259c38f00a7a51372fcaea8a1d6fb373a730b4beca02f787b500e2831a5ad02404b5
-DIST libarcus-1.0.0_pre20160307.tar.gz 40461 BLAKE2B 8f39ae9451c4cb7af1792717c9c205893fadaa0a0c41de408f34a0f83962905a8c200806c77e881a7cee50bb9818c8d72354790ce2c6a07d50198119a89b98e2 SHA512 ec654fbe2d34ad60afd0c1f3745e9f0ef5709e3698ea78d17089dad5e86cb686f38a0ea4cca07b6911058ebdf61c17b51a89c002cbf74cbbd4a68a133d8984e5
-DIST libarcus-2.3.1.tar.gz 41641 BLAKE2B d45b71b987bb7fe04060cf398a26a10094e9f44f75102db878846dd5c709181bb6dc36c62dc5fee41c551f8bf039977f91a2ed5d3b10da1763e599510c2ff33e SHA512 24ac5dd784993658e823dc7111e0ff31e77f8d95c4f024a84a7db731577ba595427de0917911fe7e0ba5848241ad33237fe6edb90a5191741e9523f616dd06a6
-DIST libarcus-2.6.0.tar.gz 39516 BLAKE2B 6d187d9b095fc9b86e548a8f1ca9709677ee8deb22e7270ee27a2e93a30f8514adbc7846f78415286dba00d56025eacb70e5077bf9aa71ae5e0ef641ec417edb SHA512 1a2c7ec83999f7874b9e82874e83550c7595fcbb0d4fcee2d84c2a06f4ec1147df30ac2e06e55552c718889fbd21146c43a9f8cf08ff282908b866bf87729ca8
-EBUILD libarcus-1.0.0_pre20160307.ebuild 1212 BLAKE2B 18847501c97b9653e36f5acc477a6138235b115b063c0443d4f9157084d32cedd2bde0bc0560c91d9a1d22709bb140fcbbb725304e9b3146be5e9ff8a1601d75 SHA512 29a5f6443d823715eeb78b3b93ff6a64902398fbdf42a1f1920300f4967ca98fd865c4f1dbcac479ff6c092cc3cfc6df837ef56231b1357eaf40eaf3b0c86c5f
-EBUILD libarcus-2.3.1.ebuild 1092 BLAKE2B dabf53030447fc48a1c4870f79dbeb966aaaebf5064edb5c5da858fcfa5b4b48faf8ba87902554e9c0342c80ba9535f3e419f91f8883524ed72c8bba83fd104f SHA512 c0d0653662c38aa651c3736e22b9278a6d4df5dfe9e460b53467c932a17096a7bcd2dc361c3376036b7ea2baae0b650e60b076348fa7969901469bd179b029ec
-EBUILD libarcus-2.6.0.ebuild 1102 BLAKE2B 0ded4b2a7af62a372db322b236d08569460774062315bd85387f762ca295b89db210ac448f9e807802a1580e7429643689956ec682ee18a5672603895f70068a SHA512 449610a36974d7aa91d537f0f03f87cb63376c5b5e9f096ec5e033c7139040b53e52dd811fc7e31014d5d6071e7ae3b5d60d9e1367f1a14fb956c1e4e27ae5b3
-MISC metadata.xml 455 BLAKE2B 0747982c4a0875f1a04ccc8f048ab9c2316012b5d6538090da9ba134505b40e82df9eac90169b0aa0e7877081e6d76bb26bb4b9e5ef3fc082b512082ec45a0dd SHA512 a46c0797922eb1543db0252d0b7988ea1ad2c8c3f958b6ce3430e12e055a8b7d95ba29a577ce69218e5268c5aac507ba03ab788abb782b67adbe8e74f7ba3833
+DIST libarcus-3.3.0.tar.gz 29695 BLAKE2B a63ca06133cf7db556fe82cc7ea060badd7838d697822d64e09c52aaa81a8509bfa6010037004593da3b1e66dde510767a992524f8e1719e614932b88b9393fe SHA512 a911fb5784ceb835ba2c175ce42cc10544bdd0834e987d8ac1be2517293f00e596f94910d8bf5f37f61e63246ba6e78d28a23bc061809e70b1bb6ad1a21107c9
+EBUILD libarcus-3.3.0.ebuild 1085 BLAKE2B 9d15a9454356b09eb8f05a4548bf49ee8d9ce710d47ec89baf5d11cfbc8b1c9dcc2db503e491f3558eb9da4e5456e823a51fbf7aec33d7ef68b6906d572d5d99 SHA512 95709735d9f791bb344442964ca877d480060ea8fe13c82941a30fbcdc84da2ab9c055570f37f6dd757c5347dd1451759558c73f8a02f7fd22215cd5c9f54a77
+MISC metadata.xml 860 BLAKE2B 9375bca572d46d985fbbf11b222728cdaba22c2fde64e1b4a057d2920b9845bf442bb35ce0b2b1e78fc949cd687604f9f89d5b5665e3cee7afe5b69f09f5ed2b SHA512 9dbfeff3c641642edfd27fbbd27d2ef5810833e4cb3ae5b949c1a20c27377ac70364010fc9fbc759f456e93f294af62f3c08c59bb0585a3ca01f5cd157b3b33e
diff --git a/dev-libs/libarcus/files/libarcus-1.0.0-fix-install-paths.patch b/dev-libs/libarcus/files/libarcus-1.0.0-fix-install-paths.patch
deleted file mode 100644
index b1473f7f661c..000000000000
--- a/dev-libs/libarcus/files/libarcus-1.0.0-fix-install-paths.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-diff -Naur a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt	2016-03-07 10:36:38.000000000 +0100
-+++ b/CMakeLists.txt	2016-04-16 11:54:15.499524812 +0200
-@@ -1,6 +1,7 @@
- project(arcus)
- cmake_minimum_required(VERSION 2.8.12)
- 
-+include(GNUInstallDirs)
- include(CMakePackageConfigHelpers)
- 
- option(BUILD_PYTHON "Build " ON)
-@@ -14,10 +15,12 @@
- 
- if(BUILD_PYTHON)
-     set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
--    if(APPLE OR WIN32)
--        set(PYTHON_SITE_PACKAGES_DIR lib/python3.4/site-packages CACHE STRING "Directory to install Python bindings to")
--    else()
--        set(PYTHON_SITE_PACKAGES_DIR lib/python3/dist-packages CACHE STRING "Directory to install Python bindings to")
-+    if(NOT PYTHON_SITE_PACKAGES_DIR)
-+        if(APPLE OR WIN32)
-+            set(PYTHON_SITE_PACKAGES_DIR lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages CACHE STRING "Directory to install Python bindings to")
-+        else()
-+            set(PYTHON_SITE_PACKAGES_DIR lib/python${PYTHON_VERSION_MAJOR}/dist-packages CACHE STRING "Directory to install Python bindings to")
-+        endif()
-     endif()
-     find_package(SIP REQUIRED)
-     include_directories(python/ src/ ${PYTHON_INCLUDE_DIR} ${SIP_INCLUDE_DIR})
-@@ -57,7 +60,7 @@
- set(ARCUS_VERSION 1.0.0)
- set(ARCUS_SOVERSION 2)
- 
--set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
-+set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
- 
- if(BUILD_STATIC)
-     add_library(Arcus STATIC ${arcus_SRCS})
-@@ -89,7 +92,7 @@
- target_include_directories(Arcus PUBLIC
-     ${PROTOBUF_INCLUDE_DIR}
-     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>
--    $<INSTALL_INTERFACE:include>
-+    $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
- )
- target_link_libraries(Arcus PUBLIC
-     ${PROTOBUF_LIBRARY}
-@@ -120,23 +123,23 @@
- 
- install(TARGETS Arcus
-     EXPORT Arcus-targets
--    RUNTIME DESTINATION bin
--    LIBRARY DESTINATION lib
--    ARCHIVE DESTINATION lib
--    PUBLIC_HEADER DESTINATION include/Arcus
-+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+    PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/Arcus
- )
- 
- install(EXPORT Arcus-targets
--    DESTINATION lib/cmake/Arcus
-+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/Arcus
- )
- 
--configure_package_config_file(ArcusConfig.cmake.in ${CMAKE_BINARY_DIR}/ArcusConfig.cmake INSTALL_DESTINATION lib/cmake/Arcus)
-+configure_package_config_file(ArcusConfig.cmake.in ${CMAKE_BINARY_DIR}/ArcusConfig.cmake INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/Arcus)
- write_basic_package_version_file(${CMAKE_BINARY_DIR}/ArcusConfigVersion.cmake VERSION ${ARCUS_VERSION} COMPATIBILITY SameMajorVersion)
- 
- install(FILES
-     ${CMAKE_BINARY_DIR}/ArcusConfig.cmake
-     ${CMAKE_BINARY_DIR}/ArcusConfigVersion.cmake
--    DESTINATION lib/cmake/Arcus
-+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/Arcus
- )
- 
- include(CPackConfig.cmake)
diff --git a/dev-libs/libarcus/libarcus-1.0.0_pre20160307.ebuild b/dev-libs/libarcus/libarcus-1.0.0_pre20160307.ebuild
deleted file mode 100644
index cbd6bec86cef..000000000000
--- a/dev-libs/libarcus/libarcus-1.0.0_pre20160307.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_4 python3_5 )
-inherit cmake-utils python-single-r1
-
-MY_PN="libArcus"
-COMMIT="1db8a8e57dbf0d68d9e9f85ef9022b8eae17c9ec"
-
-DESCRIPTION="This library facilitates communication between Cura and its backend"
-HOMEPAGE="https://github.com/Ultimaker/libArcus"
-SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="AGPL-3+"
-SLOT="0/2"
-IUSE="examples python static-libs"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/sip[${PYTHON_USEDEP}]
-	>=dev-libs/protobuf-3:=
-	>=dev-python/protobuf-python-3:*[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-S="${WORKDIR}/${MY_PN}-${COMMIT}"
-PATCHES=( "${FILESDIR}/${PN}-1.0.0-fix-install-paths.patch" )
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_PYTHON=$(usex python ON OFF)
-		-DBUILD_EXAMPLES=$(usex examples ON OFF)
-		-DBUILD_STATIC=$(usex static-libs ON OFF)
-	)
-	use python && mycmakeargs+=( -DPYTHON_SITE_PACKAGES_DIR="$(python_get_sitedir)" )
-	cmake-utils_src_configure
-}
diff --git a/dev-libs/libarcus/libarcus-2.6.0.ebuild b/dev-libs/libarcus/libarcus-2.6.0.ebuild
deleted file mode 100644
index 59d80b0d81b0..000000000000
--- a/dev-libs/libarcus/libarcus-2.6.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_4 python3_5 python3_6 )
-inherit cmake-utils python-single-r1
-
-MY_PN="libArcus"
-
-DESCRIPTION="This library facilitates communication between Cura and its backend"
-HOMEPAGE="https://github.com/Ultimaker/libArcus"
-SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="AGPL-3+"
-SLOT="0/2"
-IUSE="examples python static-libs"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/sip[${PYTHON_USEDEP}]
-	>=dev-libs/protobuf-3:=
-	>=dev-python/protobuf-python-3:*[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-S="${WORKDIR}/${MY_PN}-${PV}"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_PYTHON=$(usex python ON OFF)
-		-DBUILD_EXAMPLES=$(usex examples ON OFF)
-		-DBUILD_STATIC=$(usex static-libs ON OFF)
-	)
-	use python && mycmakeargs+=( -DPYTHON_SITE_PACKAGES_DIR="$(python_get_sitedir)" )
-	cmake-utils_src_configure
-}
diff --git a/dev-libs/libarcus/libarcus-2.3.1.ebuild b/dev-libs/libarcus/libarcus-3.3.0.ebuild
index 9ac3d493cf1f..d0e49ef66b98 100644
--- a/dev-libs/libarcus/libarcus-2.3.1.ebuild
+++ b/dev-libs/libarcus/libarcus-3.3.0.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=6
+
+PYTHON_COMPAT=( python3_{5,6} )
 
-PYTHON_COMPAT=( python3_4 python3_5 )
 inherit cmake-utils python-single-r1
 
 MY_PN="libArcus"
@@ -12,18 +13,19 @@ DESCRIPTION="This library facilitates communication between Cura and its backend
 HOMEPAGE="https://github.com/Ultimaker/libArcus"
 SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="AGPL-3+"
-SLOT="0/2"
-IUSE="examples python static-libs"
+LICENSE="LGPL-3"
+SLOT="0/3"
 KEYWORDS="~amd64 ~x86"
+IUSE="examples python static-libs"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="${PYTHON_DEPS}
 	dev-python/sip[${PYTHON_USEDEP}]
-	>=dev-libs/protobuf-3:=
-	>=dev-python/protobuf-python-3:*[${PYTHON_USEDEP}]"
+	dev-libs/protobuf
+	python? ( dev-python/protobuf-python[${PYTHON_USEDEP}] )"
 DEPEND="${RDEPEND}"
+
 S="${WORKDIR}/${MY_PN}-${PV}"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
diff --git a/dev-libs/libarcus/metadata.xml b/dev-libs/libarcus/metadata.xml
index 545a04075c56..dce895cd5780 100644
--- a/dev-libs/libarcus/metadata.xml
+++ b/dev-libs/libarcus/metadata.xml
@@ -1,14 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <maintainer type="project">
-        <email>3dprint@gentoo.org</email>
-        <name>Gentoo 3D Printer Project</name>
-    </maintainer>
-    <slots>
-        <subslots>soname major version number</subslots>
-    </slots>
-    <upstream>
-        <remote-id type="github">Ultimaker/libArcus</remote-id>
-    </upstream>
+	<maintainer type="project">
+		<email>3dprint@gentoo.org</email>
+		<name>Gentoo 3D Printer Project</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>alexxy@gentoo.org</email>
+		<name>Alexey Shvetsov</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>mathy@vanvoorden.be</email>
+		<name>Mathy Vanvoorden</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>perlovka@gmail.com</email>
+		<name>Michael Perlov</name>
+	</maintainer>
+	<slots>
+		<subslots>soname major version number</subslots>
+	</slots>
+	<upstream>
+		<remote-id type="github">Ultimaker/libArcus</remote-id>
+	</upstream>
 </pkgmetadata>