* [gentoo-commits] repo/gentoo:master commit in: dev-ada/gps/, dev-ada/gps/files/
@ 2017-11-21 20:47 Alfredo Tupone
0 siblings, 0 replies; 4+ messages in thread
From: Alfredo Tupone @ 2017-11-21 20:47 UTC (permalink / raw
To: gentoo-commits
commit: 282d7dccde2a231a6b08136a794567b794afd567
Author: Tupone Alfredo <tupone <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 21 20:47:10 2017 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Tue Nov 21 20:47:10 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=282d7dcc
dev-ada/gps: Add GPS (IDE) to gentoo
Package-Manager: Portage-2.3.13, Repoman-2.3.3
dev-ada/gps/Manifest | 1 +
dev-ada/gps/files/gps-2017-gentoo.patch | 165 ++++++++++++++++++++++++++++++++
dev-ada/gps/gps-2017.ebuild | 66 +++++++++++++
dev-ada/gps/metadata.xml | 13 +++
4 files changed, 245 insertions(+)
diff --git a/dev-ada/gps/Manifest b/dev-ada/gps/Manifest
new file mode 100644
index 00000000000..4baa367cf94
--- /dev/null
+++ b/dev-ada/gps/Manifest
@@ -0,0 +1 @@
+DIST gps-gpl-2017-src.tar.gz 41216830 BLAKE2B 51ca89c38fa81888a9cf1831cf97f7e0ad72c444328a29063249a4fe72bbdc8357552d470872e9fbbeaf349ef0427b59fa41a0efb56200a07a9426343c731a57 SHA512 101ecef7f183de1da0c2b09d77f284a5e8c5ae56f34a897c8d471e79fe9a2832742608ff5251197ba2a52b5d9dfee6c6937fc22cd55f6d8f38359b070393cb64
diff --git a/dev-ada/gps/files/gps-2017-gentoo.patch b/dev-ada/gps/files/gps-2017-gentoo.patch
new file mode 100644
index 00000000000..4fe39ea239f
--- /dev/null
+++ b/dev-ada/gps/files/gps-2017-gentoo.patch
@@ -0,0 +1,165 @@
+--- gps-9999/aclocal.m4.old 2017-05-13 21:59:20.129039064 +0200
++++ gps-9999/aclocal.m4 2017-05-13 22:02:12.637234659 +0200
+@@ -37,7 +37,7 @@
+ HAVE_GNAT_PROJECT_$1=yes
+ else
+ # Try with "gnatls", in case gprls was not available
+- if AC_TRY_COMMAND([gnat ls -Pconftest.gpr system.ads > /dev/null 2>conftest.out])
++ if AC_TRY_COMMAND([@GNAT@ ls -Pconftest.gpr system.ads > /dev/null 2>conftest.out])
+ then
+ HAVE_GNAT_PROJECT_$1=yes
+ else
+@@ -156,7 +156,7 @@
+
+ AC_DEFUN(AM_PATH_GNAT,
+ [
+- AC_PATH_PROG(GNATMAKE, gnatmake, no)
++ AC_PATH_PROG(GNATMAKE, @GNATMAKE@, no)
+
+ if test x$GNATMAKE = xno ; then
+ AC_MSG_ERROR(I could not find gnatmake. See the file 'INSTALL' for more details.)
+@@ -279,7 +279,7 @@
+ AC_MSG_RESULT($GTK_PREFIX $GLIB_PREFIX $ATK_PREFIX $PANGO_PREFIX $CAIRO_PREFIX)
+ fi
+
+- AC_PATH_PROG(GNATDRV, gnat, no)
++ AC_PATH_PROG(GNATDRV, @GNAT@, no)
+ min_gtk_version=ifelse([$1], ,2.0.0,$1)
+ AC_MSG_CHECKING(for GtkAda - version >= $min_gtk_version)
+ GTKADA_PRJ=`$GNATDRV ls -vP1 -Pgtkada 2>&1 | grep gtkada.gpr | grep Parsing | cut -d'"' -f2 | head -1`
+--- gps-gps-17.0/templates_parser/templates_parser.gpr.old 2017-05-18 21:34:42.892039427 +0200
++++ gps-gps-17.0/templates_parser/templates_parser.gpr 2017-05-18 21:35:16.661512990 +0200
+@@ -55,7 +55,7 @@
+
+ end Naming;
+
+- Common_Options := ("-gnat05");
++ Common_Options := ("-gnat05", "-fPIC");
+ -- Common options used for the Debug and Release modes
+
+ Debug_Options :=
+--- gps-gps-17.0/shared.gpr.in.old 2017-05-18 21:35:56.475892075 +0200
++++ gps-gps-17.0/shared.gpr.in 2017-05-18 21:36:24.972447550 +0200
+@@ -24,7 +24,7 @@
+ end IDE;
+
+ package Compiler is
+- Common := ("-g", "-gnat12");
++ Common := ("-g", "-gnat12", "-fPIC");
+ Optimize := ();
+
+ case OS is
+@@ -83,6 +83,7 @@
+ when "false" =>
+ null;
+ end case;
++ for Driver use External ("CC", "gcc");
+ end Linker;
+
+ end Shared;
+--- gps-gps-17.0/common/common_with_xmlada.gpr.in.old 2017-05-18 21:37:25.302506085 +0200
++++ gps-gps-17.0/common/common_with_xmlada.gpr.in 2017-05-18 21:37:58.472988222 +0200
+@@ -13,7 +13,7 @@
+ for Switches ("Ada") use Shared.Compiler'Switches ("Ada");
+ for Switches ("C") use Shared.Compiler'Switches ("C");
+ for Switches ("test_htables.adb") use ("-g", "-O2", "-gnatwue");
+- for Switches ("s-memory.adb") use ("-g", "-O2", "-gnatpg");
++ for Switches ("s-memory.adb") use ("-g", "-O2", "-gnatpg", "-fPIC");
+
+ No_Checks := ("-g", "-O2", "-gnat2012", "-gnatpn");
+
+--- gps-gps-17.0/common/common_no_xmlada.gpr.in.old 2017-05-18 21:37:31.406410812 +0200
++++ gps-gps-17.0/common/common_no_xmlada.gpr.in 2017-05-18 21:38:14.796733359 +0200
+@@ -12,7 +12,7 @@
+ for Switches ("Ada") use Shared.Compiler'Switches ("Ada");
+ for Switches ("C") use Shared.Compiler'Switches ("C");
+ for Switches ("test_htables.adb") use ("-g", "-O2", "-gnatwue");
+- for Switches ("s-memory.adb") use ("-g", "-O2", "-gnatpg");
++ for Switches ("s-memory.adb") use ("-g", "-O2", "-gnatpg", "-fPIC");
+
+ No_Checks := ("-g", "-O2", "-gnat2012", "-gnatpn");
+
+--- gps-gps-17.0/widgets/widgets.gpr.old 2017-05-18 22:26:05.117847006 +0200
++++ gps-gps-17.0/widgets/widgets.gpr 2017-05-18 22:21:01.646368091 +0200
+@@ -12,6 +12,7 @@
+ package Compiler extends Shared.Compiler is
+ for Switches ("C") use
+ Shared.Compiler'Switches ("C") & GnatColl_Gtk.Gtk_Include;
++ for Driver ("C") use External ("CC", "gcc");
+ end Compiler;
+
+ package IDE renames Shared.IDE;
+--- gps-gps-17.0/cli/Makefile.old 2017-05-19 08:07:44.591042479 +0200
++++ gps-gps-17.0/cli/Makefile 2017-05-19 08:08:50.086991123 +0200
+@@ -1,8 +1,9 @@
+ GPRBUILD=gprbuild
+ GPRCLEAN=gprclean
++GPRBUILD_FLAGS=0
+
+ all default:
+- $(GPRBUILD) -p -Pcli
++ $(GPRBUILD) $(GPRBUILD_FLAGS) -p -Pcli
+
+ clean:
+ $(GPRCLEAN) -q -r -Pcli
+--- gps-gps-17.0/gps/gps.gpr.old 2017-05-19 09:24:19.438123599 +0200
++++ gps-gps-17.0/gps/gps.gpr 2017-05-19 09:24:58.639492518 +0200
+@@ -75,7 +75,7 @@
+ end case;
+ for Switches ("Ada") use Linker'Switches ("Ada")
+ & Shared.Linker'Switches ("Ada");
+-
++ for Driver use External ("CC", "gcc");
+ -- for Switches ("Ada") use ("-lgmem");
+ -- for Switches ("Ada") use ("-pg");
+ end Linker;
+--- gps-gps-17.0/testsuite/Makefile.old 2017-05-19 11:08:48.966913663 +0200
++++ gps-gps-17.0/testsuite/Makefile 2017-05-19 11:06:17.245366714 +0200
+@@ -1,5 +1,6 @@
+ GPRBUILD=gprbuild
+ GPRCLEAN=gprclean
++GPRBUILD_FLAGS=
+
+ SYS := $(shell gcc -dumpmachine)
+ ifeq ($(OS),Windows_NT)
+@@ -14,7 +14,7 @@
+ endif
+
+ all default: package
+- $(GPRBUILD) -P testsuite_drivers.gpr -m -XOS=${OS} -j0 -XLIBRARY_TYPE=relocatable -XXMLADA_BUILD=relocatable
++ $(GPRBUILD) $(GPRBUILD_FLAGS) -P testsuite_drivers.gpr -m -XOS=${OS} -j0 -XLIBRARY_TYPE=relocatable -XXMLADA_BUILD=relocatable
+
+ package:
+ mkdir -p share/doc
+--- gps-gps-17.0/testsuite/testsuite_drivers.gpr.old 2017-05-19 11:21:20.645705481 +0200
++++ gps-gps-17.0/testsuite/testsuite_drivers.gpr 2017-05-19 11:15:42.163206405 +0200
+@@ -10,6 +10,10 @@
+ for Object_Dir use "obj";
+ for Exec_Dir use "bin";
+
++ package Compiler is
++ for Switches ("Ada") use ("-fPIC");
++ end Compiler;
++
+ package Builder is
+ for Switches ("Ada") use ("-gnat12", "-ws", "-g", "-j0", "-m", "-gnaty");
+ end Builder;
+--- gps-gps-17.0/Makefile.in.old 2017-05-19 11:49:47.172018411 +0200
++++ gps-gps-17.0/Makefile.in 2017-05-19 11:50:24.653412280 +0200
+@@ -10,7 +10,7 @@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_DATA = @INSTALL_DATA@
+ GNATCOLL_INSTALL = @GNATCOLL_INSTALL@
+-prefix = @prefix@
++prefix = $(DESTDIR)@prefix@
+ bindir = $(prefix)/bin
+ sharedir = $(prefix)/share
+ examplesdir = $(prefix)/share/examples/gps
+--- gps-gps-17.0/docs/Makefile.in.old 2017-05-19 11:54:52.805076624 +0200
++++ gps-gps-17.0/docs/Makefile.in 2017-05-19 11:55:24.332566945 +0200
+@@ -1,4 +1,4 @@
+-prefix = @prefix@
++prefix = $(DESTDIR)@prefix@
+ docdir = $(prefix)/share/doc/gps
+ sharedir = $(prefix)/share/gps
+
diff --git a/dev-ada/gps/gps-2017.ebuild b/dev-ada/gps/gps-2017.ebuild
new file mode 100644
index 00000000000..a07971aa8bb
--- /dev/null
+++ b/dev-ada/gps/gps-2017.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+inherit python-single-r1 autotools
+
+MYP=${PN}-gpl-${PV}-src
+
+DESCRIPTION="The GNAT Programming Studio"
+HOMEPAGE="http://libre.adacore.com/tools/gps/"
+SRC_URI="http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed03b
+ -> ${MYP}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="${PYTHON_DEPS}
+ >=dev-ada/gnatcoll-2017[gtk,iconv,projects,pygobject,shared,sqlite,tools]
+ >=dev-ada/gtkada-2017
+ dev-ada/libadalang
+ dev-libs/gobject-introspection
+ dev-libs/libffi
+ sys-devel/llvm:=
+ sys-devel/clang:=
+ x11-themes/adwaita-icon-theme
+ x11-themes/hicolor-icon-theme
+ dev-python/pep8[${PYTHON_USEDEP}]
+ dev-python/jedi[${PYTHON_USEDEP}]"
+
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"/${MYP}
+
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
+pkg_setup() {
+ GCC=${ADA:-$(tc-getCC)}
+ GNATLS="${GCC/gcc/gnatls}"
+ GNAT="${GCC/gcc/gnat}"
+ GNATMAKE="${GCC/gcc/gnatmake}"
+ if [[ -z "$(type ${GNATLS} 2>/dev/null)" ]] ; then
+ eerror "You need a gcc compiler that provides the Ada Compiler:"
+ eerror "1) use gcc-config to select the right compiler or"
+ eerror "2) set ADA=gcc-6.3.0 in make.conf"
+ die "ada compiler not available"
+ fi
+ python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ default
+ mv configure.{in,ac} || die
+ sed -i \
+ -e "s:@GNATMAKE@:${GNATMAKE}:g" \
+ -e "s:@GNAT@:${GNAT}:g" \
+ aclocal.m4 \
+ || die
+ eautoreconf
+}
+
+src_compile() {
+ emake GPRBUILD_FLAGS="-v ${MAKEOPTS}"
+}
diff --git a/dev-ada/gps/metadata.xml b/dev-ada/gps/metadata.xml
new file mode 100644
index 00000000000..eb9ac43cfff
--- /dev/null
+++ b/dev-ada/gps/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>tupone@gentoo.org</email>
+ <name>Tupone Alfredo</name>
+ </maintainer>
+ <longdescription lang="en">
+ GPS is a lightweight, extensible IDE, intended to develop
+ high-integrity software in Ada and SPARK, with support for C and C++
+ as well.
+ </longdescription>
+</pkgmetadata>
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-ada/gps/, dev-ada/gps/files/
@ 2018-11-29 21:02 Alfredo Tupone
0 siblings, 0 replies; 4+ messages in thread
From: Alfredo Tupone @ 2018-11-29 21:02 UTC (permalink / raw
To: gentoo-commits
commit: 645f42b66db1d9b46138b11bf89dbb5016b511b2
Author: Tupone Alfredo <tupone <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 29 21:02:10 2018 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Thu Nov 29 21:02:30 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=645f42b6
dev-ada/gps: Stable
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
dev-ada/gps/files/gps-2018-gentoo.patch | 40 -----------------------
dev-ada/gps/gps-2018.ebuild | 56 +++++++++++++++++++++++----------
2 files changed, 39 insertions(+), 57 deletions(-)
diff --git a/dev-ada/gps/files/gps-2018-gentoo.patch b/dev-ada/gps/files/gps-2018-gentoo.patch
index 06a080b69d5..6e258bac36a 100644
--- a/dev-ada/gps/files/gps-2018-gentoo.patch
+++ b/dev-ada/gps/files/gps-2018-gentoo.patch
@@ -75,43 +75,3 @@
<string />
</project_attribute>
---- a/gnatcoll_extras/gnatcoll_extras.gpr 2018-07-22 14:42:17.618161040 +0200
-+++ b/gnatcoll_extras/gnatcoll_extras.gpr 2018-07-22 14:43:33.973070921 +0200
-@@ -14,6 +14,7 @@
- for Switches ("C") use
- ("-g", "-O2")
- & Shared.Gtk_Cflags & Shared.Pygobject_Include & Shared.Python_Cflags;
-+ for Driver ("C") use External ("CC", "gcc");
- end Compiler;
-
- end GNATCOLL_Extras;
---- a/widgets/widgets.gpr 2018-07-22 21:46:23.907355738 +0200
-+++ b/widgets/widgets.gpr 2018-07-22 21:47:02.673825994 +0200
-@@ -14,6 +14,7 @@
- for Switches ("C") use
- ("-g", "-O2")
- & Shared.Gtk_Cflags;
-+ for Driver ("C") use External ("CC", "gcc");
- end Compiler;
-
- end Widgets;
---- a/common/common.gpr.in 2018-07-25 08:05:45.227060250 +0200
-+++ b/common/common.gpr.in 2018-07-25 08:06:55.067009811 +0200
-@@ -23,6 +23,7 @@
- for Switches ("dynamic_arrays.adb") use No_Checks;
- when "Debug" =>
- end case;
-+ for Driver ("C") use External ("CC", "gcc");
- end Compiler;
-
- package Binder is
---- a/shared.gpr.in 2018-07-25 08:11:47.317597391 +0200
-+++ b/shared.gpr.in 2018-07-25 08:10:56.774362671 +0200
-@@ -60,6 +60,7 @@
- );
- for Switches ("C") use Optimize & ("-g", "-O2");
- end case;
-+ for Driver ("C") use External ("CC", "gcc");
- end Compiler;
-
- package Binder is
diff --git a/dev-ada/gps/gps-2018.ebuild b/dev-ada/gps/gps-2018.ebuild
index 85c357baef7..71560c0907c 100644
--- a/dev-ada/gps/gps-2018.ebuild
+++ b/dev-ada/gps/gps-2018.ebuild
@@ -3,7 +3,7 @@
EAPI=6
PYTHON_COMPAT=( python2_7 )
-inherit python-single-r1 autotools desktop
+inherit python-single-r1 autotools desktop llvm
MYP=${PN}-gpl-${PV}-src
@@ -16,16 +16,23 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/5b0cf627c7a4475261f97ceb
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
+KEYWORDS="amd64 x86"
+IUSE="gnat_2017 gnat_2018"
RDEPEND="${PYTHON_DEPS}
- dev-ada/gnatcoll-db[gnatcoll_db2ada,gnatinspect,xref]
- dev-ada/gnatcoll-bindings[python]
- >=dev-ada/gtkada-2017[gnat_2018]
- dev-ada/libadalang[gnat_2018]
+ dev-ada/gnatcoll-db[gnat_2017=,gnat_2018,gnatcoll_db2ada,gnatinspect,xref]
+ dev-ada/gnatcoll-bindings[gnat_2017=,gnat_2018=,python]
+ >=dev-ada/gtkada-2017[gnat_2017=,gnat_2017=]
+ dev-ada/libadalang[gnat_2017=,gnat_2018=]
dev-libs/gobject-introspection
dev-libs/libffi
+ gnat_2017? ( sys-devel/llvm:5 )
+ gnat_2018? (
+ || (
+ sys-devel/llvm:6
+ sys-devel/llvm:7
+ )
+ )
sys-devel/clang:=
x11-themes/adwaita-icon-theme
x11-themes/hicolor-icon-theme
@@ -40,31 +47,46 @@ S="${WORKDIR}"/${MYP}
PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+pkg_setup() {
+ if use gnat_2017; then
+ GCC_PV=6.3.0
+ LLVM_MAX_SLOT=5
+ else
+ GCC_PV=7.3.1
+ LLVM_MAX_SLOT=7
+ fi
+ GNATMAKE=gnatmake-${GCC_PV}
+ GNATDRV=gnat-${GCC_PV}
+ GNATLS=gnatls-${GCC_PV}
+ llvm_pkg_setup
+}
+
src_prepare() {
GCC_PV=7.3.1
default
sed -i \
- -e "s:@GNATMAKE@:${CHOST}-gnatmake-${GCC_PV}:g" \
- -e "s:@GNAT@:${CHOST}-gnat-${GCC_PV}:g" \
- -e "s:@GNATLS@:${CHOST}-gnatls-${GCC_PV}:g" \
- share/support/core/toolchains.py \
- share/support/core/projects.py \
- || die
+ -e "s:@GNATMAKE@:${CHOST}-${GNATMAKE}:g" \
+ -e "s:@GNAT@:${CHOST}-${GNATDRV}:g" \
+ -e "s:@GNATLS@:${CHOST}-${GNATLS}:g" \
+ share/support/core/toolchains.py \
+ share/support/core/projects.py \
+ || die
mv "${WORKDIR}"/libadalang-tools-src laltools
}
src_configure() {
econf \
- GNATMAKE=/usr/bin/gnatmake-7.3.1 \
- GNATDRV=/usr/bin/gnat-7.3.1 \
+ GNATMAKE=/usr/bin/${GNATMAKE} \
+ GNATDRV=/usr/bin/${GNATDRV} \
--with-clang=$(llvm-config --libdir)
}
src_compile() {
- CC=/usr/bin/gcc-7.3.1 emake -C gps GPRBUILD_FLAGS="-v ${MAKEOPTS}" \
+ emake -C gps GPRBUILD_FLAGS="-v ${MAKEOPTS} \
+ -XGPR_BUILD=relocatable" \
Build=Production
gprbuild -v -p -Pcli/cli.gpr ${MAKEOPTS} -XLIBRARY_TYPE=relocatable \
- -cargs:Ada ${ADAFLAGS}
+ -XGPR_BUILD=relocatable -cargs:Ada ${ADAFLAGS} || die
}
src_install() {
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-ada/gps/, dev-ada/gps/files/
@ 2019-11-03 18:15 Alfredo Tupone
0 siblings, 0 replies; 4+ messages in thread
From: Alfredo Tupone @ 2019-11-03 18:15 UTC (permalink / raw
To: gentoo-commits
commit: 420ab9ba4ada904e5582c90f8a77c01e611381d5
Author: Tupone Alfredo <tupone <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 3 18:13:32 2019 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Sun Nov 3 18:15:26 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=420ab9ba
dev-ada/gps: remove old version
Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
dev-ada/gps/Manifest | 2 -
dev-ada/gps/files/gps-2017-gentoo.patch | 339 --------------------------------
dev-ada/gps/gps-2017.ebuild | 87 --------
3 files changed, 428 deletions(-)
diff --git a/dev-ada/gps/Manifest b/dev-ada/gps/Manifest
index 1b976f5d7a2..41219d3921b 100644
--- a/dev-ada/gps/Manifest
+++ b/dev-ada/gps/Manifest
@@ -1,5 +1,3 @@
-DIST gnat-gpl-2017-x86_64-linux-bin.tar.gz 496338280 BLAKE2B b3eee6d311fb9c20bc8fa7217c0731ca1e91ced38700df1d63d91a16c3fa28dfd44c7c8e867c3a857b88e4f0c8b2a7200fb6a8a630b8403538c4784f8914d1a5 SHA512 01a8f3be9b7b7e83cc5bd4a45137b1d35c6448bc22a88bcaf5d312cd63e11081b6b2fe9f09ad2a27d8f0b6471fc5c1a99573bf3bcee1589329054074eaeef04f
-DIST gps-gpl-2017-src.tar.gz 41216830 BLAKE2B 51ca89c38fa81888a9cf1831cf97f7e0ad72c444328a29063249a4fe72bbdc8357552d470872e9fbbeaf349ef0427b59fa41a0efb56200a07a9426343c731a57 SHA512 101ecef7f183de1da0c2b09d77f284a5e8c5ae56f34a897c8d471e79fe9a2832742608ff5251197ba2a52b5d9dfee6c6937fc22cd55f6d8f38359b070393cb64
DIST gps-gpl-2018-src.tar.gz 40541905 BLAKE2B abe38dd23d9afede27b4ec8294e3245c12d52d60491b6e7c1b2d120a6f1e5d808fdcfb648e72da31376e2de176f7a039c5493341ad295db33b6a1ce44bb64096 SHA512 da0eaa85eb753f215354c9765272d85378f36ebe207314bab9211642f9d9b505a3d05cdec9de6964ae9139c4f8942a29e06c72db32b2aeb053a694e9c982e470
DIST gtk+-3.14.15-src.tar.gz 32009863 BLAKE2B 93c6897c431fa8e1c19ea758378bc7e365d486d1decccefbba64876d8c51a488e6bcf932481daa11e7e43a960a328c3db746e41a845e574c6b6070ab71e23188 SHA512 add4607a1758319a938d2be0bbd0dd140c4099accffa9301e3049bc460bf94f395c5a092368214e8b28d53bc25335d1b8329b50c7eb80a1e9a65b2e154135b84
DIST libadalang-tools-gpl-2018-src.tar.gz 19938182 BLAKE2B 34104f3bc43c165a9b74ba8c0c03ee2f34686bcd06b5ced730f70f654d8b808e129a85566e081830b4f20304c793eefe0af81b56984cf06190302ad2f6a419be SHA512 a1176575944cd88b9da5f4e9f03caa1a4d09358df71e6a91300d0b35c2a843d0ea1a77fbd93e7b7f16cef1b978022ee20991f5c2ff74f7d05878c3de1220f2b5
diff --git a/dev-ada/gps/files/gps-2017-gentoo.patch b/dev-ada/gps/files/gps-2017-gentoo.patch
deleted file mode 100644
index 1af2488c932..00000000000
--- a/dev-ada/gps/files/gps-2017-gentoo.patch
+++ /dev/null
@@ -1,339 +0,0 @@
---- a/aclocal.m4 2017-05-13 21:59:20.129039064 +0200
-+++ b/aclocal.m4 2017-05-13 22:02:12.637234659 +0200
-@@ -37,7 +37,7 @@
- HAVE_GNAT_PROJECT_$1=yes
- else
- # Try with "gnatls", in case gprls was not available
-- if AC_TRY_COMMAND([gnat ls -Pconftest.gpr system.ads > /dev/null 2>conftest.out])
-+ if AC_TRY_COMMAND([@GNAT@ ls -Pconftest.gpr system.ads > /dev/null 2>conftest.out])
- then
- HAVE_GNAT_PROJECT_$1=yes
- else
-@@ -156,7 +156,7 @@
-
- AC_DEFUN(AM_PATH_GNAT,
- [
-- AC_PATH_PROG(GNATMAKE, gnatmake, no)
-+ AC_PATH_PROG(GNATMAKE, @GNATMAKE@, no)
-
- if test x$GNATMAKE = xno ; then
- AC_MSG_ERROR(I could not find gnatmake. See the file 'INSTALL' for more details.)
-@@ -279,7 +279,7 @@
- AC_MSG_RESULT($GTK_PREFIX $GLIB_PREFIX $ATK_PREFIX $PANGO_PREFIX $CAIRO_PREFIX)
- fi
-
-- AC_PATH_PROG(GNATDRV, gnat, no)
-+ AC_PATH_PROG(GNATDRV, @GNAT@, no)
- min_gtk_version=ifelse([$1], ,2.0.0,$1)
- AC_MSG_CHECKING(for GtkAda - version >= $min_gtk_version)
- GTKADA_PRJ=`$GNATDRV ls -vP1 -Pgtkada 2>&1 | grep gtkada.gpr | grep Parsing | cut -d'"' -f2 | head -1`
---- a/templates_parser/templates_parser.gpr 2017-05-18 21:34:42.892039427 +0200
-+++ b/templates_parser/templates_parser.gpr 2017-05-18 21:35:16.661512990 +0200
-@@ -55,7 +55,7 @@
-
- end Naming;
-
-- Common_Options := ("-gnat05");
-+ Common_Options := ("-gnat05", "-fPIC");
- -- Common options used for the Debug and Release modes
-
- Debug_Options :=
---- a/shared.gpr.in 2017-05-18 21:35:56.475892075 +0200
-+++ b/shared.gpr.in 2017-05-18 21:36:24.972447550 +0200
-@@ -24,7 +24,7 @@
- end IDE;
-
- package Compiler is
-- Common := ("-g", "-gnat12");
-+ Common := ("-g", "-gnat12", "-fPIC");
- Optimize := ();
-
- case OS is
-@@ -83,6 +83,7 @@
- when "false" =>
- null;
- end case;
-+ for Driver use External ("CC", "gcc");
- end Linker;
-
- end Shared;
---- a/common/common_with_xmlada.gpr.in 2017-05-18 21:37:25.302506085 +0200
-+++ b/common/common_with_xmlada.gpr.in 2017-05-18 21:37:58.472988222 +0200
-@@ -13,7 +13,7 @@
- for Switches ("Ada") use Shared.Compiler'Switches ("Ada");
- for Switches ("C") use Shared.Compiler'Switches ("C");
- for Switches ("test_htables.adb") use ("-g", "-O2", "-gnatwue");
-- for Switches ("s-memory.adb") use ("-g", "-O2", "-gnatpg");
-+ for Switches ("s-memory.adb") use ("-g", "-O2", "-gnatpg", "-fPIC");
-
- No_Checks := ("-g", "-O2", "-gnat2012", "-gnatpn");
-
---- a/common/common_no_xmlada.gpr.in 2017-05-18 21:37:31.406410812 +0200
-+++ b/common/common_no_xmlada.gpr.in 2017-05-18 21:38:14.796733359 +0200
-@@ -12,7 +12,7 @@
- for Switches ("Ada") use Shared.Compiler'Switches ("Ada");
- for Switches ("C") use Shared.Compiler'Switches ("C");
- for Switches ("test_htables.adb") use ("-g", "-O2", "-gnatwue");
-- for Switches ("s-memory.adb") use ("-g", "-O2", "-gnatpg");
-+ for Switches ("s-memory.adb") use ("-g", "-O2", "-gnatpg", "-fPIC");
-
- No_Checks := ("-g", "-O2", "-gnat2012", "-gnatpn");
-
---- a/widgets/widgets.gpr 2017-05-18 22:26:05.117847006 +0200
-+++ b/widgets/widgets.gpr 2017-05-18 22:21:01.646368091 +0200
-@@ -12,6 +12,7 @@
- package Compiler extends Shared.Compiler is
- for Switches ("C") use
- Shared.Compiler'Switches ("C") & GnatColl_Gtk.Gtk_Include;
-+ for Driver ("C") use External ("CC", "gcc");
- end Compiler;
-
- package IDE renames Shared.IDE;
---- a/cli/Makefile 2017-05-19 08:07:44.591042479 +0200
-+++ b/cli/Makefile 2017-05-19 08:08:50.086991123 +0200
-@@ -1,8 +1,9 @@
- GPRBUILD=gprbuild
- GPRCLEAN=gprclean
-+GPRBUILD_FLAGS=0
-
- all default:
-- $(GPRBUILD) -p -Pcli
-+ $(GPRBUILD) $(GPRBUILD_FLAGS) -p -Pcli
-
- clean:
- $(GPRCLEAN) -q -r -Pcli
---- a/gps/gps.gpr 2017-05-19 09:24:19.438123599 +0200
-+++ b/gps/gps.gpr 2017-05-19 09:24:58.639492518 +0200
-@@ -75,7 +75,7 @@
- end case;
- for Switches ("Ada") use Linker'Switches ("Ada")
- & Shared.Linker'Switches ("Ada");
--
-+ for Driver use External ("CC", "gcc");
- -- for Switches ("Ada") use ("-lgmem");
- -- for Switches ("Ada") use ("-pg");
- end Linker;
---- a/testsuite/Makefile 2017-05-19 11:08:48.966913663 +0200
-+++ b/testsuite/Makefile 2017-05-19 11:06:17.245366714 +0200
-@@ -1,5 +1,6 @@
- GPRBUILD=gprbuild
- GPRCLEAN=gprclean
-+GPRBUILD_FLAGS=
-
- SYS := $(shell gcc -dumpmachine)
- ifeq ($(OS),Windows_NT)
-@@ -14,7 +14,7 @@
- endif
-
- all default: package
-- $(GPRBUILD) -P testsuite_drivers.gpr -m -XOS=${OS} -j0 -XLIBRARY_TYPE=relocatable -XXMLADA_BUILD=relocatable
-+ $(GPRBUILD) $(GPRBUILD_FLAGS) -P testsuite_drivers.gpr -m -XOS=${OS} -j0 -XLIBRARY_TYPE=relocatable -XXMLADA_BUILD=relocatable
-
- package:
- mkdir -p share/doc
---- a/testsuite/testsuite_drivers.gpr 2017-05-19 11:21:20.645705481 +0200
-+++ b/testsuite/testsuite_drivers.gpr 2017-05-19 11:15:42.163206405 +0200
-@@ -10,6 +10,10 @@
- for Object_Dir use "obj";
- for Exec_Dir use "bin";
-
-+ package Compiler is
-+ for Switches ("Ada") use ("-fPIC");
-+ end Compiler;
-+
- package Builder is
- for Switches ("Ada") use ("-gnat12", "-ws", "-g", "-j0", "-m", "-gnaty");
- end Builder;
---- a/Makefile.in 2017-05-19 11:49:47.172018411 +0200
-+++ b/Makefile.in 2017-05-19 11:50:24.653412280 +0200
-@@ -10,7 +10,7 @@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_DATA = @INSTALL_DATA@
- GNATCOLL_INSTALL = @GNATCOLL_INSTALL@
--prefix = @prefix@
-+prefix = $(DESTDIR)@prefix@
- bindir = $(prefix)/bin
- sharedir = $(prefix)/share
- examplesdir = $(prefix)/share/examples/gps
---- a/docs/Makefile.in 2017-05-19 11:54:52.805076624 +0200
-+++ b/docs/Makefile.in 2017-05-19 11:55:24.332566945 +0200
-@@ -1,4 +1,4 @@
--prefix = @prefix@
-+prefix = $(DESTDIR)@prefix@
- docdir = $(prefix)/share/doc/gps
- sharedir = $(prefix)/share/gps
-
---- a/share/support/core/gnat_help_menus.py 2017-11-23 21:41:11.897912345 +0100
-+++ b/share/support/core/gnat_help_menus.py 2017-11-23 21:44:53.019038030 +0100
-@@ -25,7 +25,7 @@
- # GPRbuild
- 'gprbuild': {"GPR Tools User's Guide":
- ('gprbuild/html/gprbuild_ug.html', 'GPR/')},
-- 'gnatls': {
-+ '@GNATLS@': {
- # Ada RMs
- "Ada 2005 Reference Manual": ('gnat/html/arm05.html', 'Ada/'),
- "Ada 2012 Reference Manual": ('gnat/html/arm12.html', 'Ada/'),
-@@ -86,8 +86,8 @@
-
- for exec_name in _DOC_ENTRIES.keys():
- executable = exec_name
-- if exec_name == 'gnatls' and GPS.get_target():
-- executable = '{}-gnatls'.format(GPS.get_target())
-+ if exec_name == '@GNATLS@' and GPS.get_target():
-+ executable = '{}-@GNATLS@'.format(GPS.get_target())
- ex = os_utils.locate_exec_on_path(executable)
- if ex:
- for descr, tup in _DOC_ENTRIES[exec_name].iteritems():
---- a/share/support/core/toolchains.py 2017-11-23 21:46:11.969652447 +0100
-+++ b/share/support/core/toolchains.py 2017-11-23 21:47:21.723427305 +0100
-@@ -16,11 +16,11 @@
- nullified by using an empty value in the corresponding tag
- -->
- <toolchain_default>
-- <gnat_driver>gnat</gnat_driver>
-- <gnat_list>gnatls</gnat_list>
-+ <gnat_driver>@GNAT@</gnat_driver>
-+ <gnat_list>@GNATLS@</gnat_list>
- <debugger>gdb</debugger>
- <cpp_filt>c++filt</cpp_filt>
-- <compiler lang="ada">gnatmake</compiler>
-+ <compiler lang="ada">@GNATMAKE@</compiler>
- <compiler lang="c">gcc</compiler>
- <compiler lang="c++">g++</compiler>
- <compiler lang="asm">gcc</compiler>
---- a/share/support/core/projects.py 2017-11-23 21:49:13.477462632 +0100
-+++ b/share/support/core/projects.py 2017-11-23 21:51:53.774640693 +0100
-@@ -143,7 +143,7 @@
- <string />
- </index>
- <specialized_index value="Ada">
-- <choice default="true" >gnatmake</choice>
-+ <choice default="true" >@GNATMAKE@</choice>
- </specialized_index>
- </project_attribute>
-
-@@ -163,7 +163,7 @@
- description="The gnatls command used to find where the Ada run time files are installed (including optional arguments, e.g. gnatls --RTS=sjlj)."
- hide_in="all"
- label="Gnatls">
-- <choice default="true" >gnatls</choice>
-+ <choice default="true" >@GNATLS@</choice>
- <string />
- </project_attribute>
-
-@@ -175,7 +175,7 @@
- description="The gnat driver used to run the various commands associated with the GNAT toolchain."
- hide_in="all"
- label="Gnat">
-- <choice default="true" >gnat</choice>
-+ <choice default="true" >@GNAT@</choice>
- <string />
- </project_attribute>
-
---- a/cli/src/gps-cli_utils.adb 2017-11-23 22:00:22.716652753 +0100
-+++ b/cli/src/gps-cli_utils.adb 2017-11-23 22:01:19.885640611 +0100
-@@ -166,7 +166,7 @@
-
- -- Set GNAT version
- Kernel.Registry.Environment.Set_Path_From_Gnatls
-- ("gnatls", GNAT_Version);
-+ ("@GNATLS@", GNAT_Version);
- end Create_Kernel_Context;
-
- ----------------------------
---- a/toolchains_editor/core/src/toolchains.adb 2017-11-23 22:02:52.819994229 +0100
-+++ b/toolchains_editor/core/src/toolchains.adb 2017-11-23 22:07:20.326248295 +0100
-@@ -309,12 +309,13 @@
- else
- Set_Command
- (Tc, GNAT_Driver,
-- To_String (Full_Path) & "gnat",
-+ To_String (Full_Path) & "@GNAT@",
- From_Default,
- Is_Default_Path);
- Set_Command
- (Tc, GNAT_List,
-- To_String (Full_Path) & "gnatls",
-+ To_String (Full_Path) &
-+ "@GNATLS@",
- From_Default,
- Is_Default_Path);
- Set_Command
-@@ -728,10 +728,10 @@
- begin
- case Name is
- when GNAT_List =>
-- return "gnatls";
-+ return "@GNATLS@";
-
- when GNAT_Driver =>
-- return "gnat";
-+ return "@GNAT@";
-
- when Debugger =>
- return "gdb";
-@@ -2000,15 +2000,18 @@
- Manager => Toolchain_Manager (Manager),
- Refs => 0);
-
-- Set_Command (Native_Toolchain, GNAT_Driver, "gnat", From_Default, True);
-- Set_Command (Native_Toolchain, GNAT_List, "gnatls", From_Default, True);
-+ Set_Command (Native_Toolchain, GNAT_Driver,
-+ "@GNAT@", From_Default, True);
-+ Set_Command (Native_Toolchain, GNAT_List,
-+ "@GNATLS@", From_Default, True);
- Set_Command (Native_Toolchain, Debugger, "gdb", From_Default, True);
- Set_Command (Native_Toolchain, CPP_Filt, "c++filt", From_Default, True);
-
- Compute_Predefined_Paths (Native_Toolchain);
-
- if Get_Compiler (Native_Toolchain, "Ada") = No_Compiler then
-- Add_Compiler (Native_Toolchain, "Ada", "gnatmake", From_Default);
-+ Add_Compiler (Native_Toolchain, "Ada",
-+ "@GNATMAKE@", From_Default);
- end if;
-
- if Get_Compiler (Native_Toolchain, "C") = No_Compiler then
---- a/gps/Makefile 2017-12-10 20:29:18.267622400 +0100
-+++ b/gps/Makefile 2017-12-10 20:29:34.564312700 +0100
-@@ -45,7 +45,8 @@
- for f in ../kernel/generated/*; do cat $$f | tr -d '\015' > $$f-aux; mv -f $$f-aux $$f; done
- endif
- $(GPRBUILD) $(GPRBUILD_FLAGS) -m -p -ws -XTP_TASKING=No_Tasking \
-- $(GPRBUILD_BUILD_TYPE_FLAGS) -Pgps -largs `pkg-config gmodule-2.0 --libs`
-+ $(GPRBUILD_BUILD_TYPE_FLAGS) -Pgps -largs `pkg-config gmodule-2.0 --libs` \
-+ -cargs:Ada $(ADAFLAGS) -cargs:C ${CFLAGS}
-
- resources:
- ifeq ($(OS),Windows_NT)
---- a/common/common_no_xmlada.gpr.in 2017-12-10 20:48:13.986166250 +0100
-+++ b/common/common_no_xmlada.gpr.in 2017-12-10 20:48:29.654872055 +0100
-@@ -22,6 +22,7 @@
- for Switches ("dynamic_arrays.adb") use No_Checks;
- when "Debug" =>
- end case;
-+ for Driver ("C") use External ("CC", "gcc");
- end Compiler;
-
- package Naming is
---- a/common/common_with_xmlada.gpr.in 2017-12-10 20:48:37.352727540 +0100
-+++ b/common/common_with_xmlada.gpr.in 2017-12-10 20:48:50.423482155 +0100
-@@ -23,6 +23,7 @@
- for Switches ("dynamic_arrays.adb") use No_Checks;
- when "Debug" =>
- end case;
-+ for Driver ("C") use External ("CC", "gcc");
- end Compiler;
-
- package Binder is
---- a/shared.gpr.in 2017-12-10 20:52:51.117967249 +0100
-+++ b/shared.gpr.in 2017-12-10 20:53:15.627507886 +0100
-@@ -56,6 +56,7 @@
- );
- for Switches ("C") use Optimize & ("-g", "-O2");
- end case;
-+ for Driver ("C") use External ("CC", "gcc");
- end Compiler;
-
- package Binder is
diff --git a/dev-ada/gps/gps-2017.ebuild b/dev-ada/gps/gps-2017.ebuild
deleted file mode 100644
index 0cc43ab4908..00000000000
--- a/dev-ada/gps/gps-2017.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-inherit python-single-r1 autotools desktop
-
-MYP=${PN}-gpl-${PV}-src
-
-DESCRIPTION="The GNAT Programming Studio"
-HOMEPAGE="http://libre.adacore.com/tools/gps/"
-SRC_URI="http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed03b
- -> ${MYP}.tar.gz
- doc? ( http://mirrors.cdn.adacore.com/art/591c6d80c7a447af2deed1d7
- -> gnat-gpl-2017-x86_64-linux-bin.tar.gz )"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc gnat_2016 +gnat_2017 gnat_2018"
-
-RDEPEND="${PYTHON_DEPS}
- dev-ada/gnatcoll[gtk,iconv,pygobject,sqlite,static-libs,tools]
- ~dev-ada/gtkada-2017
- dev-ada/libadalang
- dev-libs/gobject-introspection
- dev-libs/libffi
- sys-devel/clang:=
- x11-themes/adwaita-icon-theme
- x11-themes/hicolor-icon-theme
- dev-python/pep8[${PYTHON_USEDEP}]
- dev-python/jedi[${PYTHON_USEDEP}]"
-
-DEPEND="${RDEPEND}"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- ^^ ( gnat_2016 gnat_2017 ) !gnat_2018"
-
-RESTRICT="test"
-
-S="${WORKDIR}"/${MYP}
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-src_prepare() {
- default
- if use gnat_2016; then
- GCC_PV=4.9.4
- else
- GCC_PV=6.3.0
- fi
- mv configure.{in,ac} || die
- sed -i \
- -e "s:@GNATMAKE@:${CHOST}-gnatmake-${GCC_PV}:g" \
- -e "s:@GNAT@:${CHOST}-gnat-${GCC_PV}:g" \
- -e "s:@GNATLS@:${CHOST}-gnatls-${GCC_PV}:g" \
- aclocal.m4 \
- share/support/core/gnat_help_menus.py \
- share/support/core/toolchains.py \
- share/support/core/projects.py \
- cli/src/gps-cli_utils.adb \
- toolchains_editor/core/src/toolchains.adb \
- || die
- eautoreconf
-}
-
-src_configure() {
- econf \
- --with-clang=$(llvm-config --libdir)
-}
-
-src_compile() {
- ADAFLAGS+=" -fno-strict-aliasing"
- emake GPRBUILD_FLAGS="-v ${MAKEOPTS} \
- -XLIBRARY_TYPE=relocatable \
- -XGPR_BUILD=relocatable \
- -XXMLADA_BUILD=relocatable"
-}
-
-src_install() {
- default
- if use doc; then
- insinto /usr/share/doc
- doins -r "${WORKDIR}"/gnat-gpl-2017-x86_64-linux-bin/share/doc/gnat
- fi
- make_desktop_entry "${PN}" "GPS" "${EPREFIX}/usr/share/gps/icons/hicolor/32x32/apps/gps_32.png" "Development;IDE;"
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-ada/gps/, dev-ada/gps/files/
@ 2020-05-01 8:54 Michał Górny
0 siblings, 0 replies; 4+ messages in thread
From: Michał Górny @ 2020-05-01 8:54 UTC (permalink / raw
To: gentoo-commits
commit: 975a01a2c0e74b0819120a28396c24279142fa52
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri May 1 08:33:42 2020 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri May 1 08:53:32 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=975a01a2
dev-ada/gps: Remove old (LLVM 7)
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-ada/gps/Manifest | 2 -
dev-ada/gps/files/gps-2018-gentoo.patch | 77 -----------------------
dev-ada/gps/gps-2018-r3.ebuild | 107 --------------------------------
3 files changed, 186 deletions(-)
diff --git a/dev-ada/gps/Manifest b/dev-ada/gps/Manifest
index 59e48b46d1a..354ebeca404 100644
--- a/dev-ada/gps/Manifest
+++ b/dev-ada/gps/Manifest
@@ -1,6 +1,4 @@
DIST ada_language_server-2019-src.tar.gz 169018 BLAKE2B 3ed7412773887f6ebe58a8b08a6befa8be780d10c1abb3a38f524918fb60d7213699e2c7a2cd845d5dd154f9eccf8672ce8833e408dcdaa3621d173a0a8e5818 SHA512 dd25878719c5237c2f1e01097076758f25a350705a58c2988ff3e92179ceaf659981cdd0887df9916e4c1e2226419ebd526f14716da4d3fda0fcf454b9122d37
-DIST gps-gpl-2018-src.tar.gz 40541905 BLAKE2B abe38dd23d9afede27b4ec8294e3245c12d52d60491b6e7c1b2d120a6f1e5d808fdcfb648e72da31376e2de176f7a039c5493341ad295db33b6a1ce44bb64096 SHA512 da0eaa85eb753f215354c9765272d85378f36ebe207314bab9211642f9d9b505a3d05cdec9de6964ae9139c4f8942a29e06c72db32b2aeb053a694e9c982e470
DIST gps-gpl-2019-src.tar.gz 13758956 BLAKE2B 71158537d9d970b97db06c1a5ed40cfec2f7c8523dbced763227463450b4fd469817abcd61339cde96a13bb2b721141339b15444e55bdc64cee7ed2458fd42ed SHA512 4420311303122fd365794830fb7a7868832b8211804d6e11773f598c307229b139993b3c81d91646f7b5aa9a7fba118895234c4ac89193d960dd3170a04e52a7
DIST gtk+-3.14.15-src.tar.gz 32009863 BLAKE2B 93c6897c431fa8e1c19ea758378bc7e365d486d1decccefbba64876d8c51a488e6bcf932481daa11e7e43a960a328c3db746e41a845e574c6b6070ab71e23188 SHA512 add4607a1758319a938d2be0bbd0dd140c4099accffa9301e3049bc460bf94f395c5a092368214e8b28d53bc25335d1b8329b50c7eb80a1e9a65b2e154135b84
DIST libadalang-tools-2019-20190517-195C4-src.tar.gz 625775 BLAKE2B 2ec69e307576c505d20a43d229b13404966f4442778e5390da327ae71cc065873de4fff03a720949fa6bfb5ce66f405e7d45f7f0c21032a639efcff208323aed SHA512 b7368606847244cbb08ff2111fabfbfc8a9aa7f58e953febc70838006d94711dba1fd75bfb69ed2081a37a2dfaaad46097127870696c882d7cc54de5d7b051a1
-DIST libadalang-tools-gpl-2018-src.tar.gz 19938182 BLAKE2B 34104f3bc43c165a9b74ba8c0c03ee2f34686bcd06b5ced730f70f654d8b808e129a85566e081830b4f20304c793eefe0af81b56984cf06190302ad2f6a419be SHA512 a1176575944cd88b9da5f4e9f03caa1a4d09358df71e6a91300d0b35c2a843d0ea1a77fbd93e7b7f16cef1b978022ee20991f5c2ff74f7d05878c3de1220f2b5
diff --git a/dev-ada/gps/files/gps-2018-gentoo.patch b/dev-ada/gps/files/gps-2018-gentoo.patch
deleted file mode 100644
index 6e258bac36a..00000000000
--- a/dev-ada/gps/files/gps-2018-gentoo.patch
+++ /dev/null
@@ -1,77 +0,0 @@
---- a/gps/Makefile 2018-07-09 20:27:34.950424490 +0200
-+++ b/gps/Makefile 2018-07-09 20:37:39.510558817 +0200
-@@ -47,7 +47,8 @@
- for f in ../kernel/generated/*; do cat $$f | tr -d '\015' > $$f-aux; mv -f $$f-aux $$f; done
- endif
- $(GPRBUILD) $(GPRBUILD_FLAGS) -m -p -ws \
-- $(GPRBUILD_BUILD_TYPE_FLAGS) -Pgps -largs `pkg-config gmodule-2.0 --libs`
-+ $(GPRBUILD_BUILD_TYPE_FLAGS) -Pgps -largs `pkg-config gmodule-2.0 --libs` -lpython2.7 \
-+ -cargs:Ada ${ADAFLAGS} -cargs:C ${CFLAGS}
-
- resources:
- ifeq ($(OS),Windows_NT)
---- a/Makefile.in 2018-07-09 21:51:08.422550386 +0200
-+++ b/Makefile.in 2018-07-09 21:51:32.187225891 +0200
-@@ -10,7 +10,7 @@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_DATA = @INSTALL_DATA@
- GNATCOLL_INSTALL = @GNATCOLL_INSTALL@
--prefix = @prefix@
-+prefix = $(DESTDIR)@prefix@
- bindir = $(prefix)/bin
- sharedir = $(prefix)/share
- examplesdir = $(prefix)/share/examples/gps
---- a/docs/Makefile.in 2018-07-09 21:53:33.074572729 +0200
-+++ b/docs/Makefile.in 2018-07-09 21:53:52.149311484 +0200
-@@ -1,4 +1,4 @@
--prefix = @prefix@
-+prefix = $(DESTDIR)@prefix@
- docdir = $(prefix)/share/doc/gps
- sharedir = $(prefix)/share/gps
-
---- a/share/support/core/toolchains.py 2018-07-11 12:15:18.758674244 +0200
-+++ b/share/support/core/toolchains.py 2018-07-11 12:20:20.389220849 +0200
-@@ -16,11 +16,11 @@
- nullified by using an empty value in the corresponding tag
- -->
- <toolchain_default>
-- <gnat_driver>gnat</gnat_driver>
-- <gnat_list>gnatls</gnat_list>
-+ <gnat_driver>@GNAT@</gnat_driver>
-+ <gnat_list>@GNATLS@</gnat_list>
- <debugger>gdb</debugger>
- <cpp_filt>c++filt</cpp_filt>
-- <compiler lang="ada">gnatmake</compiler>
-+ <compiler lang="ada">@GNATMAKE@</compiler>
- <compiler lang="c">gcc</compiler>
- <compiler lang="c++">g++</compiler>
- <compiler lang="asm">gcc</compiler>
---- a/share/support/core/projects.py 2018-07-11 13:49:29.631289680 +0200
-+++ b/share/support/core/projects.py 2018-07-11 13:51:46.568252607 +0200
-@@ -146,7 +146,7 @@
- <string />
- </index>
- <specialized_index value="Ada">
-- <choice default="true" >gnatmake</choice>
-+ <choice default="true" >@GNATMAKE@</choice>
- </specialized_index>
- </project_attribute>
-
-@@ -166,7 +166,7 @@
- description="The gnatls command used to find where the Ada run time files are installed (including optional arguments, e.g. gnatls --RTS=sjlj)."
- hide_in="all"
- label="Gnatls">
-- <choice default="true" >gnatls</choice>
-+ <choice default="true" >@GNATLS@</choice>
- <string />
- </project_attribute>
-
-@@ -178,7 +178,7 @@
- description="The gnat driver used to run the various commands associated with the GNAT toolchain."
- hide_in="all"
- label="Gnat">
-- <choice default="true" >gnat</choice>
-+ <choice default="true" >@GNAT@</choice>
- <string />
- </project_attribute>
-
diff --git a/dev-ada/gps/gps-2018-r3.ebuild b/dev-ada/gps/gps-2018-r3.ebuild
deleted file mode 100644
index 49dd272c9a9..00000000000
--- a/dev-ada/gps/gps-2018-r3.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 )
-ADA_COMPAT=( gnat_2018 )
-inherit ada python-single-r1 autotools desktop llvm multilib
-
-MYP=${PN}-gpl-${PV}-src
-
-DESCRIPTION="The GNAT Programming Studio"
-HOMEPAGE="http://libre.adacore.com/tools/gps/"
-SRC_URI="http://mirrors.cdn.adacore.com/art/5b0cf627c7a4475261f97ceb
- -> ${MYP}.tar.gz
- http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27a59 ->
- libadalang-tools-gpl-2018-src.tar.gz
- http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27a61 ->
- gtk+-3.14.15-src.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="${PYTHON_DEPS}
- dev-ada/gnatcoll-db[${ADA_USEDEP},db2ada,gnatinspect,xref]
- dev-ada/gnatcoll-bindings[${ADA_USEDEP},python]
- ~dev-ada/gtkada-2018[${ADA_USEDEP}]
- ~dev-ada/libadalang-2018[${ADA_USEDEP}]
- dev-libs/gobject-introspection
- dev-libs/libffi
- sys-devel/llvm:7
- sys-devel/clang:=
- x11-themes/adwaita-icon-theme
- x11-themes/hicolor-icon-theme
- $(python_gen_cond_dep '
- dev-python/pep8[${PYTHON_MULTI_USEDEP}]
- dev-python/jedi[${PYTHON_MULTI_USEDEP}]
- ')"
-
-DEPEND="${RDEPEND}"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- ${ADA_REQUIRED_USE}"
-
-RESTRICT="test"
-
-S="${WORKDIR}"/${MYP}
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-pkg_setup() {
- LLVM_MAX_SLOT=7
- llvm_pkg_setup
- python-single-r1_pkg_setup
- ada_pkg_setup
-}
-
-src_prepare() {
- default
- sed -i \
- -e "s:@GNATMAKE@:${GNATMAKE}:g" \
- -e "s:@GNAT@:${GNAT}:g" \
- -e "s:@GNATLS@:${GNATLS}:g" \
- share/support/core/toolchains.py \
- share/support/core/projects.py \
- || die
- mv "${WORKDIR}"/libadalang-tools-src laltools
- echo "#!/bin/bash" > gps.sh
- echo "export LD_LIBRARY_PATH=/usr/$(get_libdir)/gps" >> gps.sh
- echo 'exec /usr/bin/gps_exe "$@"' >> gps.sh
- cd ../gtk+-3.14.15-src
- sed -i \
- -e "/^libadd/s:=.*$:= \\\:" \
- -e "/^deps/s:=.*$:= \\\:" \
- ../gtk+-3.14.15-src/gtk/Makefile.in
-}
-
-src_configure() {
- econf \
- --with-clang=$(llvm-config --libdir)
- cd ../gtk+-3.14.15-src
- econf --disable-cups
-}
-
-src_compile() {
- emake -C gps GPRBUILD_FLAGS="-v ${MAKEOPTS} \
- -XGPR_BUILD=relocatable" \
- Build=Production
- gprbuild -v -p -Pcli/cli.gpr ${MAKEOPTS} -XLIBRARY_TYPE=relocatable \
- -XGPR_BUILD=relocatable -cargs:Ada ${ADAFLAGS} || die
- cd ../gtk+-3.14.15-src
- emake -C gtk/inspector
- emake -C gtk gtk.gresource.xml gtkdbusgenerated.c gtkdbusgenerated.h
- emake -C gtk libgtk-3.la
-}
-
-src_install() {
- default
- make_desktop_entry "${PN}" "GPS" "${EPREFIX}/usr/share/gps/icons/hicolor/32x32/apps/gps_32.png" "Development;IDE;"
- mv "${D}"/usr/bin/gps{,_exe}
- newbin gps.sh gps
- cd ../gtk+-3.14.15-src
- emake -C gtk DESTDIR="${D}" install-libLTLIBRARIES
- rm "${D}"/usr/$(get_libdir)/libgtk-3.{la,so,so.0} || die
- dosym ../libgtk-3.so.0.1400.15 /usr/$(get_libdir)/gps/libgtk-3.so.0
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-05-01 8:54 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-11-21 20:47 [gentoo-commits] repo/gentoo:master commit in: dev-ada/gps/, dev-ada/gps/files/ Alfredo Tupone
-- strict thread matches above, loose matches on Subject: below --
2018-11-29 21:02 Alfredo Tupone
2019-11-03 18:15 Alfredo Tupone
2020-05-01 8:54 Michał Górny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox