commit: 178c852f907a6d3a2363d84822d01bd908759382 Author: Alexey Shvetsov <alexxy <AT> omrb <DOT> pnpi <DOT> spb <DOT> ru> AuthorDate: Thu Jun 14 12:55:16 2018 +0000 Commit: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org> CommitDate: Thu Jun 14 12:55:16 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=178c852f
dev-libs/libarcus: Clean up old Closes: https://bugs.gentoo.org/616170 Package-Manager: Portage-2.3.40, Repoman-2.3.9 dev-libs/libarcus/Manifest | 2 - .../files/libarcus-1.0.0-fix-install-paths.patch | 77 ---------------------- dev-libs/libarcus/libarcus-2.3.1.ebuild | 40 ----------- dev-libs/libarcus/libarcus-2.6.0.ebuild | 40 ----------- 4 files changed, 159 deletions(-) diff --git a/dev-libs/libarcus/Manifest b/dev-libs/libarcus/Manifest index 12248e58124..e4f0c591bc4 100644 --- a/dev-libs/libarcus/Manifest +++ b/dev-libs/libarcus/Manifest @@ -1,4 +1,2 @@ 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 DIST libarcus-3.3.0.tar.gz 29695 BLAKE2B a63ca06133cf7db556fe82cc7ea060badd7838d697822d64e09c52aaa81a8509bfa6010037004593da3b1e66dde510767a992524f8e1719e614932b88b9393fe SHA512 a911fb5784ceb835ba2c175ce42cc10544bdd0834e987d8ac1be2517293f00e596f94910d8bf5f37f61e63246ba6e78d28a23bc061809e70b1bb6ad1a21107c9 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 b1473f7f661..00000000000 --- 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-2.3.1.ebuild b/dev-libs/libarcus/libarcus-2.3.1.ebuild deleted file mode 100644 index 9ac3d493cf1..00000000000 --- a/dev-libs/libarcus/libarcus-2.3.1.ebuild +++ /dev/null @@ -1,40 +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" - -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.6.0.ebuild b/dev-libs/libarcus/libarcus-2.6.0.ebuild deleted file mode 100644 index 59d80b0d81b..00000000000 --- 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 -}
