dev-ada/gnatcoll: drop last-rited package
authorAaron Bauman <bman@gentoo.org>
Tue, 3 Dec 2019 01:48:01 +0000 (20:48 -0500)
committerAaron Bauman <bman@gentoo.org>
Tue, 3 Dec 2019 01:48:01 +0000 (20:48 -0500)
Signed-off-by: Aaron Bauman <bman@gentoo.org>
dev-ada/gnatcoll/Manifest [deleted file]
dev-ada/gnatcoll/files/gnatcoll-2017-gentoo.patch [deleted file]
dev-ada/gnatcoll/files/gnatcoll-2017-r1-gentoo.patch [deleted file]
dev-ada/gnatcoll/gnatcoll-2017-r1.ebuild [deleted file]
dev-ada/gnatcoll/gnatcoll-2017.ebuild [deleted file]
dev-ada/gnatcoll/metadata.xml [deleted file]
profiles/package.mask

diff --git a/dev-ada/gnatcoll/Manifest b/dev-ada/gnatcoll/Manifest
deleted file mode 100644 (file)
index 3fb4963..0000000
+++ /dev/null
@@ -1 +0,0 @@
-DIST gnatcoll-gpl-2017-src.tar.gz 5785988 BLAKE2B 828aff797f7d992bf3f5dda7f8ce8a79e97ecd98253a657fb6e79a2fd08aac97e19cb421f47010f8c1f26442a013b9126ab3a95353d9ce0f29d071601e9dfe2f SHA512 e8b7f2c00816597f33496168bf8928841a2037e517908810761849e23633b2c229d47e4bfaa808e5a619da52bc165f17b8aefa5dee39ecf1a6773b3b1db80363
diff --git a/dev-ada/gnatcoll/files/gnatcoll-2017-gentoo.patch b/dev-ada/gnatcoll/files/gnatcoll-2017-gentoo.patch
deleted file mode 100644 (file)
index f0ec53f..0000000
+++ /dev/null
@@ -1,206 +0,0 @@
---- a/Makefile 2017-01-20 19:39:07.131398270 +0100
-+++ b/Makefile 2017-01-20 19:42:30.088728844 +0100
-@@ -43,18 +43,18 @@
- # Build either type of library. The argument (%) is the type of library to build
--GPRBLD_OPTS=-p -m -j${PROCESSORS} -XLIBRARY_TYPE=$(@F) -XGnatcoll_Build=${Gnatcoll_Build} -XXMLADA_BUILD=$(@F)
-+GPRBLD_OPTS=-p -m -j${PROCESSORS} -XGPR_BUILD=$(@F) -XLIBRARY_TYPE=$(@F) -XGnatcoll_Build=${Gnatcoll_Build} -XXMLADA_BUILD=$(@F)
- build_library_type/%: generate_sources
-       @${RM} src/gnatcoll-atomic.adb
-       @echo "====== Building $(@F) libraries ======"
--      ${GPRBUILD} ${GPRBLD_OPTS} -Pgnatcoll_full
-+      ${GPRBUILD} ${GPRBLD_OPTS} -Pgnatcoll_full -v -cargs ${ADAFLAGS}
-       @# Need to build libgnatcoll_gtk separately, because its project files
-       @# requires gtkada.gpr, which might not exist on the machine.
- ifeq (${WITH_GTK},yes)
--      ${GPRBUILD} ${GPRBLD_OPTS} -Psrc/gnatcoll_gtk
-+      ${GPRBUILD} ${GPRBLD_OPTS} -Psrc/gnatcoll_gtk -v -cargs ${ADAFLAGS}
- endif
- build_tools/%: build_library_type/%
-@@ -63,13 +63,14 @@
-       @# They are not build as part of the above because only the Main from
-       @# gnatcoll_full.gpr are build. We could use aggregate projects to
-       @# speed things up.
--      ${GPRBUILD} ${GPRBLD_OPTS} -q -Psrc/gnatcoll_tools
-+      ${GPRBUILD} ${GPRBLD_OPTS} -q -Psrc/gnatcoll_tools -v -cargs ${ADAFLAGS}
- #######################################################################
- #  install
- GPRINST_OPTS=-p -f --prefix=${prefix} --install-name=gnatcoll \
-       --exec-subdir=${bindir} --project-subdir=lib/gnat -XXMLADA_BUILD=$(@F) \
-+      -XGPR_BUILD=$(@F) \
-       --build-var=LIBRARY_TYPE --build-name=$(@F) -XLIBRARY_TYPE=$(@F)
- install-clean:
---- a/gnatcoll_shared.gpr.in   2017-01-20 19:50:03.222808656 +0100
-+++ b/gnatcoll_shared.gpr.in   2017-01-20 19:50:28.200399274 +0100
-@@ -13,7 +13,7 @@
-    type Yes_No is ("yes", "no");
-    Gtk       : Yes_No := External ("GTK", "@WITH_GTK@");
--   Python    : Yes_No := External ("PYTHON", "@WITH_PYTHON@");
-+   Python    : Yes_No := "@WITH_PYTHON@"; 
-    Syslog    : Yes_No := External ("SYSLOG", "@WITH_SYSLOG@");
-    Postgres  : Yes_No := External ("POSTGRES", "@WITH_POSTGRES@");
-    type Sqlite_Inclusion is ("yes", "no", "embedded");
---- a/aclocal.m4       2017-04-06 08:25:14.796699365 +0200
-+++ b/aclocal.m4       2017-04-06 08:25:36.622318016 +0200
-@@ -45,7 +45,7 @@
-    cat > conftest.ada <<EOF
- [$3]
- EOF
--   if AC_TRY_COMMAND([gnatchop -q conftest.ada && $1 $2 >/dev/null 2>conftest.out])
-+   if AC_TRY_COMMAND([${GNATCHOP} -q conftest.ada && $1 $2 >/dev/null 2>conftest.out])
-    then
-       : Success
-       $4
-@@ -68,7 +68,7 @@
- AC_DEFUN(AM_HAS_INTRINSIC_SYNC_COUNTERS,
- [
-   AC_MSG_CHECKING([whether platform supports atomic inc/dec])
--  AM_TRY_ADA([gnatmake], [check.adb],
-+  AM_TRY_ADA([${GNATMAKE}], [check.adb],
- [
- with Interfaces; use Interfaces;
- procedure Check is
---- a/testsuite/json/__init__.py       2017-04-24 17:52:34.158513249 +0200
-+++ b/testsuite/json/__init__.py       2017-04-24 17:52:52.636207017 +0200
-@@ -21,7 +21,7 @@
-     @requires_not_aix    # Storage_Error on that machine
-     @chdir("MB28-001")
-     def test_MB28_001(self):
--        self.runexec(["python", "make_json.py"])
-+        self.runexec(["python2.7", "make_json.py"])
-         self.gprbuild()
-         self.runexec("json_stack_test", "test.out")
---- a/testsuite/projects/__init__.py   2017-04-24 19:10:30.465246199 +0200
-+++ b/testsuite/projects/__init__.py   2017-04-24 19:10:42.768035080 +0200
-@@ -105,25 +105,6 @@
-         self.gprbuild("default.gpr")
-         self.runexec("main", "")
--    @support.requires_not_windows
--    @chdir("N918-040")
--    def test_bareboard(self):
--        self.create_fake_bb_compiler('install', 'arm-eabi', '6.1.0w', '3.4.6')
--
--        # Make sure auto.cgpr is not deleted on exit
--        try:
--            os.unlink('auto.cgpr')
--        except:
--            pass
--        self.gprbuild('main_prj', switches=['--autoconf=auto.cgpr'])
--        m = re.search('for Target use "(.*?)"', open('auto.cgpr').read())
--        target = m.group(1)
--
--        def customFilter(actual):
--            return actual.replace(target, "<native>")
--
--        self.runexec(['sh', 'test.sh'], 'test.out', customFilter=customFilter)
--
-     @chdir("NB12-045")
-     def test_NB12_045(self):
-         # Test registering attribute in unknown package
---- a/src/tools/gnatcoll_db2ada.adb    2017-04-24 21:36:09.193973179 +0200
-+++ b/src/tools/gnatcoll_db2ada.adb    2017-04-24 21:36:16.029858932 +0200
-@@ -211,7 +211,7 @@
-       declare
-          Output : constant String := Get_Command_Output
--           (Command     => "python",
-+           (Command     => "python2.7",
-             Arguments   => Args,
-             Input       => "",
-             Status      => Status'Access,
---- a/src/gnatcoll-projects.ads        2017-11-25 14:50:06.919939453 +0100
-+++ b/src/gnatcoll-projects.ads        2017-11-25 14:50:38.932387204 +0100
-@@ -1917,7 +1917,8 @@
-       Predefined_Source_Files : GNATCOLL.VFS.File_Array_Access;
-       --  The list of source files in Predefined_Source_Path
--      Default_Gnatls : GNAT.Strings.String_Access := new String'("gnatls");
-+      Default_Gnatls : GNAT.Strings.String_Access :=
-+         new String'("@GNATLS@");
-       --  The default gnatls command to run.
-       Xrefs_Subdir : GNAT.Strings.String_Access;
---- a/src/tools/gnatinspect.adb        2017-11-25 14:52:47.282170250 +0100
-+++ b/src/tools/gnatinspect.adb        2017-11-25 14:52:57.691990254 +0100
-@@ -642,7 +642,7 @@
-       GNAT_Version : GNAT.Strings.String_Access;
-    begin
-       Env.Set_Path_From_Gnatls
--        (Gnatls       => "gnatls",
-+        (Gnatls       => "@GNATLS@",
-          GNAT_Version => GNAT_Version,
-          Errors       => Local_On_Error'Unrestricted_Access);
-       Free (GNAT_Version);
---- a/src/gnatcoll-projects.adb        2018-11-14 18:47:27.760365233 +0100
-+++ b/src/gnatcoll-projects.adb        2018-11-14 19:10:43.961337201 +0100
-@@ -3273,9 +3273,9 @@
-       Status                   : out Status_Type;
-       Result                   : out GNATCOLL.VFS.File_Array_Access)
-    is
--      Mains_Str_List : String_List_Access;
-+      Mains_Str_List : String_Vectors.Vector;
-       Closure_Status : GPR.Util.Status_Type;
--      Closures_List  : String_List_Access;
-+      Closures_List  : String_Vectors.Vector;
-    begin
-       Trace (Me, "Get_Closures");
-@@ -3287,25 +3287,18 @@
-          return;
-       end if;
--      Mains_Str_List := new String_List (Mains'First .. Mains'Last);
-       for I in Mains'Range loop
--         Mains_Str_List (I) := new String'(Mains (I).Display_Base_Name);
-+         Mains_Str_List.Append (Mains (I).Display_Base_Name);
-       end loop;
-       GPR.Util.Get_Closures
-         (Project.Get_View, Project.Tree_View,
--         Mains                    => Mains_Str_List.all,
-+         Mains                    => Mains_Str_List,
-          All_Projects             => All_Projects,
-          Include_Externally_Built => Include_Externally_Built,
-          Status                   => Closure_Status,
-          Result                   => Closures_List);
--      --  Freeing temporary list of mains.
--      for I in Mains_Str_List'Range loop
--         Free (Mains_Str_List (I));
--      end loop;
--      Free (Mains_Str_List);
--
-       case Closure_Status is
-          when Success =>
-             Status := Success;
-@@ -3321,17 +3314,10 @@
-       end case;
-       if Closure_Status in Success | Incomplete_Closure then
--         for I in Closures_List'Range loop
--            Append (Result, Create (+Closures_List (I).all));
-+         for Closure of Closures_List loop
-+            Append (Result, Create (+Closure));
-          end loop;
-       end if;
--
--      --  Freeing temporary list of closures.
--      for I in Closures_List'Range loop
--         Free (Closures_List (I));
--      end loop;
--      Free (Closures_List);
--
-    end Get_Closures;
-    ----------------
diff --git a/dev-ada/gnatcoll/files/gnatcoll-2017-r1-gentoo.patch b/dev-ada/gnatcoll/files/gnatcoll-2017-r1-gentoo.patch
deleted file mode 100644 (file)
index b8b92e4..0000000
+++ /dev/null
@@ -1,186 +0,0 @@
---- a/Makefile 2017-01-20 19:39:07.131398270 +0100
-+++ b/Makefile 2017-01-20 19:42:30.088728844 +0100
-@@ -43,18 +43,18 @@
- # Build either type of library. The argument (%) is the type of library to build
--GPRBLD_OPTS=-p -m -j${PROCESSORS} -XLIBRARY_TYPE=$(@F) -XGnatcoll_Build=${Gnatcoll_Build} -XXMLADA_BUILD=$(@F)
-+GPRBLD_OPTS=-p -m -j${PROCESSORS} -XGPR_BUILD=$(@F) -XLIBRARY_TYPE=$(@F) -XGnatcoll_Build=${Gnatcoll_Build} -XXMLADA_BUILD=$(@F)
- build_library_type/%: generate_sources
-       @${RM} src/gnatcoll-atomic.adb
-       @echo "====== Building $(@F) libraries ======"
--      ${GPRBUILD} ${GPRBLD_OPTS} -Pgnatcoll_full
-+      ${GPRBUILD} ${GPRBLD_OPTS} -Pgnatcoll_full -v -cargs ${ADAFLAGS}
-       @# Need to build libgnatcoll_gtk separately, because its project files
-       @# requires gtkada.gpr, which might not exist on the machine.
- ifeq (${WITH_GTK},yes)
--      ${GPRBUILD} ${GPRBLD_OPTS} -Psrc/gnatcoll_gtk
-+      ${GPRBUILD} ${GPRBLD_OPTS} -Psrc/gnatcoll_gtk -v -cargs ${ADAFLAGS}
- endif
- build_tools/%: build_library_type/%
-@@ -63,13 +63,14 @@
-       @# They are not build as part of the above because only the Main from
-       @# gnatcoll_full.gpr are build. We could use aggregate projects to
-       @# speed things up.
--      ${GPRBUILD} ${GPRBLD_OPTS} -q -Psrc/gnatcoll_tools
-+      ${GPRBUILD} ${GPRBLD_OPTS} -q -Psrc/gnatcoll_tools -v -cargs ${ADAFLAGS}
- #######################################################################
- #  install
- GPRINST_OPTS=-p -f --prefix=${prefix} --install-name=gnatcoll \
-       --exec-subdir=${bindir} --project-subdir=lib/gnat -XXMLADA_BUILD=$(@F) \
-+      -XGPR_BUILD=$(@F) \
-       --build-var=LIBRARY_TYPE --build-name=$(@F) -XLIBRARY_TYPE=$(@F)
- install-clean:
---- a/gnatcoll_shared.gpr.in   2017-01-20 19:50:03.222808656 +0100
-+++ b/gnatcoll_shared.gpr.in   2017-01-20 19:50:28.200399274 +0100
-@@ -13,7 +13,7 @@
-    type Yes_No is ("yes", "no");
-    Gtk       : Yes_No := External ("GTK", "@WITH_GTK@");
--   Python    : Yes_No := External ("PYTHON", "@WITH_PYTHON@");
-+   Python    : Yes_No := "@WITH_PYTHON@"; 
-    Syslog    : Yes_No := External ("SYSLOG", "@WITH_SYSLOG@");
-    Postgres  : Yes_No := External ("POSTGRES", "@WITH_POSTGRES@");
-    type Sqlite_Inclusion is ("yes", "no", "embedded");
---- a/testsuite/json/__init__.py       2017-04-24 17:52:34.158513249 +0200
-+++ b/testsuite/json/__init__.py       2017-04-24 17:52:52.636207017 +0200
-@@ -21,7 +21,7 @@
-     @requires_not_aix    # Storage_Error on that machine
-     @chdir("MB28-001")
-     def test_MB28_001(self):
--        self.runexec(["python", "make_json.py"])
-+        self.runexec(["python2.7", "make_json.py"])
-         self.gprbuild()
-         self.runexec("json_stack_test", "test.out")
---- a/testsuite/projects/__init__.py   2017-04-24 19:10:30.465246199 +0200
-+++ b/testsuite/projects/__init__.py   2017-04-24 19:10:42.768035080 +0200
-@@ -105,25 +105,6 @@
-         self.gprbuild("default.gpr")
-         self.runexec("main", "")
--    @support.requires_not_windows
--    @chdir("N918-040")
--    def test_bareboard(self):
--        self.create_fake_bb_compiler('install', 'arm-eabi', '6.1.0w', '3.4.6')
--
--        # Make sure auto.cgpr is not deleted on exit
--        try:
--            os.unlink('auto.cgpr')
--        except:
--            pass
--        self.gprbuild('main_prj', switches=['--autoconf=auto.cgpr'])
--        m = re.search('for Target use "(.*?)"', open('auto.cgpr').read())
--        target = m.group(1)
--
--        def customFilter(actual):
--            return actual.replace(target, "<native>")
--
--        self.runexec(['sh', 'test.sh'], 'test.out', customFilter=customFilter)
--
-     @chdir("NB12-045")
-     def test_NB12_045(self):
-         # Test registering attribute in unknown package
---- a/src/tools/gnatcoll_db2ada.adb    2017-04-24 21:36:09.193973179 +0200
-+++ b/src/tools/gnatcoll_db2ada.adb    2017-04-24 21:36:16.029858932 +0200
-@@ -211,7 +211,7 @@
-       declare
-          Output : constant String := Get_Command_Output
--           (Command     => "python",
-+           (Command     => "python2.7",
-             Arguments   => Args,
-             Input       => "",
-             Status      => Status'Access,
---- a/src/gnatcoll-projects.ads        2017-11-25 14:50:06.919939453 +0100
-+++ b/src/gnatcoll-projects.ads        2017-11-25 14:50:38.932387204 +0100
-@@ -1917,7 +1917,8 @@
-       Predefined_Source_Files : GNATCOLL.VFS.File_Array_Access;
-       --  The list of source files in Predefined_Source_Path
--      Default_Gnatls : GNAT.Strings.String_Access := new String'("gnatls");
-+      Default_Gnatls : GNAT.Strings.String_Access :=
-+         new String'("@GNATLS@");
-       --  The default gnatls command to run.
-       Xrefs_Subdir : GNAT.Strings.String_Access;
---- a/src/tools/gnatinspect.adb        2017-11-25 14:52:47.282170250 +0100
-+++ b/src/tools/gnatinspect.adb        2017-11-25 14:52:57.691990254 +0100
-@@ -642,7 +642,7 @@
-       GNAT_Version : GNAT.Strings.String_Access;
-    begin
-       Env.Set_Path_From_Gnatls
--        (Gnatls       => "gnatls",
-+        (Gnatls       => "@GNATLS@",
-          GNAT_Version => GNAT_Version,
-          Errors       => Local_On_Error'Unrestricted_Access);
-       Free (GNAT_Version);
---- a/src/gnatcoll-projects.adb        2018-11-14 18:47:27.760365233 +0100
-+++ b/src/gnatcoll-projects.adb        2018-11-14 19:10:43.961337201 +0100
-@@ -3273,9 +3273,9 @@
-       Status                   : out Status_Type;
-       Result                   : out GNATCOLL.VFS.File_Array_Access)
-    is
--      Mains_Str_List : String_List_Access;
-+      Mains_Str_List : String_Vectors.Vector;
-       Closure_Status : GPR.Util.Status_Type;
--      Closures_List  : String_List_Access;
-+      Closures_List  : String_Vectors.Vector;
-    begin
-       Trace (Me, "Get_Closures");
-@@ -3287,25 +3287,18 @@
-          return;
-       end if;
--      Mains_Str_List := new String_List (Mains'First .. Mains'Last);
-       for I in Mains'Range loop
--         Mains_Str_List (I) := new String'(Mains (I).Display_Base_Name);
-+         Mains_Str_List.Append (Mains (I).Display_Base_Name);
-       end loop;
-       GPR.Util.Get_Closures
-         (Project.Get_View, Project.Tree_View,
--         Mains                    => Mains_Str_List.all,
-+         Mains                    => Mains_Str_List,
-          All_Projects             => All_Projects,
-          Include_Externally_Built => Include_Externally_Built,
-          Status                   => Closure_Status,
-          Result                   => Closures_List);
--      --  Freeing temporary list of mains.
--      for I in Mains_Str_List'Range loop
--         Free (Mains_Str_List (I));
--      end loop;
--      Free (Mains_Str_List);
--
-       case Closure_Status is
-          when Success =>
-             Status := Success;
-@@ -3321,17 +3314,10 @@
-       end case;
-       if Closure_Status in Success | Incomplete_Closure then
--         for I in Closures_List'Range loop
--            Append (Result, Create (+Closures_List (I).all));
-+         for Closure of Closures_List loop
-+            Append (Result, Create (+Closure));
-          end loop;
-       end if;
--
--      --  Freeing temporary list of closures.
--      for I in Closures_List'Range loop
--         Free (Closures_List (I));
--      end loop;
--      Free (Closures_List);
--
-    end Get_Closures;
-    ----------------
diff --git a/dev-ada/gnatcoll/gnatcoll-2017-r1.ebuild b/dev-ada/gnatcoll/gnatcoll-2017-r1.ebuild
deleted file mode 100644 (file)
index 07ae2eb..0000000
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 )
-ADA_COMPAT=( gnat_201{6,7} )
-inherit ada multilib multiprocessing autotools python-single-r1
-
-MYP=${PN}-gpl-${PV}
-
-DESCRIPTION="GNAT Component Collection"
-HOMEPAGE="http://libre.adacore.com"
-SRC_URI="http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed016
-       -> ${MYP}-src.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gmp gtk iconv postgres pygobject projects readline
-       +shared sqlite static-libs syslog tools"
-
-RDEPEND="${ADA_DEPS}
-       ${PYTHON_DEPS}
-       gmp? ( dev-libs/gmp:* )
-       gtk? (
-               dev-ada/gtkada[${ADA_USEDEP},shared?,static-libs?]
-               dev-libs/atk
-               dev-libs/glib
-               x11-libs/cairo
-               x11-libs/gdk-pixbuf
-               x11-libs/gtk+:3
-               x11-libs/pango
-       )
-       pygobject? ( dev-python/pygobject:3[${PYTHON_USEDEP}] )
-       postgres? ( dev-db/postgresql:* )
-       sqlite? ( dev-db/sqlite )
-       projects? (
-               >=dev-ada/libgpr-2018[${ADA_USEDEP},shared?,static-libs?]
-               dev-ada/xmlada[shared?,static-libs?]
-       )
-       !dev-ada/gnatcoll-core
-       !dev-ada/gnatcoll-bindings
-       !dev-ada/gnatcoll-db"
-DEPEND="${RDEPEND}
-       dev-ada/gprbuild[${ADA_USEDEP}]"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-       tools? ( static-libs )
-       pygobject? ( gtk )
-       ${ADA_REQUIRED_USE}"
-
-S="${WORKDIR}"/${MYP}-src
-
-PATCHES=( "${FILESDIR}"/${P}-r1-gentoo.patch )
-
-pkg_setup() {
-       python-single-r1_pkg_setup
-       ada_setup
-}
-
-src_prepare() {
-       default
-       mv configure.{in,ac} || die
-       sed -i \
-               -e "s:@GNATLS@:${GNATLS}:g" \
-               src/gnatcoll-projects.ads \
-               src/tools/gnatinspect.adb \
-               || die
-       eautoreconf
-}
-
-src_configure() {
-       if use sqlite; then
-               myConf="--with-sqlite=$(get_libdir)"
-       else
-               myConf="--without-sqlite"
-       fi
-       if use gtk ; then
-               myConf="$myConf --with-gtk=3.0"
-       else
-               myConf="$myConf --with-gtk=no"
-       fi
-       econf \
-               --with-python \
-               $(use_with gmp) \
-               $(use_with iconv) \
-               $(use_with postgres postgresql) \
-               $(use_enable projects) \
-               $(use_enable pygobject) \
-               $(use_enable readline gpl) \
-               $(use_enable readline) \
-               $(use_enable syslog) \
-               --with-python-exec=${EPYTHON} \
-               --enable-shared-python \
-               --disable-pygtk \
-               $myConf
-}
-
-src_compile() {
-       if use shared; then
-               emake PROCESSORS=$(makeopts_jobs) build_library_type/relocatable
-       fi
-       if use static-libs; then
-               emake PROCESSORS=$(makeopts_jobs) build_library_type/static
-       fi
-       if use tools; then
-               emake PROCESSORS=$(makeopts_jobs) build_tools/static
-       fi
-       python_fix_shebang .
-}
-
-src_install() {
-       if use shared; then
-               emake prefix="${D}/usr" install_library_type/relocatable
-       fi
-       if use static-libs; then
-               emake prefix="${D}/usr" install_library_type/static
-       fi
-       if use tools; then
-               emake prefix="${D}/usr" install_tools/static
-       fi
-       emake prefix="${D}/usr" install_gps_plugin
-       einstalldocs
-}
-
-src_test() {
-       # The test suite is in
-       # To run you need to have the ada compiler available as gcc
-       # Even in this case there are still some problems
-       # Going into the testsuite directory and running
-       # ./run.py -v -v
-       # run here (having enabled most USE flags)
-       true
-}
diff --git a/dev-ada/gnatcoll/gnatcoll-2017.ebuild b/dev-ada/gnatcoll/gnatcoll-2017.ebuild
deleted file mode 100644 (file)
index 54e0a58..0000000
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-inherit multilib multiprocessing autotools python-single-r1
-
-MYP=${PN}-gpl-${PV}
-
-DESCRIPTION="GNAT Component Collection"
-HOMEPAGE="http://libre.adacore.com"
-SRC_URI="http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed016
-       -> ${MYP}-src.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gmp gnat_2016 +gnat_2017 gtk iconv postgres pygobject projects readline
-       +shared sqlite static-libs syslog tools"
-
-RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
-       gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )
-       ${PYTHON_DEPS}
-       gmp? ( dev-libs/gmp:* )
-       gtk? (
-               dev-ada/gtkada[gnat_2016=,gnat_2017=,shared?,static-libs?]
-               dev-libs/atk
-               dev-libs/glib
-               x11-libs/cairo
-               x11-libs/gdk-pixbuf
-               x11-libs/gtk+:3
-               x11-libs/pango
-       )
-       pygobject? ( dev-python/pygobject:3[${PYTHON_USEDEP}] )
-       postgres? ( dev-db/postgresql:* )
-       sqlite? ( dev-db/sqlite )
-       projects? (
-               >=dev-ada/libgpr-2018[gnat_2016=,gnat_2017=,shared?,static-libs?]
-               dev-ada/xmlada[shared?,static-libs?]
-       )
-       !dev-ada/gnatcoll-core
-       !dev-ada/gnatcoll-bindings
-       !dev-ada/gnatcoll-db"
-DEPEND="${RDEPEND}
-       dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?]"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-       tools? ( static-libs )
-       pygobject? ( gtk )
-       ^^ ( gnat_2016 gnat_2017 )"
-
-S="${WORKDIR}"/${MYP}-src
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-src_prepare() {
-       if use gnat_2016; then
-               GCC_PV=4.9.4
-       else
-               GCC_PV=6.3.0
-       fi
-       default
-       mv configure.{in,ac} || die
-       sed -i \
-               -e "s:@GNATLS@:${CHOST}-gnatls-${GCC_PV}:g" \
-               src/gnatcoll-projects.ads \
-               src/tools/gnatinspect.adb \
-               || die
-       eautoreconf
-}
-
-src_configure() {
-       GNATMAKE=${CHOST}-gnatmake-${GCC_PV}
-       GNATCHOP=${CHOST}-gnatchop-${GCC_PV}
-       if use sqlite; then
-               myConf="--with-sqlite=$(get_libdir)"
-       else
-               myConf="--without-sqlite"
-       fi
-       if use gtk ; then
-               myConf="$myConf --with-gtk=3.0"
-       else
-               myConf="$myConf --with-gtk=no"
-       fi
-       econf \
-               GNATCHOP="${GNATCHOP}" \
-               GNATMAKE="${GNATMAKE}" \
-               --with-python \
-               $(use_with gmp) \
-               $(use_with iconv) \
-               $(use_with postgres postgresql) \
-               $(use_enable projects) \
-               $(use_enable pygobject) \
-               $(use_enable readline gpl) \
-               $(use_enable readline) \
-               $(use_enable syslog) \
-               --with-python-exec=${EPYTHON} \
-               --enable-shared-python \
-               --disable-pygtk \
-               $myConf
-}
-
-src_compile() {
-       if use shared; then
-               emake PROCESSORS=$(makeopts_jobs) build_library_type/relocatable
-       fi
-       if use static-libs; then
-               emake PROCESSORS=$(makeopts_jobs) build_library_type/static
-       fi
-       if use tools; then
-               emake PROCESSORS=$(makeopts_jobs) build_tools/static
-       fi
-       python_fix_shebang .
-}
-
-src_install() {
-       if use shared; then
-               emake prefix="${D}usr" install_library_type/relocatable
-       fi
-       if use static-libs; then
-               emake prefix="${D}usr" install_library_type/static
-       fi
-       if use tools; then
-               emake prefix="${D}usr" install_tools/static
-       fi
-       emake prefix="${D}usr" install_gps_plugin
-       einstalldocs
-}
-
-src_test() {
-       # The test suite is in
-       # To run you need to have the ada compiler available as gcc
-       # Even in this case there are still some problems
-       # Going into the testsuite directory and running
-       # ./run.py -v -v
-       # run here (having enabled most USE flags)
-       true
-}
diff --git a/dev-ada/gnatcoll/metadata.xml b/dev-ada/gnatcoll/metadata.xml
deleted file mode 100644 (file)
index cc1fe1d..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-       <maintainer type="project">
-               <email>ada@gentoo.org</email>
-       </maintainer>
-       <use>
-               <flag name="projects">Adds support for projects</flag>
-               <flag name="pygobject">Adds support for pygobject</flag>
-               <flag name="shared">Build shared library</flag>
-               <flag name="tools">Build associated tools</flag>
-       </use>
-       <longdescription lang="en">
-               The reusable library known as the GNAT Component Collection (GNATColl)
-               is based on one main principle: general-purpose packages that are part
-               of the GNAT technology should also be available to GNAT user
-               application code. The compiler front end, the GNAT Programming Studio
-               (GPS) Interactive Development Environment, and the GNAT Tracker
-               web-based interface all served as sources for the components.
-
-               The GNATColl components complement the predefined Ada and GNAT
-               libraries and deal with a range of common programming issues including
-               string and text processing, memory management, and file handling.
-               Several of the components are especially useful in enterprise
-               applications.
-       </longdescription>
-</pkgmetadata>
index 944995aa773c88244e20a1c75ddd74507b6417ca..e3cc64eb647e513a522d343a00bc4ef736eceb3b 100644 (file)
@@ -447,11 +447,6 @@ media-gfx/exiftags
 app-admin/certmgr
 app-admin/ksonnet
 
-# Alfredo Tupone <tupone@gentoo.org> (2019-11-03)
-# No more needed. Substituted by dev-ada/gnatcoll-core and others
-# Removal in 30 days.
-dev-ada/gnatcoll
-
 # Michał Górny <mgorny@gentoo.org> (2019-11-03)
 # Discontinued upstream.  Relies on app-portage/flaggie make.conf
 # editing support that was fragile and therefore was removed.