From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1347614-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 490BE158086
for <garchives@archives.gentoo.org>; Thu, 9 Dec 2021 18:33:29 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id D93482BC003;
Thu, 9 Dec 2021 18:33:27 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id C384F2BC003
for <gentoo-commits@lists.gentoo.org>; Thu, 9 Dec 2021 18:33:26 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 9EB12343381
for <gentoo-commits@lists.gentoo.org>; Thu, 9 Dec 2021 18:33:23 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id F20031F2
for <gentoo-commits@lists.gentoo.org>; Thu, 9 Dec 2021 18:33:21 +0000 (UTC)
From: "Alfredo Tupone" <tupone@gentoo.org>
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" <tupone@gentoo.org>
Message-ID: <1639074678.99b5fe71bbda670b9b63858514262079f396e4a3.tupone@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ada/gnatcoll-bindings/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-ada/gnatcoll-bindings/gnatcoll-bindings-2021.ebuild dev-ada/gnatcoll-bindings/gnatcoll-bindings-22.0.0-r1.ebuild dev-ada/gnatcoll-bindings/gnatcoll-bindings-22.0.0.ebuild
X-VCS-Directories: dev-ada/gnatcoll-bindings/
X-VCS-Committer: tupone
X-VCS-Committer-Name: Alfredo Tupone
X-VCS-Revision: 99b5fe71bbda670b9b63858514262079f396e4a3
X-VCS-Branch: master
Date: Thu, 9 Dec 2021 18:33:21 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 5ede0972-632b-445c-b04a-b0e7aedb6a6e
X-Archives-Hash: 2375506756227d388adadc8fbf289698
commit: 99b5fe71bbda670b9b63858514262079f396e4a3
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 9 18:31:18 2021 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Thu Dec 9 18:31:18 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99b5fe71
dev-ada/gnatcoll-bindings: use LIBRARY_TYPE to select build
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
dev-ada/gnatcoll-bindings/gnatcoll-bindings-2021.ebuild | 8 +-------
...bindings-22.0.0.ebuild => gnatcoll-bindings-22.0.0-r1.ebuild} | 9 +--------
2 files changed, 2 insertions(+), 15 deletions(-)
diff --git a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2021.ebuild b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2021.ebuild
index e232eb02e6d5..c424fd2ad070 100644
--- a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2021.ebuild
+++ b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2021.ebuild
@@ -48,7 +48,6 @@ src_compile() {
gprbuild -j$(makeopts_jobs) -m -p -v \
-XGPR_BUILD=$2 -XGNATCOLL_CORE_BUILD=$2 \
-XLIBRARY_TYPE=$2 -P $1/gnatcoll_$1.gpr -XBUILD="PROD" \
- -XGNATCOLL_ICONV_OPT= \
-XGNATCOLL_ICONV_OPT= -XGNATCOLL_PYTHON_CFLAGS="-I$(python_get_includedir)" \
-XGNATCOLL_PYTHON_LIBS=$(python_get_library_path) \
-cargs:Ada ${ADAFLAGS} -cargs:C ${CFLAGS} || die "gprbuild failed"
@@ -70,6 +69,7 @@ src_install() {
build () {
gprinstall -p -f -XBUILD=PROD --prefix="${D}"/usr -XLIBRARY_TYPE=$2 \
-XGPR_BUILD=$2 -XGNATCOLL_CORE_BUILD=$2 \
+ --build-var=LIBRARY_TYPE \
-XGNATCOLL_ICONV_OPT= -P $1/gnatcoll_$1.gpr --build-name=$2
}
for kind in shared static-libs static-pic ; do
@@ -83,12 +83,6 @@ src_install() {
done
fi
done
- if use iconv; then
- sed -i \
- -e "s:GNATCOLL_ICONV_BUILD:LIBRARY_TYPE:" \
- "${D}"/usr/share/gpr/gnatcoll_iconv.gpr \
- || die
- fi
rm -r "${D}"/usr/share/gpr/manifests || die
einstalldocs
}
diff --git a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-22.0.0.ebuild b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-22.0.0-r1.ebuild
similarity index 92%
rename from dev-ada/gnatcoll-bindings/gnatcoll-bindings-22.0.0.ebuild
rename to dev-ada/gnatcoll-bindings/gnatcoll-bindings-22.0.0-r1.ebuild
index 0e7007193e78..a1e806038082 100644
--- a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-22.0.0.ebuild
+++ b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-22.0.0-r1.ebuild
@@ -47,7 +47,6 @@ src_compile() {
-XGPR_BUILD=$2 -XGNATCOLL_CORE_BUILD=$2 \
-XLIBRARY_TYPE=$2 -P $1/gnatcoll_$1.gpr -XBUILD="PROD" \
-XGNATCOLL_VERSION=${PV} \
- -XGNATCOLL_ICONV_OPT= \
-XGNATCOLL_ICONV_OPT= -XGNATCOLL_PYTHON_CFLAGS="-I$(python_get_includedir)" \
-XGNATCOLL_PYTHON_LIBS=$(python_get_library_path) \
-cargs:Ada ${ADAFLAGS} -cargs:C ${CFLAGS} || die "gprbuild failed"
@@ -72,7 +71,7 @@ src_install() {
build () {
gprinstall -p -f -XBUILD=PROD --prefix="${D}"/usr -XLIBRARY_TYPE=$2 \
-XGPR_BUILD=$2 -XGNATCOLL_CORE_BUILD=$2 \
- -XGNATCOLL_VERSION=${PV} \
+ -XGNATCOLL_VERSION=${PV} --build-var=LIBRARY_TYPE \
-XGNATCOLL_ICONV_OPT= -P $1/gnatcoll_$1.gpr --build-name=$2
}
for kind in shared static-libs static-pic ; do
@@ -89,12 +88,6 @@ src_install() {
fi
fi
done
- if use iconv; then
- sed -i \
- -e "s:GNATCOLL_ICONV_BUILD:LIBRARY_TYPE:" \
- "${D}"/usr/share/gpr/gnatcoll_iconv.gpr \
- || die
- fi
rm -r "${D}"/usr/share/gpr/manifests || die
einstalldocs
}