From 66c86278b6d3667532d4a1c8a99b842b99d940ec Mon Sep 17 00:00:00 2001 From: Tupone Alfredo Date: Tue, 27 Aug 2019 09:03:32 +0200 Subject: dev-ada/gprbuild: remove unused version Package-Manager: Portage-2.3.66, Repoman-2.3.16 Signed-off-by: Alfredo Tupone --- dev-ada/gprbuild/Manifest | 2 - dev-ada/gprbuild/files/gprbuild-2018-gentoo.patch | 284 ---------------------- dev-ada/gprbuild/gprbuild-2018-r3.ebuild | 86 ------- dev-ada/gprbuild/gprbuild-2018-r4.ebuild | 89 ------- 4 files changed, 461 deletions(-) delete mode 100644 dev-ada/gprbuild/files/gprbuild-2018-gentoo.patch delete mode 100644 dev-ada/gprbuild/gprbuild-2018-r3.ebuild delete mode 100644 dev-ada/gprbuild/gprbuild-2018-r4.ebuild (limited to 'dev-ada/gprbuild') diff --git a/dev-ada/gprbuild/Manifest b/dev-ada/gprbuild/Manifest index 06e3942bc690..492408c6c4be 100644 --- a/dev-ada/gprbuild/Manifest +++ b/dev-ada/gprbuild/Manifest @@ -1,6 +1,4 @@ DIST gprbuild-2019-20190517-194D8-src.tar.gz 2507961 BLAKE2B 0f70d94cb0db9ddc1dd308862aaa305a91965a62a936cfbdde2ae9f3f735f0cc3d69596b09da4b979a1d7923087ab0ec5cf2d6541551f057b5e8e0c499065a90 SHA512 0388d7e6cdf625fef40b33da764091b3283dd88714c64ecfad4b5e99253f183b1a9b717c19281e6d45cc4277a05fadb2e2ace394d6f30638664b66c97123052b DIST gprbuild-gpl-2017-src.tar.gz 2454957 BLAKE2B 890e5aa29e9f8fa8b140988ee8e5d6042640c34fe0877acde959de803bf690bb33c63b1c7e7db486f804882bddd77ab76ffbaa4dd27da327e21ed0376cadb99d SHA512 12f3682d64ce0718de4940c1e71a4380b20021805d88543842dbf3b5ce5d518c23a6b2d868565579baf81efa1d8cf05c7778253162f0df5d7adc0eb1865c9f88 -DIST gprbuild-gpl-2018-src.tar.gz 2479651 BLAKE2B b0e24f4d97f06fe84569f8f0284e1028fce8e4ae90cfd27ab31ada0988f4f1b37eca4868bc212a21d26fb1a0a7ba6f031062e16d9758ab211e2fee40e25077ab SHA512 d22c0133baa6a0b626a0c1d145b21865bd0699cd8155ca22727272b0f8988c78163410b432ae148e87099e931df19d51ea867981556c79cb1cceb25456333044 DIST xmlada-2019-20190429-19B9D-src.tar.gz 1582603 BLAKE2B e2be3e7c0c8b843bfc808a3dd726235a82588caed8c919975a97ce34c72d6d634361bbc34208590210936add9e2f881b59d01168ef79abed1e489c50b27094d8 SHA512 f8e0e25b0aee9a7a18223ae7761603082af55134f062c767d0cd0dbf0dbcb2058fc7c57532b567fb2c6efa464a53ead57b300578e98962025866e5c3ad73e380 DIST xmlada-gpl-2017-src.tar.gz 1578393 BLAKE2B 7b4894040b6044e86c96cbd530ebda5c0cfc4ad0e2b472d46798a93f535aca0916b03385a3aef49bd4e59d508a9665c856360e9cab0a4f67b15091228b629d81 SHA512 371f6adc01550a4bb13204ec0404dc1165438db595f4346813e5a23a155de74c857c40c55adde173919c2fe35b3b91d78b235c9718ee86bc848e62ddfd7fa2b4 -DIST xmlada-gpl-2018-src.tar.gz 1582215 BLAKE2B 11012dab19f45507eeb5ce6ebec9a77ceb5dfb7749960922f0f48bb1b0409305fd43466a7af90b48ff0a0cf58612e8859274a92e0fe272b4e57a59b92a1725f1 SHA512 8970c4e68defad66625c1110554dadfc485fbbe42e832987593cf727e98f13dd87c90b84461187dbbe2b1051831e6e70f9f53d6a0cfc07451726d601b2856430 diff --git a/dev-ada/gprbuild/files/gprbuild-2018-gentoo.patch b/dev-ada/gprbuild/files/gprbuild-2018-gentoo.patch deleted file mode 100644 index 34936ea1f52b..000000000000 --- a/dev-ada/gprbuild/files/gprbuild-2018-gentoo.patch +++ /dev/null @@ -1,284 +0,0 @@ ---- a/gpr/gpr.gpr 2017-05-27 20:59:07.061135892 +0200 -+++ b/gpr/gpr.gpr 2017-05-27 20:59:38.022638398 +0200 -@@ -67,6 +67,7 @@ - for Switches ("gpr*.ad?") use - Compiler'Default_Switches ("Ada") & ("-g1"); - end case; -+ for Driver ("C") use External ("CC", "gcc"); - end Compiler; - - end GPR; ---- a/gpr/src/gpr-names.ads 2017-11-19 13:09:18.947527738 +0100 -+++ b/gpr/src/gpr-names.ads 2017-11-19 13:10:08.125654595 +0100 -@@ -27,6 +27,8 @@ - Name_Buffer : String (1 .. 1_000_000); - Name_Len : Natural := 0; - -+ Last_Id : Name_Id := Name_Id'First; -+ - procedure Get_Name_String (Id : Name_Id); - procedure Get_Name_String (Id : Unit_Name_Type); - procedure Get_Name_String (Id : File_Name_Type); ---- a/gpr/src/gpr-names.adb 2017-11-19 13:10:27.674316703 +0100 -+++ b/gpr/src/gpr-names.adb 2017-11-19 13:14:38.360963627 +0100 -@@ -354,6 +354,8 @@ - - Name_Chars.Append (ASCII.NUL); - -+ Last_Id := Name_Entries.Last; -+ - return Name_Entries.Last; - end Name_Enter; - -@@ -427,6 +429,8 @@ - - Name_Chars.Append (ASCII.NUL); - -+ Last_Id := Name_Entries.Last; -+ - return Name_Entries.Last; - end Name_Find; - ---- a/gpr/src/gpr-snames.adb 2017-11-19 13:12:41.592995718 +0100 -+++ b/gpr/src/gpr-snames.adb 2017-11-19 13:16:31.980979696 +0100 -@@ -53,6 +53,10 @@ - return; - end if; - -+ if Last_Id = Name_Id'First then -+ Add_Name (""); -+ end if; -+ - Add_Name ("a"); - Add_Name ("b"); - Add_Name ("c"); ---- a/src/gprlib.adb 2017-12-18 12:20:02.937317216 +0100 -+++ b/src/gprlib.adb 2017-12-18 12:21:36.519604590 +0100 -@@ -263,7 +263,9 @@ - - Driver_Name : Name_Id := No_Name; - -- Gnatbind_Name : String_Access := new String'("gnatbind"); -+ Gnatbind_Name : String_Access := new String'("@GNATBIND@"); -+ -+ Gnatbind_Path_Option : constant String := "--gnatbind_path="; - - Compiler_Name : String_Access := new String'("gcc"); - -@@ -1944,13 +1946,13 @@ - and then Line (Last - 2 .. Last) = "gcc" - then - Gnatbind_Name := -- new String'(Line (1 .. Last - 3) & "gnatbind"); -+ new String'(Line (1 .. Last - 3) & "@GNATBIND@"); - - elsif Last > 7 - and then Line (Last - 6 .. Last) = "gcc.exe" - then - Gnatbind_Name := -- new String'(Line (1 .. Last - 7) & "gnatbind"); -+ new String'(Line (1 .. Last - 7) & "@GNATBIND@"); - end if; - end if; - -@@ -2100,7 +2102,13 @@ - Mapping_File_Name := new String'(Line (1 .. Last)); - - when Binding_Options => -- Binding_Options_Table.Append (Line (1 .. Last)); -+ if Last > Gnatbind_Path_Option'Length -+ and then Line (1 .. Gnatbind_Path_Option'Length) = -+ Gnatbind_Path_Option then -+ null; -+ else -+ Binding_Options_Table.Append (Line (1 .. Last)); -+ end if; - - when Copy_Source_Dir => - Copy_Source_Directory := new String'(Line (1 .. Last)); ---- a/share/gprconfig/compilers.xml 2018-10-17 14:36:15.100480516 +0200 -+++ b/share/gprconfig/compilers.xml 2018-10-17 15:38:57.333256634 +0200 -@@ -20,15 +20,15 @@ - - - GCC -- (.*-wrs-.*|.*-sysgo.*|.*-elf-.*|.*-eabi-.*|.*-eabispe-.*|avr-.*|.*-elinos-linux.*|.*-generic-linux-gnu-|.*-pc-mingw32.*|.*-xcoff-.*|arm-linux-androideabi-|arm-linux-gnueabi-|arm-linux-gnueabihf-|e500v2-gnu-linux-|powerpc-.*-linux.*-|.*-darwin.*-|aarch64-linux-gnu-)?gcc -+ (.*-wrs-.*|.*-sysgo.*|.*-elf-.*|.*-eabi-.*|.*-eabispe-.*|avr-.*|.*-elinos-linux.*|.*-generic-linux-gnu-|.*-pc-mingw32.*|.*-xcoff-.*|arm-linux-androideabi-|arm-linux-gnueabi-|arm-linux-gnueabihf-|e500v2-gnu-linux-|powerpc-.*-linux.*-|.*-darwin.*-|aarch64-linux-gnu-)?gcc-@VER@ - -- ${PREFIX}gcc -v -+ ${PREFIX}gcc-@VER@ -v - - - - C - -- ${PREFIX}gcc -dumpmachine -+ ${PREFIX}gcc-@VER@ -dumpmachine - - - -@@ -170,14 +170,14 @@ - --> - - GNAT -- (.*-wrs-.*|.*-sysgo.*|.*-elf-.*|.*-eabi-.*|.*-eabispe-.*|avr-.*|.*-elinos-linux.*|.*-generic-linux-gnu-|.*-pc-mingw32.*|.*-xcoff-.*|arm-linux-androideabi-|arm-linux-gnueabi-|arm-linux-gnueabihf-|e500v2-gnu-linux-|powerpc-.*-linux.*-|.*-darwin.*-|aarch64-linux-gnu-|.*-qnx.*)?gnatls -+ (.*-wrs-.*|.*-sysgo.*|.*-elf-.*|.*-eabi-.*|.*-eabispe-.*|avr-.*|.*-elinos-linux.*|.*-generic-linux-gnu-|.*-pc-mingw32.*|.*-xcoff-.*|arm-linux-androideabi-|arm-linux-gnueabi-|arm-linux-gnueabihf-|e500v2-gnu-linux-|powerpc-.*-linux.*-|.*-darwin.*-|aarch64-linux-gnu-|.*-qnx.*)?gnatls-@VER@ - -- ${PREFIX}gnatls -v --version -+ ${PREFIX}gnatls-@VER@ -v --version - - - Ada - -- ${PREFIX}gcc -v -+ ${PREFIX}gcc-@VER@ -v - - - -@@ -187,71 +187,11 @@ - \.\./$TARGET/lib/gnat/(.*)/adalib/ - - -- ${PREFIX}gcc -dumpmachine -+ ${PREFIX}gcc-@VER@ -dumpmachine - - - - -- -- -- -- GNAT_CODEPEER -- (.*codepeer-)gnatls -- -- ${PREFIX}gnatls -v -- -- -- Ada -- -- ${PREFIX}gcc -v -- -- -- -- \.\./lib/gcc/.*/$gcc_version/adalib/ -- \.\./lib/gnat/(.*)/adalib/ -- \.\./lib/gcc/.*/$gcc_version/rts-(.*)/adalib/ -- -- codepeer -- -- -- -- -- -- GNAT_C -- (c-)gnatls -- -- ${PREFIX}gnatls -v -- -- -- Ada -- -- ${PREFIX}gcc -v -- -- -- -- \.\./libexec/gnat_ccg/lib/gcc/.*/$gcc_version/adalib/ -- \.\./lib/gnat/(.*)/adalib/ -- -- c -- -- -- -- -- -- GNAT_DOTNET -- (.*dotnet-)gnatls -- -- ${PREFIX}gnatls -v -- -- -- Ada -- -- \.\./lib/dotgnat/adalib/ -- \.\./lib/dotgnat/rts-(.*)/adalib/ -- -- dotnet -- -- - - - G77 -@@ -295,21 +295,6 @@ - - - -- -- -- LLVM -- clang -- -- clang -v -- -- -- C -- -- clang -dumpmachine -- -- -- -- - - - WINDRES ---- a/share/gprconfig/gnat.xml 2018-10-17 18:38:35.547094541 +0200 -+++ b/share/gprconfig/gnat.xml 2018-10-17 18:40:16.281379341 +0200 -@@ -60,7 +60,7 @@ - &filter_gnat; - - package Compiler is -- for Driver ("Ada") use "${PATH(ada)}${PREFIX(ada)}gcc"; -+ for Driver ("Ada") use "${PATH(ada)}${PREFIX(ada)}gcc-@VER@"; - for Language_Kind ("Ada") use "unit_based"; - for Dependency_Kind ("Ada") use "ALI_File"; - for Leading_Required_Switches ("Ada") use -@@ -77,6 +77,9 @@ - for Objects_Path_File ("Ada") use "ADA_PRJ_OBJECTS_FILE"; - for Driver ("Ada") use - "${GPRCONFIG_PREFIX}libexec/gprbuild/gprbind"; -+ for Switches ("Ada") use ("--gnatbind_path=gnatbind-@VER@"); -+ for Required_Switches ("Ada") use -+ Binder'Required_Switches ("Ada") & ("--RTS=${RUNTIME_DIR(ada)}"); - end Binder; - - for Toolchain_Version ("Ada") use "GNAT ${VERSION(ada)}"; ---- a/share/gprconfig/c.xml 2018-10-17 21:31:44.442501471 +0200 -+++ b/share/gprconfig/c.xml 2018-10-17 21:33:06.562088044 +0200 -@@ -14,7 +14,7 @@ - - - package Compiler is -- for Driver ("C") use "${PATH(c)}${PREFIX(c)}gcc"; -+ for Driver ("C") use "${PATH(c)}${PREFIX(c)}gcc-@VER@"; - end Compiler; - - ---- a/share/gprconfig/linker.xml 2018-10-17 21:36:15.856883517 +0200 -+++ b/share/gprconfig/linker.xml 2018-10-17 21:35:15.985896804 +0200 -@@ -1025,7 +1025,7 @@ - - - for Library_Partial_Linker use -- ("${PATH(ada)}${PREFIX(ada)}gcc", "-nostdlib", "-Wl,-r", "-o"); -+ ("${PATH(ada)}${PREFIX(ada)}gcc-@VER@", "-nostdlib", "-Wl,-r", "-no-pie", "-o"); - - - -@@ -1044,7 +1044,7 @@ - - - for Library_Partial_Linker use -- ("${PATH(c)}${PREFIX(c)}gcc", "-nostdlib", "-Wl,-r", "-o"); -+ ("${PATH(c)}${PREFIX(c)}gcc-@VER@", "-nostdlib", "-Wl,-r", "-no-pie", "-o"); - - - diff --git a/dev-ada/gprbuild/gprbuild-2018-r3.ebuild b/dev-ada/gprbuild/gprbuild-2018-r3.ebuild deleted file mode 100644 index a1157f5c3701..000000000000 --- a/dev-ada/gprbuild/gprbuild-2018-r3.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs multiprocessing - -MYP=${PN}-gpl-${PV} - -DESCRIPTION="Multi-Language Management" -HOMEPAGE="http://libre.adacore.com/" -SRC_URI=" - http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27a68 - -> ${MYP}-src.tar.gz - http://mirrors.cdn.adacore.com/art/5b0819dec7a447df26c27a40 - -> xmlada-gpl-${PV}-src.tar.gz" -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="gnat_2016 gnat_2017 +gnat_2018" - -DEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) - gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) - gnat_2018? ( dev-lang/gnat-gpl:7.3.1 )" -RDEPEND="${DEPEND}" - -S="${WORKDIR}"/${MYP}-src - -REQUIRED_USE="!gnat_2016 ^^ ( gnat_2017 gnat_2018 )" -PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) - -src_prepare() { - if use gnat_2017; then - GCC_PV=6.3.0 - else - GCC_PV=7.3.1 - fi - default - sed -i \ - -e "s:@VER@:${GCC_PV}:g" \ - share/gprconfig/compilers.xml \ - share/gprconfig/gnat.xml \ - share/gprconfig/c.xml \ - share/gprconfig/linker.xml \ - || die - sed -i \ - -e "s:@GNATBIND@:gnatbind-${GCC_PV}:g" \ - src/gprlib.adb \ - || die -} - -src_configure() { - emake prefix="${D}"usr setup -} - -bin_progs="gprbuild gprconfig gprclean gprinstall gprname gprls" -lib_progs="gprlib gprbind" - -src_compile() { - GCC=${CHOST}-gcc-${GCC_PV} - 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() { - 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 - einstalldocs -} diff --git a/dev-ada/gprbuild/gprbuild-2018-r4.ebuild b/dev-ada/gprbuild/gprbuild-2018-r4.ebuild deleted file mode 100644 index de11e09704d2..000000000000 --- a/dev-ada/gprbuild/gprbuild-2018-r4.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs multiprocessing - -MYP=${PN}-gpl-${PV} - -DESCRIPTION="Multi-Language Management" -HOMEPAGE="http://libre.adacore.com/" -SRC_URI=" - http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27a68 - -> ${MYP}-src.tar.gz - http://mirrors.cdn.adacore.com/art/5b0819dec7a447df26c27a40 - -> xmlada-gpl-${PV}-src.tar.gz" -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="gnat_2016 gnat_2017 +gnat_2018 gnat_2019" - -DEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) - gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) - gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) - gnat_2019? ( dev-lang/gnat-gpl:8.3.1 )" -RDEPEND="${DEPEND}" - -S="${WORKDIR}"/${MYP}-src - -REQUIRED_USE="!gnat_2016 ^^ ( gnat_2017 gnat_2018 gnat_2019 )" -PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) - -src_prepare() { - if use gnat_2017; then - GCC_PV=6.3.0 - elif use gnat_2018; then - GCC_PV=7.3.1 - else - GCC_PV=8.3.1 - fi - default - sed -i \ - -e "s:@VER@:${GCC_PV}:g" \ - share/gprconfig/compilers.xml \ - share/gprconfig/gnat.xml \ - share/gprconfig/c.xml \ - share/gprconfig/linker.xml \ - || die - sed -i \ - -e "s:@GNATBIND@:gnatbind-${GCC_PV}:g" \ - src/gprlib.adb \ - || die -} - -src_configure() { - emake prefix="${D}"usr setup -} - -bin_progs="gprbuild gprconfig gprclean gprinstall gprname gprls" -lib_progs="gprlib gprbind" - -src_compile() { - GCC=${CHOST}-gcc-${GCC_PV} - 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() { - 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 - einstalldocs -} -- cgit v1.2.3-65-gdbad