From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 05177138334 for ; Thu, 6 Sep 2018 22:17:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 963A1E08C3; Thu, 6 Sep 2018 22:17:32 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 540D9E08C3 for ; Thu, 6 Sep 2018 22:17:32 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AA037335C36 for ; Thu, 6 Sep 2018 22:17:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1708A3BF for ; Thu, 6 Sep 2018 22:17:29 +0000 (UTC) From: "Virgil Dupras" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Virgil Dupras" Message-ID: <1536272213.3e0718b8d0272391061e33f7d62be571edbefa68.vdupras@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/jsoncpp/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/jsoncpp/Manifest dev-libs/jsoncpp/jsoncpp-1.8.1.ebuild X-VCS-Directories: dev-libs/jsoncpp/ X-VCS-Committer: vdupras X-VCS-Committer-Name: Virgil Dupras X-VCS-Revision: 3e0718b8d0272391061e33f7d62be571edbefa68 X-VCS-Branch: master Date: Thu, 6 Sep 2018 22:17:29 +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: 4b181ef2-6c86-4595-9a12-98bda3b01a1c X-Archives-Hash: 9c373e49b51d01d13fafdf06e04a214b commit: 3e0718b8d0272391061e33f7d62be571edbefa68 Author: Virgil Dupras gentoo org> AuthorDate: Thu Sep 6 22:16:07 2018 +0000 Commit: Virgil Dupras gentoo org> CommitDate: Thu Sep 6 22:16:53 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e0718b8 dev-libs/jsoncpp: revert "Clean old up" This reverts commit 2e6b2e58ae27edaf758d116d69314133682abde2. It breaks the CI (dev-lang/solidity) dev-libs/jsoncpp/Manifest | 1 + dev-libs/jsoncpp/jsoncpp-1.8.1.ebuild | 67 +++++++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+) diff --git a/dev-libs/jsoncpp/Manifest b/dev-libs/jsoncpp/Manifest index 633c98ce4f2..2af18dd83a0 100644 --- a/dev-libs/jsoncpp/Manifest +++ b/dev-libs/jsoncpp/Manifest @@ -1 +1,2 @@ +DIST jsoncpp-1.8.1.tar.gz 210629 BLAKE2B 5f9a7f51b463784c5a74a78b7189800a37797f233b1d5a66d34edc0689c77a2b96b230c0ed4dfc749401087c551dd5659a6d152e09342ca92250ce9ea91a293e SHA512 4203826fca4c366b51d28ffc928399c914ffaba8be1cada64ff118b5742e6b469d3fc3e59344587d851447857b479794c5697d4fd11a9a55b32a3a7a801b745b DIST jsoncpp-1.8.4.tar.gz 200226 BLAKE2B bbfa8cf7b6cfa6af34762b54de2da0e919849c65b1093b29f7a7ac437524d8b3cf07b42926b250489e9a289105df971fad798f3e73f908fac3e2f52a4e5467b3 SHA512 f70361a3263dd8b9441374a9a409462be1426c0d6587c865171a80448ab73b3f69de2b4d70d2f0c541764e1e6cccc727dd53178347901f625ec6fb54fb94f4f1 diff --git a/dev-libs/jsoncpp/jsoncpp-1.8.1.ebuild b/dev-libs/jsoncpp/jsoncpp-1.8.1.ebuild new file mode 100644 index 00000000000..603c2d1926b --- /dev/null +++ b/dev-libs/jsoncpp/jsoncpp-1.8.1.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python2_7 ) + +inherit cmake-utils python-any-r1 + +DESCRIPTION="C++ JSON reader and writer" +HOMEPAGE="https://github.com/open-source-parsers/jsoncpp" +SRC_URI="https://github.com/open-source-parsers/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="|| ( public-domain MIT )" +SLOT="0/11" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86" +IUSE="doc test" + +DEPEND=" + doc? ( + app-doc/doxygen + ${PYTHON_DEPS} + ) + test? ( + ${PYTHON_DEPS} + )" +RDEPEND="" + +RESTRICT="!test? ( test )" + +pkg_setup() { + if use doc || use test; then + python-any-r1_pkg_setup + fi +} + +src_configure() { + local mycmakeargs=( + -DJSONCPP_WITH_TESTS=$(usex test) + -DJSONCPP_WITH_POST_BUILD_UNITTEST=OFF + -DJSONCPP_WITH_CMAKE_PACKAGE=ON + + -DBUILD_SHARED_LIBS=ON + -DBUILD_STATIC_LIBS=OFF + + # Follow Debian, Ubuntu, Arch convention for headers location + # bug #452234 + -DCMAKE_INSTALL_INCLUDEDIR=include/jsoncpp + + # Disable implicit ccache use + -DCCACHE_FOUND=OFF + ) + cmake-utils_src_configure +} + +src_compile() { + cmake-utils_src_compile + + if use doc; then + "${EPYTHON}" doxybuild.py --doxygen="${EPREFIX}"/usr/bin/doxygen || die + HTML_DOCS=( dist/doxygen/jsoncpp*/. ) + fi +} + +src_test() { + cmake-utils_src_make jsoncpp_check +}