commit: ad80d319c19f26fcb9104f4031e2d4945393619b
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 4 19:18:55 2021 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Fri Jun 4 19:19:41 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad80d319
dev-ada/gnatcoll-bindings: bump to 2021
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
dev-ada/gnatcoll-bindings/Manifest | 1 +
.../gnatcoll-bindings-2020-r1.ebuild | 16 +-------
.../gnatcoll-bindings-2020-r2.ebuild | 16 +-------
...020-r2.ebuild => gnatcoll-bindings-2021.ebuild} | 43 +++++++++++-----------
4 files changed, 25 insertions(+), 51 deletions(-)
diff --git a/dev-ada/gnatcoll-bindings/Manifest
b/dev-ada/gnatcoll-bindings/Manifest
index a6f2df013b4..3d8c6874890 100644
--- a/dev-ada/gnatcoll-bindings/Manifest
+++ b/dev-ada/gnatcoll-bindings/Manifest
@@ -1 +1,2 @@
DIST gnatcoll-bindings-20.0-20191009-1B2EA-src.tar.gz 139910 BLAKE2B
5441c277d5888b040930960ed656a1b1264c7de02834995c6040c891b99bf7e8773029b9f722d5a3ed30036e7bd441318989ce3f7839d47928af5f4f7c396f90
SHA512
2b723ba4327966dc06594ccff45da3a01f65b8f8b91130ddc44d1b727d23ccbfe35f082c73810418da9d0705f1dc8ca9b471748eecee42adce34be722a4a201b
+DIST gnatcoll-bindings-2021-20210518-19B15-src.tar.gz 1425986 BLAKE2B
c10fc6ff8bc74de37178a5e74d7ca81fd476c84765612b59c4a7711bfd6fb2428157bc12715e3813170c1403419ca89bdea55569f111c7a66130f689575fe368
SHA512
c2cae5bef27c19c46a69c188d111676cb6d68762e8666740dac69bddbeb350d56497ceceda5b6959e7810d51d98ead7827d95735bfc932c343cec5acee81b041
diff --git a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2020-r1.ebuild
b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2020-r1.ebuild
index 742e2f983a4..8f47cc46b77 100644
--- a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2020-r1.ebuild
+++ b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2020-r1.ebuild
@@ -3,9 +3,7 @@
EAPI=7
-#PYTHON_COMPAT=( python2_7 )
-ADA_COMPAT=( gnat_201{6,7,8,9} )
-#inherit ada multilib multiprocessing python-single-r1
+ADA_COMPAT=( gnat_201{7..9} )
inherit ada multilib multiprocessing
MYP=${PN}-20.0-20191009-1B2EA
@@ -18,10 +16,8 @@
SRC_URI="https://community.download.adacore.com/v1/3c54db553121bf88877e2f56ac4fc
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="amd64 x86"
-#IUSE="gmp iconv python readline +shared static-libs static-pic syslog"
IUSE="gmp iconv readline +shared static-libs static-pic syslog"
-#RDEPEND="python? ( ${PYTHON_DEPS} )
RDEPEND="
${ADA_DEPS}
dev-ada/gnatcoll-core[${ADA_USEDEP},shared?,static-libs?,static-pic?]
@@ -29,17 +25,11 @@ RDEPEND="
DEPEND="${RDEPEND}
dev-ada/gprbuild[${ADA_USEDEP}]"
-#REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
REQUIRED_USE="
${ADA_REQUIRED_USE}"
S="${WORKDIR}"/${MYP}-src
-pkg_setup() {
-# use python && python-single-r1_pkg_setup
- ada_pkg_setup
-}
-
src_compile() {
build () {
gprbuild -j$(makeopts_jobs) -m -p -v \
@@ -47,14 +37,11 @@ src_compile() {
-XLIBRARY_TYPE=$2 -P $1/gnatcoll_$1.gpr -XBUILD="PROD" \
-XGNATCOLL_ICONV_OPT= \
-cargs:Ada ${ADAFLAGS} -cargs:C ${CFLAGS} || die
"gprbuild failed"
-# -XGNATCOLL_ICONV_OPT=
-XGNATCOLL_PYTHON_CFLAGS="-I$(python_get_includedir)" \
-# -XGNATCOLL_PYTHON_LIBS=$(python_get_library_path) \
}
for kind in shared static-libs static-pic ; do
if use $kind; then
lib=${kind%-libs}
lib=${lib/shared/relocatable}
-# for dir in gmp iconv python readline syslog ; do
for dir in gmp iconv readline syslog ; do
if use $dir; then
build $dir $lib
@@ -74,7 +61,6 @@ src_install() {
if use $kind; then
lib=${kind%-libs}
lib=${lib/shared/relocatable}
-# for dir in gmp iconv python readline syslog ; do
for dir in gmp iconv readline syslog ; do
if use $dir; then
build $dir $lib
diff --git a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2020-r2.ebuild
b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2020-r2.ebuild
index 52cb19c29ba..e1b4a17dd43 100644
--- a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2020-r2.ebuild
+++ b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2020-r2.ebuild
@@ -3,9 +3,7 @@
EAPI=7
-#PYTHON_COMPAT=( python2_7 )
-ADA_COMPAT=( gnat_201{6,7,8,9} gnat_2020 )
-#inherit ada multilib multiprocessing python-single-r1
+ADA_COMPAT=( gnat_201{7..9} gnat_202{0..1} )
inherit ada multilib multiprocessing
MYP=${PN}-20.0-20191009-1B2EA
@@ -18,10 +16,8 @@
SRC_URI="https://community.download.adacore.com/v1/3c54db553121bf88877e2f56ac4fc
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-#IUSE="gmp iconv python readline +shared static-libs static-pic syslog"
IUSE="gmp iconv readline +shared static-libs static-pic syslog"
-#RDEPEND="python? ( ${PYTHON_DEPS} )
RDEPEND="
${ADA_DEPS}
dev-ada/gnatcoll-core[${ADA_USEDEP},shared?,static-libs?,static-pic?]
@@ -29,17 +25,11 @@ RDEPEND="
DEPEND="${RDEPEND}
dev-ada/gprbuild[${ADA_USEDEP}]"
-#REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
REQUIRED_USE="
${ADA_REQUIRED_USE}"
S="${WORKDIR}"/${MYP}-src
-pkg_setup() {
-# use python && python-single-r1_pkg_setup
- ada_pkg_setup
-}
-
src_compile() {
build () {
gprbuild -j$(makeopts_jobs) -m -p -v \
@@ -47,14 +37,11 @@ src_compile() {
-XLIBRARY_TYPE=$2 -P $1/gnatcoll_$1.gpr -XBUILD="PROD" \
-XGNATCOLL_ICONV_OPT= \
-cargs:Ada ${ADAFLAGS} -cargs:C ${CFLAGS} || die
"gprbuild failed"
-# -XGNATCOLL_ICONV_OPT=
-XGNATCOLL_PYTHON_CFLAGS="-I$(python_get_includedir)" \
-# -XGNATCOLL_PYTHON_LIBS=$(python_get_library_path) \
}
for kind in shared static-libs static-pic ; do
if use $kind; then
lib=${kind%-libs}
lib=${lib/shared/relocatable}
-# for dir in gmp iconv python readline syslog ; do
for dir in gmp iconv readline syslog ; do
if use $dir; then
build $dir $lib
@@ -74,7 +61,6 @@ src_install() {
if use $kind; then
lib=${kind%-libs}
lib=${lib/shared/relocatable}
-# for dir in gmp iconv python readline syslog ; do
for dir in gmp iconv readline syslog ; do
if use $dir; then
build $dir $lib
diff --git a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2020-r2.ebuild
b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2021.ebuild
similarity index 60%
copy from dev-ada/gnatcoll-bindings/gnatcoll-bindings-2020-r2.ebuild
copy to dev-ada/gnatcoll-bindings/gnatcoll-bindings-2021.ebuild
index 52cb19c29ba..d8d413bfabd 100644
--- a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2020-r2.ebuild
+++ b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2021.ebuild
@@ -3,59 +3,61 @@
EAPI=7
-#PYTHON_COMPAT=( python2_7 )
-ADA_COMPAT=( gnat_201{6,7,8,9} gnat_2020 )
-#inherit ada multilib multiprocessing python-single-r1
-inherit ada multilib multiprocessing
+PYTHON_COMPAT=( python3_{7..9} )
+ADA_COMPAT=( gnat_201{7..9} gnat_202{0..1} )
+inherit ada multilib multiprocessing python-single-r1
-MYP=${PN}-20.0-20191009-1B2EA
+MYP=${P}-${PV}0518-19B15-src
+ADAMIRROR=https://community.download.adacore.com/v1
+ID=d93655ced17f15c5f376b6861825df3f9c183980
DESCRIPTION="GNAT Component Collection"
HOMEPAGE="http://libre.adacore.com";
-SRC_URI="https://community.download.adacore.com/v1/3c54db553121bf88877e2f56ac4fca36765186eb?filename=${MYP}-src.tar.gz
- -> ${MYP}-src.tar.gz"
+SRC_URI="${ADAMIRROR}/${ID}?filename=${MYP}.tar.gz -> ${MYP}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-#IUSE="gmp iconv python readline +shared static-libs static-pic syslog"
-IUSE="gmp iconv readline +shared static-libs static-pic syslog"
+IUSE="gmp iconv python readline +shared static-libs static-pic syslog"
-#RDEPEND="python? ( ${PYTHON_DEPS} )
-RDEPEND="
+RDEPEND="python? ( ${PYTHON_DEPS} )
${ADA_DEPS}
dev-ada/gnatcoll-core[${ADA_USEDEP},shared?,static-libs?,static-pic?]
gmp? ( dev-libs/gmp:* )"
DEPEND="${RDEPEND}
dev-ada/gprbuild[${ADA_USEDEP}]"
-#REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
-REQUIRED_USE="
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
${ADA_REQUIRED_USE}"
-S="${WORKDIR}"/${MYP}-src
+S="${WORKDIR}"/${MYP}
pkg_setup() {
-# use python && python-single-r1_pkg_setup
+ use python && python-single-r1_pkg_setup
ada_pkg_setup
}
+src_prepare() {
+ rm -rf python || die
+ mv python3 python || die
+ default
+}
+
src_compile() {
build () {
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"
-# -XGNATCOLL_ICONV_OPT=
-XGNATCOLL_PYTHON_CFLAGS="-I$(python_get_includedir)" \
-# -XGNATCOLL_PYTHON_LIBS=$(python_get_library_path) \
}
for kind in shared static-libs static-pic ; do
if use $kind; then
lib=${kind%-libs}
lib=${lib/shared/relocatable}
-# for dir in gmp iconv python readline syslog ; do
- for dir in gmp iconv readline syslog ; do
+ for dir in gmp iconv python readline syslog ; do
if use $dir; then
build $dir $lib
fi
@@ -74,8 +76,7 @@ src_install() {
if use $kind; then
lib=${kind%-libs}
lib=${lib/shared/relocatable}
-# for dir in gmp iconv python readline syslog ; do
- for dir in gmp iconv readline syslog ; do
+ for dir in gmp iconv python readline syslog ; do
if use $dir; then
build $dir $lib
fi
