[gentoo-commits] repo/gentoo:master commit in: dev-ada/gnatcoll-bindings/

[Alfredo Tupone]

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
 }