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 778ED138334 for ; Tue, 8 Oct 2019 18:57:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 96C74E084E; Tue, 8 Oct 2019 18:57:29 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 6CA1FE084E for ; Tue, 8 Oct 2019 18:57:29 +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 1CBD134BA80 for ; Tue, 8 Oct 2019 18:57:27 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0318E7F8 for ; Tue, 8 Oct 2019 18:57:25 +0000 (UTC) From: "Craig Andrews" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Craig Andrews" Message-ID: <1570560980.b1d8ef8a014bc7e32cea4f6b80ca9e28cad5c794.candrews@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/rapidjson/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/rapidjson/rapidjson-1.1.0-r2.ebuild dev-libs/rapidjson/rapidjson-9999.ebuild X-VCS-Directories: dev-libs/rapidjson/ X-VCS-Committer: candrews X-VCS-Committer-Name: Craig Andrews X-VCS-Revision: b1d8ef8a014bc7e32cea4f6b80ca9e28cad5c794 X-VCS-Branch: master Date: Tue, 8 Oct 2019 18:57:25 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 532f7f36-3916-4959-abc8-364c311e103f X-Archives-Hash: 3b7a1343ce3108637dc1ec13b9234114 commit: b1d8ef8a014bc7e32cea4f6b80ca9e28cad5c794 Author: Craig Andrews gentoo org> AuthorDate: Tue Oct 8 18:55:54 2019 +0000 Commit: Craig Andrews gentoo org> CommitDate: Tue Oct 8 18:56:20 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1d8ef8a dev-libs/rapidjson: Correct DOC and LIB dirs, https homepage, EAPI=7 Closes: https://bugs.gentoo.org/696978 Package-Manager: Portage-2.3.76, Repoman-2.3.17 Signed-off-by: Craig Andrews gentoo.org> .../{rapidjson-9999.ebuild => rapidjson-1.1.0-r2.ebuild} | 11 ++++++++--- dev-libs/rapidjson/rapidjson-9999.ebuild | 6 ++++-- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/dev-libs/rapidjson/rapidjson-9999.ebuild b/dev-libs/rapidjson/rapidjson-1.1.0-r2.ebuild similarity index 83% copy from dev-libs/rapidjson/rapidjson-9999.ebuild copy to dev-libs/rapidjson/rapidjson-1.1.0-r2.ebuild index 160fb5e9d92..bd6b5e3e367 100644 --- a/dev-libs/rapidjson/rapidjson-9999.ebuild +++ b/dev-libs/rapidjson/rapidjson-1.1.0-r2.ebuild @@ -1,12 +1,12 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit cmake-utils DESCRIPTION="A fast JSON parser/generator for C++ with both SAX/DOM style API" -HOMEPAGE="http://rapidjson.org/" +HOMEPAGE="https://rapidjson.org/" LICENSE="MIT" IUSE="doc examples test" @@ -14,7 +14,6 @@ SLOT="0" if [[ ${PV} == *9999 ]] ; then EGIT_REPO_URI="https://github.com/miloyip/rapidjson.git" - EGIT_SUBMODULES=() inherit git-r3 else SRC_URI="https://github.com/miloyip/rapidjson/archive/v${PV}.tar.gz -> ${P}.tar.gz" @@ -30,6 +29,10 @@ DEPEND=" )" RDEPEND="" +PATCHES=( + "${FILESDIR}/${P}-gcc-7.patch" +) + src_prepare() { cmake-utils_src_prepare @@ -39,6 +42,8 @@ src_prepare() { src_configure() { local mycmakeargs=( + -DDOC_INSTALL_DIR="${EPREFIX}/usr/share/doc/${PF}" + -DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)" -DRAPIDJSON_BUILD_DOC=$(usex doc) -DRAPIDJSON_BUILD_EXAMPLES=$(usex examples) -DRAPIDJSON_BUILD_TESTS=$(usex test) diff --git a/dev-libs/rapidjson/rapidjson-9999.ebuild b/dev-libs/rapidjson/rapidjson-9999.ebuild index 160fb5e9d92..392fbf7059f 100644 --- a/dev-libs/rapidjson/rapidjson-9999.ebuild +++ b/dev-libs/rapidjson/rapidjson-9999.ebuild @@ -1,12 +1,12 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit cmake-utils DESCRIPTION="A fast JSON parser/generator for C++ with both SAX/DOM style API" -HOMEPAGE="http://rapidjson.org/" +HOMEPAGE="https://rapidjson.org/" LICENSE="MIT" IUSE="doc examples test" @@ -39,6 +39,8 @@ src_prepare() { src_configure() { local mycmakeargs=( + -DDOC_INSTALL_DIR="${EPREFIX}/usr/share/doc/${PF}" + -DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)" -DRAPIDJSON_BUILD_DOC=$(usex doc) -DRAPIDJSON_BUILD_EXAMPLES=$(usex examples) -DRAPIDJSON_BUILD_TESTS=$(usex test)