dev-ada/gprbuild: removed bootstrap and library moved to dev-ada/libgpr

Package-Manager: Portage-2.3.13, Repoman-2.3.3

diff --git a/dev-ada/gprbuild/gprbuild-2016.ebuild b/dev-ada/gprbuild/gprbuild-2016.ebuild
index 162f31f1ee4d999c11b3fed79384259b65f9ee12..5559e173f19bd153392bee18d2a7d80b7b005b6a 100644 (file)
--- a/dev-ada/gprbuild/gprbuild-2016.ebuild
+++ b/dev-ada/gprbuild/gprbuild-2016.ebuild
@@ -12,23 +12,20 @@ HOMEPAGE="http://libre.adacore.com/"
 SRC_URI="
        http://mirrors.cdn.adacore.com/art/57399662c7a447658e0affa8
                -> ${MYP}-src.tar.gz
-       bootstrap? (
-               http://mirrors.cdn.adacore.com/art/57399978c7a447658e0affc0
-               -> xmlada-gpl-${PV}-src.tar.gz )"
+       http://mirrors.cdn.adacore.com/art/57399978c7a447658e0affc0
+               -> xmlada-gpl-${PV}-src.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="bootstrap +gnat_2016 gnat_2017 +shared static static-pic"
+IUSE="+gnat_2016 gnat_2017"
 
-DEPEND="!bootstrap? ( dev-ada/xmlada[static,gnat_2016=,gnat_2017=] )
-       gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
+DEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
        gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}"/${MYP}-src
 
