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 99B0A1382C5 for ; Mon, 12 Feb 2018 19:21:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BC7B8E09D9; Mon, 12 Feb 2018 19:21:15 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 8AFA5E09D9 for ; Mon, 12 Feb 2018 19:21:15 +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 2F5DA335C03 for ; Mon, 12 Feb 2018 19:21:14 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 688AE1DA for ; Mon, 12 Feb 2018 19:21:12 +0000 (UTC) From: "Alfredo Tupone" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alfredo Tupone" Message-ID: <1518463264.704ae110cfdc52c3730a337e4518508eb42825a5.tupone@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ada/gnatcoll/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-ada/gnatcoll/gnatcoll-2016.ebuild dev-ada/gnatcoll/gnatcoll-2017.ebuild dev-ada/gnatcoll/metadata.xml X-VCS-Directories: dev-ada/gnatcoll/ X-VCS-Committer: tupone X-VCS-Committer-Name: Alfredo Tupone X-VCS-Revision: 704ae110cfdc52c3730a337e4518508eb42825a5 X-VCS-Branch: master Date: Mon, 12 Feb 2018 19:21:12 +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: 645ec48b-af55-4c6b-a59f-167d3c21dddd X-Archives-Hash: c91c7f6425a142e010a0d65d1f99ee32 commit: 704ae110cfdc52c3730a337e4518508eb42825a5 Author: Tupone Alfredo gentoo org> AuthorDate: Mon Feb 12 19:21:04 2018 +0000 Commit: Alfredo Tupone gentoo org> CommitDate: Mon Feb 12 19:21:04 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=704ae110 dev-ada/gnatcoll: use static -> static-libs Package-Manager: Portage-2.3.19, Repoman-2.3.6 dev-ada/gnatcoll/gnatcoll-2016.ebuild | 12 +++++------- dev-ada/gnatcoll/gnatcoll-2017.ebuild | 12 +++++------- dev-ada/gnatcoll/metadata.xml | 1 - 3 files changed, 10 insertions(+), 15 deletions(-) diff --git a/dev-ada/gnatcoll/gnatcoll-2016.ebuild b/dev-ada/gnatcoll/gnatcoll-2016.ebuild index 6158847c2fd..0ccb4224f75 100644 --- a/dev-ada/gnatcoll/gnatcoll-2016.ebuild +++ b/dev-ada/gnatcoll/gnatcoll-2016.ebuild @@ -16,15 +16,14 @@ LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64" IUSE="gmp +gnat_2016 gnat_2017 gtk iconv postgres pygobject projects readline - +shared sqlite static syslog tools" + +shared sqlite static-libs syslog tools" RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ${PYTHON_DEPS} gmp? ( dev-libs/gmp:* ) gtk? ( - dev-ada/gtkada[gnat_2016=,gnat_2017=,shared?] - static? ( dev-ada/gtkada[static-libs] ) + dev-ada/gtkada[gnat_2016=,gnat_2017=,shared?,static-libs?] dev-libs/atk dev-libs/glib x11-libs/cairo @@ -36,8 +35,7 @@ RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) postgres? ( dev-db/postgresql:* ) sqlite? ( dev-db/sqlite ) projects? ( - =dev-ada/libgpr-2016[gnat_2016=,gnat_2017=,shared?] - static? ( dev-ada/libgpr[static-libs] ) + =dev-ada/libgpr-2016[gnat_2016=,gnat_2017=,shared?,static-libs?] )" DEPEND="${RDEPEND} dev-ada/gprbuild[gnat_2016=,gnat_2017=]" @@ -99,7 +97,7 @@ src_compile() { emake PROCESSORS=$(makeopts_jobs) GPRBUILD_OPTIONS=-v GCC=${GCC} \ build_library_type/relocatable fi - if use static; then + if use static-libs; then emake PROCESSORS=$(makeopts_jobs) GPRBUILD_OPTIONS=-v GCC=${GCC} \ build_library_type/static fi @@ -110,7 +108,7 @@ src_install() { if use shared; then emake prefix="${D}usr" install_library_type/relocatable fi - if use static; then + if use static-libs; then emake prefix="${D}usr" install_library_type/static fi emake prefix="${D}usr" install_gps_plugin diff --git a/dev-ada/gnatcoll/gnatcoll-2017.ebuild b/dev-ada/gnatcoll/gnatcoll-2017.ebuild index a788f5e58a0..f67e1a2f877 100644 --- a/dev-ada/gnatcoll/gnatcoll-2017.ebuild +++ b/dev-ada/gnatcoll/gnatcoll-2017.ebuild @@ -16,14 +16,13 @@ LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64" IUSE="gmp gnat_2016 +gnat_2017 gtk iconv postgres pygobject projects readline - +shared sqlite static syslog tools" + +shared sqlite static-libs syslog tools" RDEPEND="dev-lang/gnat-gpl:6.3.0 ${PYTHON_DEPS} gmp? ( dev-libs/gmp:* ) gtk? ( - dev-ada/gtkada[gnat_2017,shared?] - static? ( dev-ada/gtkada[static-libs] ) + dev-ada/gtkada[gnat_2017,shared?,static-libs?] dev-libs/atk dev-libs/glib x11-libs/cairo @@ -35,8 +34,7 @@ RDEPEND="dev-lang/gnat-gpl:6.3.0 postgres? ( dev-db/postgresql:* ) sqlite? ( dev-db/sqlite ) projects? ( - >=dev-ada/libgpr-2017[gnat_2017,shared?] - static? ( dev-ada/libgpr[static-libs] ) + >=dev-ada/libgpr-2017[gnat_2017,shared?,static-libs?] )" DEPEND="${RDEPEND} dev-ada/gprbuild[gnat_2017]" @@ -99,7 +97,7 @@ src_compile() { emake PROCESSORS=$(makeopts_jobs) GPRBUILD_OPTIONS=-v GCC=${GCC} \ build_library_type/relocatable fi - if use static; then + if use static-libs; then emake PROCESSORS=$(makeopts_jobs) GPRBUILD_OPTIONS=-v GCC=${GCC} \ build_library_type/static fi @@ -114,7 +112,7 @@ src_install() { if use shared; then emake prefix="${D}usr" install_library_type/relocatable fi - if use static; then + if use static-libs; then emake prefix="${D}usr" install_library_type/static fi if use tools; then diff --git a/dev-ada/gnatcoll/metadata.xml b/dev-ada/gnatcoll/metadata.xml index 5bc4030a3e0..df4d11fa0b3 100644 --- a/dev-ada/gnatcoll/metadata.xml +++ b/dev-ada/gnatcoll/metadata.xml @@ -11,7 +11,6 @@ Adds support for projects Adds support for pygobject Build shared library - Build static library Build associated tools