From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 42663138208 for ; Thu, 28 Apr 2016 14:12:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 152B821C045; Thu, 28 Apr 2016 14:12:36 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 534F621C035 for ; Thu, 28 Apr 2016 14:12:35 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 31F0D340CCB for ; Thu, 28 Apr 2016 14:12:34 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 50BD6CF for ; Thu, 28 Apr 2016 14:12:32 +0000 (UTC) From: "Ian Delaney" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ian Delaney" Message-ID: <1461852740.987453ea66b051c13f59a5e32389dfca099cddb6.idella4@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/libarcus/, dev-libs/libarcus/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/libarcus/Manifest dev-libs/libarcus/files/libarcus-1.0.0-fix-install-paths.patch dev-libs/libarcus/libarcus-1.0.0_pre20160307.ebuild dev-libs/libarcus/metadata.xml X-VCS-Directories: dev-libs/libarcus/files/ dev-libs/libarcus/ X-VCS-Committer: idella4 X-VCS-Committer-Name: Ian Delaney X-VCS-Revision: 987453ea66b051c13f59a5e32389dfca099cddb6 X-VCS-Branch: master Date: Thu, 28 Apr 2016 14:12:32 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 774eb0c1-966a-4802-8ec5-01ed45ea915a X-Archives-Hash: 53e12d6f06f819598b032d60a7be6978 commit: 987453ea66b051c13f59a5e32389dfca099cddb6 Author: Marshall Brewer (Gentoo Key) sina cn> AuthorDate: Tue Apr 12 20:11:43 2016 +0000 Commit: Ian Delaney gentoo org> CommitDate: Thu Apr 28 14:12:20 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=987453ea dev-libs/libarcus: initial ebuild, version 1.0.0_pre20160307 Closes: https://github.com/gentoo/gentoo/pull/1298 Signed-off-by: Ian Delaney gentoo.org> dev-libs/libarcus/Manifest | 1 + .../files/libarcus-1.0.0-fix-install-paths.patch | 77 ++++++++++++++++++++++ .../libarcus/libarcus-1.0.0_pre20160307.ebuild | 43 ++++++++++++ dev-libs/libarcus/metadata.xml | 22 +++++++ 4 files changed, 143 insertions(+) diff --git a/dev-libs/libarcus/Manifest b/dev-libs/libarcus/Manifest new file mode 100644 index 0000000..32b3f1b --- /dev/null +++ b/dev-libs/libarcus/Manifest @@ -0,0 +1 @@ +DIST libarcus-1.0.0_pre20160307.tar.gz 40461 SHA256 ca4f286cc8bae08ddf166fa470f8381f25cf61629168ca965a2f4079e758ebfc SHA512 ec654fbe2d34ad60afd0c1f3745e9f0ef5709e3698ea78d17089dad5e86cb686f38a0ea4cca07b6911058ebdf61c17b51a89c002cbf74cbbd4a68a133d8984e5 WHIRLPOOL 0c688c0fb20022a14bce6870fd1da84c891b2f68f335d9f6ebcc25432dab51823b3e9d20be8a3a51a69bc1832c3cd55576c91e0246fcc15fc4456916d5278b28 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 new file mode 100644 index 0000000..b1473f7 --- /dev/null +++ b/dev-libs/libarcus/files/libarcus-1.0.0-fix-install-paths.patch @@ -0,0 +1,77 @@ +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} + $ +- $ ++ $ + ) + 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 new file mode 100644 index 0000000..6f1f571 --- /dev/null +++ b/dev-libs/libarcus/libarcus-1.0.0_pre20160307.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +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/metadata.xml b/dev-libs/libarcus/metadata.xml new file mode 100644 index 0000000..8e6bee1 --- /dev/null +++ b/dev-libs/libarcus/metadata.xml @@ -0,0 +1,22 @@ + + + + + tomboy64@sina.cn + Matthew Brewer + + + proxy-maint@gentoo.org + Gentoo Proxy Maintainers Project + + + 3dprint@gentoo.org + Gentoo 3D Printer Project + + + soname major version number + + + Ultimaker/libArcus + +