-REQUIRED_USE="bootstrap? ( !shared !static !static-pic )
-       ^^ ( gnat_2016 gnat_2017 )"
+REQUIRED_USE="^^ ( gnat_2016 gnat_2017 )"
 PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
 
 src_prepare() {
@@ -42,9 +39,7 @@ src_prepare() {
 }
 
 src_configure() {
-       if ! use bootstrap ; then
-               default
-       fi
+       :
 }
 
 bin_progs="gprbuild gprconfig gprclean gprinstall gprname gprls"
@@ -52,48 +47,30 @@ lib_progs="gprlib gprbind"
 
 src_compile() {
        GCC=${CHOST}-gcc-${GCC_PV}
-       if use bootstrap; then
-               GNATMAKE=${CHOST}-gnatmake-${GCC_PV}
-               local xmlada_src="../xmlada-gpl-${PV}-src"
-               incflags="-Isrc -Igpr/src -I${xmlada_src}/sax -I${xmlada_src}/dom \
-                       -I${xmlada_src}/schema -I${xmlada_src}/unicode \
-                       -I${xmlada_src}/input_sources"
-               ${GCC} -c ${CFLAGS} src/gpr_imports.c -o gpr_imports.o || die
-               for bin in ${bin_progs}; do
-                       ${GNATMAKE} -j$(makeopts_jobs) ${incflags} $ADAFLAGS ${bin}-main \
-                               -o ${bin} -largs gpr_imports.o || die
-               done
-               for lib in $lib_progs; do
-                       ${GNATMAKE} -j$(makeopts_jobs) ${incflags} ${lib} $ADAFLAGS \
-                               -largs gpr_imports.o || die
-               done
-       else
-               emake PROCESSORS=$(makeopts_jobs) all
-               for kind in shared static static-pic; do
-                       if use ${kind}; then
-                               emake PROCESSORS=$(makeopts_jobs) libgpr.build.${kind}
-                       fi
-               done
-       fi
+       GNATMAKE=${CHOST}-gnatmake-${GCC_PV}
+       local xmlada_src="../xmlada-gpl-${PV}-src"
+       incflags="-Isrc -Igpr/src -I${xmlada_src}/sax -I${xmlada_src}/dom \
+               -I${xmlada_src}/schema -I${xmlada_src}/unicode \
+               -I${xmlada_src}/input_sources"
+       ${GCC} -c ${CFLAGS} src/gpr_imports.c -o gpr_imports.o || die
+       for bin in ${bin_progs}; do
+               ${GNATMAKE} -j$(makeopts_jobs) ${incflags} $ADAFLAGS ${bin}-main \
+                       -o ${bin} -largs gpr_imports.o || die
+       done
+       for lib in $lib_progs; do
+               ${GNATMAKE} -j$(makeopts_jobs) ${incflags} ${lib} $ADAFLAGS \
+                       -largs gpr_imports.o || die
+       done
 }
 
 src_install() {
-       if use bootstrap; then
-               dobin ${bin_progs}
-               exeinto /usr/libexec/gprbuild
-               doexe ${lib_progs}
-               insinto /usr/share/gprconfig
-               doins share/gprconfig/*
-               insinto /usr/share/gpr
-               doins share/_default.gpr
-       else
-               default
-               for kind in shared static static-pic; do
-                       if use ${kind}; then
-                               emake DESTDIR="${D}" libgpr.install.${kind}
-                       fi
-               done
-       fi
+       dobin ${bin_progs}
+       exeinto /usr/libexec/gprbuild
+       doexe ${lib_progs}
+       insinto /usr/share/gprconfig
+       doins share/gprconfig/*
+       insinto /usr/share/gpr
+       doins share/_default.gpr
        insinto /usr/share/gprconfig
        doins gnat-${GCC_PV}.xml
        einstalldocs

diff --git a/dev-ada/gprbuild/gprbuild-2017.ebuild b/dev-ada/gprbuild/gprbuild-2017.ebuild
index 889b9667cf1ba5e6936bbe1304989ce5c6e5415f..8dfb66913524730598433630bcb5d8e748c934cb 100644 (file)
--- a/dev-ada/gprbuild/gprbuild-2017.ebuild
+++ b/dev-ada/gprbuild/gprbuild-2017.ebuild
@@ -12,23 +12,20 @@ HOMEPAGE="http://libre.adacore.com/"
 SRC_URI="
        http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deecff7
                -> ${MYP}-src.tar.gz
-       bootstrap? (
-               http://mirrors.cdn.adacore.com/art/591aeb88c7a4473fcbb154f8
-               -> xmlada-gpl-${PV}-src.tar.gz )"
+       http://mirrors.cdn.adacore.com/art/591aeb88c7a4473fcbb154f8
+               -> xmlada-gpl-${PV}-src.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="bootstrap gnat_2016 +gnat_2017 +shared static static-pic"
+IUSE="gnat_2016 +gnat_2017"
 
-DEPEND="!bootstrap? ( dev-ada/xmlada[static,gnat_2016=,gnat_2017=] )
-       gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
+DEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
        gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}"/${MYP}-src
 
-REQUIRED_USE="bootstrap? ( !shared !static !static-pic )
-       ^^ ( gnat_2016 gnat_2017 )"
+REQUIRED_USE="^^ ( gnat_2016 gnat_2017 )"
 PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
 
 src_prepare() {
@@ -50,58 +47,30 @@ lib_progs="gprlib gprbind"
 
 src_compile() {
        GCC=${CHOST}-gcc-${GCC_PV}
-       if use bootstrap; then
-               GNATMAKE=${CHOST}-gnatmake-${GCC_PV}
-               local xmlada_src="../xmlada-gpl-${PV}-src"
-               incflags="-Isrc -Igpr/src -I${xmlada_src}/sax -I${xmlada_src}/dom \
-                       -I${xmlada_src}/schema -I${xmlada_src}/unicode \
-                       -I${xmlada_src}/input_sources"
-               ${GCC} -c ${CFLAGS} gpr/src/gpr_imports.c -o gpr_imports.o || die
-               for bin in ${bin_progs}; do
-                       ${GNATMAKE} -j$(makeopts_jobs) ${incflags} $ADAFLAGS ${bin}-main \
-                               -o ${bin} -largs gpr_imports.o || die
-               done
-               for lib in $lib_progs; do
-                       ${GNATMAKE} -j$(makeopts_jobs) ${incflags} ${lib} $ADAFLAGS \
-                               -largs gpr_imports.o || die
-               done
-       else
-               gprbuild -p -m -j$(makeopts_jobs) -XBUILD=production -v \
-                       gprbuild.gpr -XLIBRARY_TYPE=static -XXMLADA_BUILD=static \
-                       -cargs:C ${CFLAGS} -cargs:Ada ${ADAFLAGS} || die
-               if use shared; then
-                       gprbuild -p -m -j$(makeopts_jobs) -XBUILD=production -v \
-                               -XLIBRARY_TYPE=relocatable -XXMLADA_BUILD=relocatable \
-                               gpr/gpr.gpr -cargs:C ${CFLAGS} -cargs:Ada ${ADAFLAGS} || die
-               fi
-               for kind in static static-pic; do
-                       if use ${kind}; then
-                               gprbuild -p -m -j$(makeopts_jobs) -XBUILD=production -v \
-                                       -XLIBRARY_TYPE=${kind} -XXMLADA_BUILD=${kind} gpr/gpr.gpr \
-                                       -cargs:C ${CFLAGS} -cargs:Ada ${ADAFLAGS} || die
-                       fi
-               done
-       fi
+       GNATMAKE=${CHOST}-gnatmake-${GCC_PV}
+       local xmlada_src="../xmlada-gpl-${PV}-src"
+       incflags="-Isrc -Igpr/src -I${xmlada_src}/sax -I${xmlada_src}/dom \
+               -I${xmlada_src}/schema -I${xmlada_src}/unicode \
+               -I${xmlada_src}/input_sources"
+       ${GCC} -c ${CFLAGS} gpr/src/gpr_imports.c -o gpr_imports.o || die
+       for bin in ${bin_progs}; do
+               ${GNATMAKE} -j$(makeopts_jobs) ${incflags} $ADAFLAGS ${bin}-main \
+                       -o ${bin} -largs gpr_imports.o || die
+       done
+       for lib in $lib_progs; do
+               ${GNATMAKE} -j$(makeopts_jobs) ${incflags} ${lib} $ADAFLAGS \
+                       -largs gpr_imports.o || die
+       done
 }
 
 src_install() {
-       if use bootstrap; then
-               dobin ${bin_progs}
-               exeinto /usr/libexec/gprbuild
-               doexe ${lib_progs}
-               insinto /usr/share/gprconfig
-               doins share/gprconfig/*
-               insinto /usr/share/gpr
-               doins share/_default.gpr
-       else
-               default
-               for kind in shared static static-pic; do
-                       if use ${kind}; then
-                               emake DESTDIR="${D}" libgpr.install.${kind}
-                       fi
-               done
-               rm "${D}"usr/doinstall || die
-       fi
+       dobin ${bin_progs}
+       exeinto /usr/libexec/gprbuild
+       doexe ${lib_progs}
+       insinto /usr/share/gprconfig
+       doins share/gprconfig/*
+       insinto /usr/share/gpr
+       doins share/_default.gpr
        insinto /usr/share/gprconfig
        doins gnat-${GCC_PV}.xml
        einstalldocs

diff --git a/dev-ada/gprbuild/metadata.xml b/dev-ada/gprbuild/metadata.xml
index 4cf88165a988356f9537ead435a024a587079805..4540dd6e09e33f9ee9b65189079e52a01d70e7cb 100644 (file)
--- a/dev-ada/gprbuild/metadata.xml
+++ b/dev-ada/gprbuild/metadata.xml
@@ -8,9 +8,6 @@
        <use>
                <flag name="gnat_2016">Compile with dev-lang/gnat-gpl-2016</flag>
                <flag name="gnat_2017">Compile with dev-lang/gnat-gpl-2017</flag>
-               <flag name="shared">Build shared library</flag>
-               <flag name="static">Build static library</flag>
-               <flag name="static-pic">Build static library with pic code</flag>
        </use>
        <longdescription lang="en">
                GPRbuild is an advanced software tool designed to help automate the