* [gentoo-commits] repo/gentoo:master commit in: dev-ada/gtkada/files/, dev-ada/gtkada/
@ 2017-06-30 14:32 Alfredo Tupone
0 siblings, 0 replies; 5+ messages in thread
From: Alfredo Tupone @ 2017-06-30 14:32 UTC (permalink / raw
To: gentoo-commits
commit: 2847613455c888834886aeaed6ec17cd866316f8
Author: Tupone Alfredo <tupone <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 30 14:32:30 2017 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Fri Jun 30 14:32:30 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28476134
dev-ada/gtkada: Add version 2017. Purge 17 and 9999 versions
Package-Manager: Portage-2.3.6, Repoman-2.3.1
dev-ada/gtkada/Manifest | 2 +-
dev-ada/gtkada/files/gtkada-17.0-gentoo.patch | 85 ----------------------
dev-ada/gtkada/files/gtkada-2016-gentoo.patch | 9 ---
...-9999-gentoo.patch => gtkada-2017-gentoo.patch} | 25 ++-----
dev-ada/gtkada/gtkada-2016.ebuild | 32 ++++----
.../{gtkada-17.0.ebuild => gtkada-2017.ebuild} | 37 +++++-----
dev-ada/gtkada/gtkada-9999.ebuild | 64 ----------------
dev-ada/gtkada/metadata.xml | 2 +
8 files changed, 42 insertions(+), 214 deletions(-)
diff --git a/dev-ada/gtkada/Manifest b/dev-ada/gtkada/Manifest
index afbfcbfb186..f5ce2c9907a 100644
--- a/dev-ada/gtkada/Manifest
+++ b/dev-ada/gtkada/Manifest
@@ -1,2 +1,2 @@
-DIST gtkada-17.0.tar.gz 5358097 SHA256 65298b7ce604963ab389d5577a2c71c0f0276b176d7387ac55195dc644b87449 SHA512 d2970d9cfb2c1a893e5fc146e41683583bcc70cfb744ba19e953fd00916488b39d96c59170c1d5272eb0b45deebcc906ec1be4a31d1141540a8feceb7b2cb034 WHIRLPOOL fd30280050ca42570509660c5afda2fbd3c463f016a0d8bee62f8d3e88e553600801fae00c97dd3a57ae0dc955fe1e3804250cdaa553a94d5316bb35b3f4cab8
DIST gtkada-gpl-2016-src.tgz 11944697 SHA256 263cc8323e726ae22946508792dd719ff266a9e847a4f7c95e27bd13d3fb4d8f SHA512 90912e15d9e22574a3d86e8bd052d4ce0a0d8018386f699dc1ce3c345978e9b3ddc7bdd3e4247a264496c5da7cff6ae68589a02f43193fc957c418e2a8ef63c7 WHIRLPOOL fc12f151c65ccef5d23b520cfc0625606ece06e56ed2d5b28e39bd65e51850d9b5c40e7382207f1d9186f93ce9232f6024bec977af6973163eb6603178dc1a30
+DIST gtkada-gpl-2017-src.tgz 11952333 SHA256 545a125dd41cce2a5e4aeeefbd9538e9e8c7aecbe39c106d27078eb5a649b5f0 SHA512 f5bbb9ebdd966e70b3edcaaf359cb9e75edba3c3f4f8febfa7de9f634f8e96cd0dd1482fb16ad852b1c9f9b0e2c16eb3a437120d37f0638d90af666620f09f3f WHIRLPOOL 69a05d9e8cd956681951a7adeb5eedd5b13f8d403f5fd0f2473e1f2f4579676314cfa7aac81631fe0e8f68362cdb09dde685b8b2bf30801c38f82ae7ba484b88
diff --git a/dev-ada/gtkada/files/gtkada-17.0-gentoo.patch b/dev-ada/gtkada/files/gtkada-17.0-gentoo.patch
deleted file mode 100644
index fbc2cefac53..00000000000
--- a/dev-ada/gtkada/files/gtkada-17.0-gentoo.patch
+++ /dev/null
@@ -1,85 +0,0 @@
---- gtkada-gpl-2015-src/shared.gpr.in.old 2017-01-05 23:28:35.838073270 +0100
-+++ gtkada-gpl-2015-src/shared.gpr.in 2017-01-05 23:30:17.752255709 +0100
-@@ -44,6 +44,8 @@
- for Switches ("C") use ("-O2");
- end case;
-
-+ for Driver ("C") use External ("CC", "gcc");
-+ for PIC_Option ("C") use ("-fPIC");
- for Switches ("C") use Compiler'Switches ("C") & Gtk_Include;
- for Switches ("Objective-C") use Compiler'Switches ("Objective-C") & Gtk_Include;
- end Compiler;
---- gtkada-gpl-2016-src/Makefile.in.old 2017-01-21 22:42:18.319969095 +0100
-+++ gtkada-gpl-2016-src/Makefile.in 2017-01-21 22:42:33.989700236 +0100
-@@ -39,7 +39,7 @@
- prefix=@prefix@
- exec_prefix=@exec_prefix@
- libdir=@libdir@
--datadir=@datadir@
-+datadir=$(DESTDIR)@datadir@
- datarootdir=@datarootdir@
- exampledir=${datadir}/examples/gtkada/testgtk
-
-@@ -60,30 +60,33 @@
- LIBRARY_TYPE_FOR_TOOLS=static
- endif
-
--all: tools tests
-+all: tools
- static: build_library_type/static
- relocatable: build_library_type/relocatable
-
- tools:
- @echo "====== Building tools ====="
-- ${GPRBUILD_FULL} -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) -Psrc/tools/tools.gpr
-+ ${GPRBUILD_FULL} -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) \
-+ -Psrc/tools/tools.gpr -cargs:Ada $(ADAFLAGS)
-
- build_library_type/%: src/gtkada-intl.adb
- @echo "====== Building $(@F) libraries ====="
-- ${GPRBUILD_FULL} -XLIBRARY_TYPE=$(@F) -Psrc/gtkada.gpr
-+ ${GPRBUILD_FULL} -XLIBRARY_TYPE=$(@F) -Psrc/gtkada.gpr \
-+ -cargs:Ada $(ADAFLAGS) -cargs:C $(CFLAGS)
- ifeq (${HAVE_OPENGL}, True)
- ${GPRBUILD_FULL} -XLIBRARY_TYPE=$(@F) -Psrc/opengl/gtkada_gl.gpr
- endif
-
- src/gtkada-intl.adb: src/gtkada-intl.gpb Makefile
-- gnatprep -DGETTEXT_INTL=$(GETTEXT_INTL) -DHAVE_GETTEXT=$(HAVE_GETTEXT) src/gtkada-intl.gpb $@
-+ $(GNATPREP) -DGETTEXT_INTL=$(GETTEXT_INTL) -DHAVE_GETTEXT=$(HAVE_GETTEXT) src/gtkada-intl.gpb $@
-
- testgtk/opengl/view_gl.adb: testgtk/opengl/view_gl.gpb Makefile
-- gnatprep -r -c -DHAVE_GL=${HAVE_OPENGL} -DWIN32=False testgtk/opengl/view_gl.gpb $@
-+ $(GNATPREP) -r -c -DHAVE_GL=${HAVE_OPENGL} -DWIN32=False testgtk/opengl/view_gl.gpb $@
-
- tests: testgtk/opengl/view_gl.adb
- @echo "====== Building tests ====="
-- cd testgtk; ${GPRBUILD_FULL} -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) -Ptestgtk.gpr -aP ../src
-+ cd testgtk; ${GPRBUILD_FULL} -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) \
-+ -Ptestgtk.gpr -aP ../src -cargs:Ada $(ADAFLAGS)
-
- install/%: force
- ${GPRINSTALL_FULL} -XLIBRARY_TYPE=$(@F) --build-name=$(@F) \
-@@ -96,7 +96,7 @@
- ifeq (${HAVE_OPENGL}, True)
- ${GPRINSTALL_FULL} -XLIBRARY_TYPE=$(@F) --build-name=$(@F) \
- --sources-subdir=include/gtkada/gtkada_gl.$(@F) \
-- --lib-subdir=${libdir}/gtkada/gtkada_gl.$(@F) \
-+ --lib-subdir=lib/gtkada/gtkada_gl.$(@F) \
- -Psrc/opengl/gtkada_gl.gpr
- endif
-
-@@ -118,12 +118,9 @@
- --project-subdir=lib/gnat gtkada
- endif
-
--install: install-clean
-+install:
- ${GPRINSTALL_FULL} -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) \
- --mode=usage -Psrc/tools/tools.gpr
-- cd testgtk; ${GPRINSTALL_FULL} -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) \
-- --mode=usage --exec-subdir=${DESTDIR}${exampledir} \
-- -Ptestgtk.gpr -aP ../src
-
- @echo '-----------------------------------------------------------------------'
- @echo '-- GtkAda has now been installed. --'
diff --git a/dev-ada/gtkada/files/gtkada-2016-gentoo.patch b/dev-ada/gtkada/files/gtkada-2016-gentoo.patch
index a9550fe883f..808b07dfdfa 100644
--- a/dev-ada/gtkada/files/gtkada-2016-gentoo.patch
+++ b/dev-ada/gtkada/files/gtkada-2016-gentoo.patch
@@ -11,15 +11,6 @@
end Compiler;
--- gtkada-gpl-2016-src/Makefile.in.old 2017-01-21 22:42:18.319969095 +0100
+++ gtkada-gpl-2016-src/Makefile.in 2017-01-21 22:42:33.989700236 +0100
-@@ -39,7 +39,7 @@
- prefix=@prefix@
- exec_prefix=@exec_prefix@
- libdir=@libdir@
--datadir=@datadir@
-+datadir=$(DESTDIR)@datadir@
- datarootdir=@datarootdir@
- exampledir=${datadir}/examples/gtkada/testgtk
-
@@ -60,30 +60,33 @@
LIBRARY_TYPE_FOR_TOOLS=static
endif
diff --git a/dev-ada/gtkada/files/gtkada-9999-gentoo.patch b/dev-ada/gtkada/files/gtkada-2017-gentoo.patch
similarity index 81%
rename from dev-ada/gtkada/files/gtkada-9999-gentoo.patch
rename to dev-ada/gtkada/files/gtkada-2017-gentoo.patch
index 8b0f82e9572..ec8ebdf8f60 100644
--- a/dev-ada/gtkada/files/gtkada-9999-gentoo.patch
+++ b/dev-ada/gtkada/files/gtkada-2017-gentoo.patch
@@ -4,22 +4,13 @@
for Switches ("C") use ("-O2");
end case;
-+ for Driver ("C") use External ("CC", "gcc");
++ for Driver ("C") use External ("GCC", "gcc");
+ for PIC_Option ("C") use ("-fPIC");
for Switches ("C") use Compiler'Switches ("C") & Gtk_Include;
for Switches ("Objective-C") use Compiler'Switches ("Objective-C") & Gtk_Include;
end Compiler;
--- gtkada-gpl-2016-src/Makefile.in.old 2017-01-21 22:42:18.319969095 +0100
+++ gtkada-gpl-2016-src/Makefile.in 2017-01-21 22:42:33.989700236 +0100
-@@ -39,7 +39,7 @@
- prefix=@prefix@
- exec_prefix=@exec_prefix@
- libdir=@libdir@
--datadir=@datadir@
-+datadir=$(DESTDIR)@datadir@
- datarootdir=@datarootdir@
- exampledir=${datadir}/examples/gtkada/testgtk
-
@@ -60,30 +60,33 @@
LIBRARY_TYPE_FOR_TOOLS=static
endif
@@ -32,13 +23,13 @@
tools:
@echo "====== Building tools ====="
- ${GPRBUILD_FULL} -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) -Psrc/tools/tools.gpr
-+ ${GPRBUILD_FULL} -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) \
++ ${GPRBUILD_FULL} -v -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) \
+ -Psrc/tools/tools.gpr -cargs:Ada $(ADAFLAGS)
build_library_type/%: src/gtkada-intl.adb
@echo "====== Building $(@F) libraries ====="
- ${GPRBUILD_FULL} -XLIBRARY_TYPE=$(@F) -Psrc/gtkada.gpr
-+ ${GPRBUILD_FULL} -XLIBRARY_TYPE=$(@F) -Psrc/gtkada.gpr \
++ ${GPRBUILD_FULL} -v -XLIBRARY_TYPE=$(@F) -Psrc/gtkada.gpr \
+ -cargs:Ada $(ADAFLAGS) -cargs:C $(CFLAGS)
ifeq (${HAVE_OPENGL}, True)
${GPRBUILD_FULL} -XLIBRARY_TYPE=$(@F) -Psrc/opengl/gtkada_gl.gpr
@@ -55,17 +46,13 @@
tests: testgtk/opengl/view_gl.adb
@echo "====== Building tests ====="
- cd testgtk; ${GPRBUILD_FULL} -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) -Ptestgtk.gpr -aP ../src
-+ cd testgtk; ${GPRBUILD_FULL} -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) \
++ cd testgtk; ${GPRBUILD_FULL} -v -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) \
+ -Ptestgtk.gpr -aP ../src -cargs:Ada $(ADAFLAGS)
install/%: force
${GPRINSTALL_FULL} -XLIBRARY_TYPE=$(@F) --build-name=$(@F) \
-@@ -118,12 +118,9 @@
- --project-subdir=lib/gnat gtkada
- endif
-
--install: install-clean
-+install:
+@@ -121,9 +121,6 @@
+ install: install-clean
${GPRINSTALL_FULL} -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) \
--mode=usage -Psrc/tools/tools.gpr
- cd testgtk; ${GPRINSTALL_FULL} -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) \
diff --git a/dev-ada/gtkada/gtkada-2016.ebuild b/dev-ada/gtkada/gtkada-2016.ebuild
index 8f9e4adc92c..6ca105eb365 100644
--- a/dev-ada/gtkada/gtkada-2016.ebuild
+++ b/dev-ada/gtkada/gtkada-2016.ebuild
@@ -15,9 +15,10 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/5739985fc7a447658e0affae
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64"
-IUSE="+shared static"
+IUSE="gnat_2016 gnat_2017 +shared static"
-RDEPEND="dev-lang/gnat-gpl:*
+RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
+ gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )
dev-libs/atk
dev-libs/glib:2
media-libs/fontconfig
@@ -27,23 +28,12 @@ RDEPEND="dev-lang/gnat-gpl:*
x11-libs/gtk+:3
x11-libs/pango"
DEPEND="${RDEPEND}
- dev-ada/gprbuild"
+ dev-ada/gprbuild[gnat_2016=,gnat_2017=]"
S="${WORKDIR}"/${MYP}-src
PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-pkg_setup() {
- GCC=${ADA:-$(tc-getCC)}
- export GNATPREP="${GCC/gcc/gnatprep}"
- if [[ -z "$(type ${GNATPREP} 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-4.9.4 in make.conf"
- die "ada compiler not available"
- fi
-}
-
src_prepare() {
default
mv configure.{in,ac}
@@ -51,19 +41,25 @@ src_prepare() {
}
src_configure() {
+ if use gnat_2016; then
+ GCC_PV=4.9.4
+ else
+ GCC_PV=6.3.0
+ fi
+ GCC=${CHOST}-gcc-${GCC_PV}
econf \
+ --prefix="${D}/usr" \
$(use_enable static) \
$(use_enable shared) \
--without-GL
}
src_compile() {
- GCC=${GCC} emake -j1 PROCESSORS=$(makeopts_jobs)
+ GNATPREP=${CHOST}-gnatprep-${GCC_PV}
+ GCC=${GCC} emake -j1 GNATPREP=${GNATPREP} PROCESSORS=$(makeopts_jobs)
}
src_install() {
- emake -j1 DESTDIR="${D}" install
+ emake -j1 install
einstalldocs
- mv "${D}"usr/share/doc/${PN}/* "${D}"usr/share/doc/${PF} || die
- rmdir "${D}"usr/share/doc/${PN}
}
diff --git a/dev-ada/gtkada/gtkada-17.0.ebuild b/dev-ada/gtkada/gtkada-2017.ebuild
similarity index 55%
rename from dev-ada/gtkada/gtkada-17.0.ebuild
rename to dev-ada/gtkada/gtkada-2017.ebuild
index 850f5959937..659aacbe7b7 100644
--- a/dev-ada/gtkada/gtkada-17.0.ebuild
+++ b/dev-ada/gtkada/gtkada-2017.ebuild
@@ -5,16 +5,20 @@ EAPI=6
inherit autotools multiprocessing
+MYP=${PN}-gpl-${PV}
+
DESCRIPTION="A complete Ada graphical toolkit"
HOMEPAGE="http://libre.adacore.com//tools/gtkada/"
-SRC_URI="https://github.com/AdaCore/gtkada/archive/${P}.tar.gz"
+SRC_URI="http://mirrors.cdn.adacore.com/art/591ae7a8c7a4473fcbb154c9
+ -> ${MYP}-src.tgz"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64"
-IUSE="+shared static"
+IUSE="gnat_2016 gnat_2017 +shared static"
-RDEPEND="dev-lang/gnat-gpl:*
+RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
+ gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )
dev-libs/atk
dev-libs/glib:2
media-libs/fontconfig
@@ -24,23 +28,12 @@ RDEPEND="dev-lang/gnat-gpl:*
x11-libs/gtk+:3
x11-libs/pango"
DEPEND="${RDEPEND}
- dev-ada/gprbuild"
+ dev-ada/gprbuild[gnat_2016=,gnat_2017=]"
-S="${WORKDIR}"/${PN}-${P}
+S="${WORKDIR}"/${MYP}-src
PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-pkg_setup() {
- GCC=${ADA:-$(tc-getCC)}
- export GNATPREP="${GCC/gcc/gnatprep}"
- if [[ -z "$(type ${GNATPREP} 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-4.9.4 in make.conf"
- die "ada compiler not available"
- fi
-}
-
src_prepare() {
default
mv configure.{in,ac}
@@ -48,17 +41,25 @@ src_prepare() {
}
src_configure() {
+ if use gnat_2016; then
+ GCC_PV=4.9.4
+ else
+ GCC_PV=6.3.0
+ fi
+ GCC=${CHOST}-gcc-${GCC_PV}
econf \
+ --prefix="${D}/usr" \
$(use_enable static) \
$(use_enable shared) \
--without-GL
}
src_compile() {
- GCC=${GCC} emake -j1 PROCESSORS=$(makeopts_jobs)
+ GNATPREP=${CHOST}-gnatprep-${GCC_PV}
+ GCC=${GCC} emake -j1 GNATPREP=${GNATPREP} PROCESSORS=$(makeopts_jobs)
}
src_install() {
- emake -j1 DESTDIR="${D}" install
+ emake -j1 install
einstalldocs
}
diff --git a/dev-ada/gtkada/gtkada-9999.ebuild b/dev-ada/gtkada/gtkada-9999.ebuild
deleted file mode 100644
index 9d4e1b093c5..00000000000
--- a/dev-ada/gtkada/gtkada-9999.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools multiprocessing git-r3
-
-DESCRIPTION="A complete Ada graphical toolkit"
-HOMEPAGE="http://libre.adacore.com//tools/gtkada/"
-SRC_URI=""
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS=""
-IUSE="+shared static"
-
-RDEPEND="dev-lang/gnat-gpl:*
- dev-libs/atk
- dev-libs/glib:2
- media-libs/fontconfig
- media-libs/freetype
- x11-libs/cairo
- x11-libs/gdk-pixbuf:2
- x11-libs/gtk+:3
- x11-libs/pango"
-DEPEND="${RDEPEND}
- dev-ada/gprbuild"
-
-EGIT_REPO_URI="https://github.com/AdaCore/gtkada.git"
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-pkg_setup() {
- GCC=${ADA:-$(tc-getCC)}
- export GNATPREP="${GCC/gcc/gnatprep}"
- if [[ -z "$(type ${GNATPREP} 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-4.9.4 in make.conf"
- die "ada compiler not available"
- fi
-}
-
-src_prepare() {
- default
- mv configure.{in,ac}
- eautoreconf
-}
-
-src_configure() {
- econf \
- $(use_enable static) \
- $(use_enable shared) \
- --without-GL
-}
-
-src_compile() {
- GCC=${GCC} emake -j1 PROCESSORS=$(makeopts_jobs)
-}
-
-src_install() {
- emake -j1 DESTDIR="${D}" install
- einstalldocs
-}
diff --git a/dev-ada/gtkada/metadata.xml b/dev-ada/gtkada/metadata.xml
index 520b5b59b81..ba0f05fc23e 100644
--- a/dev-ada/gtkada/metadata.xml
+++ b/dev-ada/gtkada/metadata.xml
@@ -6,6 +6,8 @@
<name>Tupone Alfredo</name>
</maintainer>
<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 gtkada as shared library</flag>
<flag name="static">Build gtkada as static library</flag>
</use>
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-ada/gtkada/files/, dev-ada/gtkada/
@ 2018-02-11 15:44 Alfredo Tupone
0 siblings, 0 replies; 5+ messages in thread
From: Alfredo Tupone @ 2018-02-11 15:44 UTC (permalink / raw
To: gentoo-commits
commit: f987504ac39eed4988dc8053ab35e618444e3539
Author: Tupone Alfredo <tupone <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 11 15:42:37 2018 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Sun Feb 11 15:44:26 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f987504a
dev-ada/gtkada: USE static -> static-libs ; Removed old
Package-Manager: Portage-2.3.19, Repoman-2.3.6
dev-ada/gtkada/Manifest | 1 -
dev-ada/gtkada/files/gtkada-2016-gentoo.patch | 93 ---------------------------
dev-ada/gtkada/gtkada-2016.ebuild | 65 -------------------
dev-ada/gtkada/gtkada-2017.ebuild | 8 ++-
dev-ada/gtkada/metadata.xml | 1 -
5 files changed, 5 insertions(+), 163 deletions(-)
diff --git a/dev-ada/gtkada/Manifest b/dev-ada/gtkada/Manifest
index 93f8f9ce766..7922c993824 100644
--- a/dev-ada/gtkada/Manifest
+++ b/dev-ada/gtkada/Manifest
@@ -1,2 +1 @@
-DIST gtkada-gpl-2016-src.tgz 11944697 BLAKE2B 61760bad9417ef76a8d3779b1fd67cfaf8ec9c1427871ae8152226a5d3a75862a4b4a72480a1d5a1b60ceb06444e89d37440ca5368f954de6a9ba26ac17bef02 SHA512 90912e15d9e22574a3d86e8bd052d4ce0a0d8018386f699dc1ce3c345978e9b3ddc7bdd3e4247a264496c5da7cff6ae68589a02f43193fc957c418e2a8ef63c7
DIST gtkada-gpl-2017-src.tgz 11952333 BLAKE2B 2a333452ff271bba0521235598afdb1abebc4ceeab0f915f173862329ae0986b0fc4f654d3df28eac73af075db224c0b12340c3acd1e4ed0ffc965e4365f8b40 SHA512 f5bbb9ebdd966e70b3edcaaf359cb9e75edba3c3f4f8febfa7de9f634f8e96cd0dd1482fb16ad852b1c9f9b0e2c16eb3a437120d37f0638d90af666620f09f3f
diff --git a/dev-ada/gtkada/files/gtkada-2016-gentoo.patch b/dev-ada/gtkada/files/gtkada-2016-gentoo.patch
deleted file mode 100644
index 808b07dfdfa..00000000000
--- a/dev-ada/gtkada/files/gtkada-2016-gentoo.patch
+++ /dev/null
@@ -1,93 +0,0 @@
---- gtkada-gpl-2015-src/shared.gpr.in.old 2017-01-05 23:28:35.838073270 +0100
-+++ gtkada-gpl-2015-src/shared.gpr.in 2017-01-05 23:30:17.752255709 +0100
-@@ -44,6 +44,8 @@
- for Switches ("C") use ("-O2");
- end case;
-
-+ for Driver ("C") use External ("GCC", "gcc");
-+ for PIC_Option ("C") use ("-fPIC");
- for Switches ("C") use Compiler'Switches ("C") & Gtk_Include;
- for Switches ("Objective-C") use Compiler'Switches ("Objective-C") & Gtk_Include;
- end Compiler;
---- gtkada-gpl-2016-src/Makefile.in.old 2017-01-21 22:42:18.319969095 +0100
-+++ gtkada-gpl-2016-src/Makefile.in 2017-01-21 22:42:33.989700236 +0100
-@@ -60,30 +60,33 @@
- LIBRARY_TYPE_FOR_TOOLS=static
- endif
-
--all: tools tests
-+all: tools
- static: build_library_type/static
- relocatable: build_library_type/relocatable
-
- tools:
- @echo "====== Building tools ====="
-- ${GPRBUILD_FULL} -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) -Psrc/tools/tools.gpr
-+ ${GPRBUILD_FULL} -v -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) \
-+ -Psrc/tools/tools.gpr -cargs:Ada $(ADAFLAGS)
-
- build_library_type/%: src/gtkada-intl.adb
- @echo "====== Building $(@F) libraries ====="
-- ${GPRBUILD_FULL} -XLIBRARY_TYPE=$(@F) -Psrc/gtkada.gpr
-+ ${GPRBUILD_FULL} -v -XLIBRARY_TYPE=$(@F) -Psrc/gtkada.gpr \
-+ -cargs:Ada $(ADAFLAGS) -cargs:C $(CFLAGS)
- ifeq (${HAVE_OPENGL}, True)
- ${GPRBUILD_FULL} -XLIBRARY_TYPE=$(@F) -Psrc/opengl/gtkada_gl.gpr
- endif
-
- src/gtkada-intl.adb: src/gtkada-intl.gpb Makefile
-- gnatprep -DGETTEXT_INTL=$(GETTEXT_INTL) -DHAVE_GETTEXT=$(HAVE_GETTEXT) src/gtkada-intl.gpb $@
-+ $(GNATPREP) -DGETTEXT_INTL=$(GETTEXT_INTL) -DHAVE_GETTEXT=$(HAVE_GETTEXT) src/gtkada-intl.gpb $@
-
- testgtk/opengl/view_gl.adb: testgtk/opengl/view_gl.gpb Makefile
-- gnatprep -r -c -DHAVE_GL=${HAVE_OPENGL} -DWIN32=False testgtk/opengl/view_gl.gpb $@
-+ $(GNATPREP) -r -c -DHAVE_GL=${HAVE_OPENGL} -DWIN32=False testgtk/opengl/view_gl.gpb $@
-
- tests: testgtk/opengl/view_gl.adb
- @echo "====== Building tests ====="
-- cd testgtk; ${GPRBUILD_FULL} -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) -Ptestgtk.gpr -aP ../src
-+ cd testgtk; ${GPRBUILD_FULL} -v -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) \
-+ -Ptestgtk.gpr -aP ../src -cargs:Ada $(ADAFLAGS)
-
- install/%: force
- ${GPRINSTALL_FULL} -XLIBRARY_TYPE=$(@F) --build-name=$(@F) \
-@@ -96,7 +96,7 @@
- ifeq (${HAVE_OPENGL}, True)
- ${GPRINSTALL_FULL} -XLIBRARY_TYPE=$(@F) --build-name=$(@F) \
- --sources-subdir=include/gtkada/gtkada_gl.$(@F) \
-- --lib-subdir=${libdir}/gtkada/gtkada_gl.$(@F) \
-+ --lib-subdir=lib/gtkada/gtkada_gl.$(@F) \
- -Psrc/opengl/gtkada_gl.gpr
- endif
-
-@@ -106,12 +106,9 @@
- --project-subdir=lib/gnat gtkada
- endif
-
--install: install-clean
-+install:
- ${GPRINSTALL_FULL} -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) \
- --mode=usage -Psrc/tools/tools.gpr
-- cd testgtk; ${GPRINSTALL_FULL} -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) \
-- --mode=usage --exec-subdir=${exampledir} \
-- -Ptestgtk.gpr -aP ../src
-
- @echo '-----------------------------------------------------------------------'
- @echo '-- GtkAda has now been installed. --'
---- gtkada-gpl-2016-src/src/gtkada.gpr.old 2017-05-31 14:21:35.007965274 +0200
-+++ gtkada-gpl-2016-src/src/gtkada.gpr 2017-05-31 14:23:16.597315577 +0200
-@@ -41,7 +41,13 @@
- for Library_Name use "gtkada";
- for Library_Version use
- "lib" & Project'Library_Name & Shared.So_Ext & "." & Version;
-- for Library_Options use Shared.Gtk_Libs;
-+
-+ case Shared.Library_Kind is
-+ when "relocatable" =>
-+ for Library_Options use Shared.Gtk_Libs;
-+ when others =>
-+ null;
-+ end case;
-
- package Builder renames Shared.Builder;
- package Naming renames Shared.Naming;
diff --git a/dev-ada/gtkada/gtkada-2016.ebuild b/dev-ada/gtkada/gtkada-2016.ebuild
deleted file mode 100644
index 6ca105eb365..00000000000
--- a/dev-ada/gtkada/gtkada-2016.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools multiprocessing
-
-MYP=${PN}-gpl-${PV}
-
-DESCRIPTION="A complete Ada graphical toolkit"
-HOMEPAGE="http://libre.adacore.com//tools/gtkada/"
-SRC_URI="http://mirrors.cdn.adacore.com/art/5739985fc7a447658e0affae
- -> ${MYP}-src.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="gnat_2016 gnat_2017 +shared static"
-
-RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
- gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )
- dev-libs/atk
- dev-libs/glib:2
- media-libs/fontconfig
- media-libs/freetype
- x11-libs/cairo
- x11-libs/gdk-pixbuf:2
- x11-libs/gtk+:3
- x11-libs/pango"
-DEPEND="${RDEPEND}
- dev-ada/gprbuild[gnat_2016=,gnat_2017=]"
-
-S="${WORKDIR}"/${MYP}-src
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-src_prepare() {
- default
- mv configure.{in,ac}
- eautoreconf
-}
-
-src_configure() {
- if use gnat_2016; then
- GCC_PV=4.9.4
- else
- GCC_PV=6.3.0
- fi
- GCC=${CHOST}-gcc-${GCC_PV}
- econf \
- --prefix="${D}/usr" \
- $(use_enable static) \
- $(use_enable shared) \
- --without-GL
-}
-
-src_compile() {
- GNATPREP=${CHOST}-gnatprep-${GCC_PV}
- GCC=${GCC} emake -j1 GNATPREP=${GNATPREP} PROCESSORS=$(makeopts_jobs)
-}
-
-src_install() {
- emake -j1 install
- einstalldocs
-}
diff --git a/dev-ada/gtkada/gtkada-2017.ebuild b/dev-ada/gtkada/gtkada-2017.ebuild
index 659aacbe7b7..aed9663db24 100644
--- a/dev-ada/gtkada/gtkada-2017.ebuild
+++ b/dev-ada/gtkada/gtkada-2017.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -15,7 +15,7 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/591ae7a8c7a4473fcbb154c9
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64"
-IUSE="gnat_2016 gnat_2017 +shared static"
+IUSE="gnat_2016 +gnat_2017 +shared static-libs"
RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )
@@ -30,6 +30,8 @@ RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
DEPEND="${RDEPEND}
dev-ada/gprbuild[gnat_2016=,gnat_2017=]"
+REQUIRED_USE="^^ ( gnat_2016 gnat_2017 )"
+
S="${WORKDIR}"/${MYP}-src
PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
@@ -49,7 +51,7 @@ src_configure() {
GCC=${CHOST}-gcc-${GCC_PV}
econf \
--prefix="${D}/usr" \
- $(use_enable static) \
+ $(use_enable static-libs static) \
$(use_enable shared) \
--without-GL
}
diff --git a/dev-ada/gtkada/metadata.xml b/dev-ada/gtkada/metadata.xml
index 1b27068850f..e26ee639a2d 100644
--- a/dev-ada/gtkada/metadata.xml
+++ b/dev-ada/gtkada/metadata.xml
@@ -9,7 +9,6 @@
<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 gtkada as shared library</flag>
- <flag name="static">Build gtkada as static library</flag>
</use>
<longdescription lang="en">
GtkAda is an Ada graphical toolkit based on Gtk+, providing the complete set of Gtk+ widgets using the Object-Oriented features of this language. GtkAda supports the latest 3.14 stable releases.
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-ada/gtkada/files/, dev-ada/gtkada/
@ 2019-09-13 20:30 Alfredo Tupone
0 siblings, 0 replies; 5+ messages in thread
From: Alfredo Tupone @ 2019-09-13 20:30 UTC (permalink / raw
To: gentoo-commits
commit: 0297fcaa8f8c13c852cca13f07c1799bda887cb6
Author: Tupone Alfredo <tupone <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 13 20:30:14 2019 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Fri Sep 13 20:30:14 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0297fcaa
dev-ada/gtkada: simplify using ada eclass
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
dev-ada/gtkada/files/gtkada-2017-r1-gentoo.patch | 50 ++++++++++++++++++++
dev-ada/gtkada/gtkada-2017-r1.ebuild | 60 ++++++++++++++++++++++++
dev-ada/gtkada/gtkada-2018-r2.ebuild | 60 ++++++++++++++++++++++++
dev-ada/gtkada/gtkada-2019-r1.ebuild | 60 ++++++++++++++++++++++++
4 files changed, 230 insertions(+)
diff --git a/dev-ada/gtkada/files/gtkada-2017-r1-gentoo.patch b/dev-ada/gtkada/files/gtkada-2017-r1-gentoo.patch
new file mode 100644
index 00000000000..0dbbbe720d0
--- /dev/null
+++ b/dev-ada/gtkada/files/gtkada-2017-r1-gentoo.patch
@@ -0,0 +1,50 @@
+--- gtkada-gpl-2016-src/Makefile.in.old 2017-01-21 22:42:18.319969095 +0100
++++ gtkada-gpl-2016-src/Makefile.in 2017-01-21 22:42:33.989700236 +0100
+@@ -60,30 +60,33 @@
+ LIBRARY_TYPE_FOR_TOOLS=static
+ endif
+
+-all: tools tests
++all: tools
+ static: build_library_type/static
+ relocatable: build_library_type/relocatable
+
+ tools:
+ @echo "====== Building tools ====="
+- ${GPRBUILD_FULL} -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) -Psrc/tools/tools.gpr
++ ${GPRBUILD_FULL} -v -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) \
++ -Psrc/tools/tools.gpr -cargs:Ada $(ADAFLAGS)
+
+ build_library_type/%: src/gtkada-intl.adb
+ @echo "====== Building $(@F) libraries ====="
+- ${GPRBUILD_FULL} -XLIBRARY_TYPE=$(@F) -Psrc/gtkada.gpr
++ ${GPRBUILD_FULL} -v -XLIBRARY_TYPE=$(@F) -Psrc/gtkada.gpr \
++ -cargs:Ada $(ADAFLAGS) -cargs:C $(CFLAGS)
+ ifeq (${HAVE_OPENGL}, True)
+ ${GPRBUILD_FULL} -XLIBRARY_TYPE=$(@F) -Psrc/opengl/gtkada_gl.gpr
+ endif
+
+ src/gtkada-intl.adb: src/gtkada-intl.gpb Makefile
+ gnatprep -DGETTEXT_INTL=$(GETTEXT_INTL) -DHAVE_GETTEXT=$(HAVE_GETTEXT) src/gtkada-intl.gpb $@
+
+ testgtk/opengl/view_gl.adb: testgtk/opengl/view_gl.gpb Makefile
+ gnatprep -r -c -DHAVE_GL=${HAVE_OPENGL} -DWIN32=False testgtk/opengl/view_gl.gpb $@
+
+ tests: testgtk/opengl/view_gl.adb
+ @echo "====== Building tests ====="
+- cd testgtk; ${GPRBUILD_FULL} -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) -Ptestgtk.gpr -aP ../src
++ cd testgtk; ${GPRBUILD_FULL} -v -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) \
++ -Ptestgtk.gpr -aP ../src -cargs:Ada $(ADAFLAGS)
+
+ install/%: force
+ ${GPRINSTALL_FULL} -XLIBRARY_TYPE=$(@F) --build-name=$(@F) \
+@@ -121,9 +121,6 @@
+ install: install-clean
+ ${GPRINSTALL_FULL} -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) \
+ --mode=usage -Psrc/tools/tools.gpr
+- cd testgtk; ${GPRINSTALL_FULL} -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) \
+- --mode=usage --exec-subdir=${DESTDIR}${exampledir} \
+- -Ptestgtk.gpr -aP ../src
+
+ @echo '-----------------------------------------------------------------------'
+ @echo '-- GtkAda has now been installed. --'
diff --git a/dev-ada/gtkada/gtkada-2017-r1.ebuild b/dev-ada/gtkada/gtkada-2017-r1.ebuild
new file mode 100644
index 00000000000..b3522240fd8
--- /dev/null
+++ b/dev-ada/gtkada/gtkada-2017-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ADA_COMPAT=( gnat_201{6,7} )
+inherit ada autotools multiprocessing
+
+MYP=${PN}-gpl-${PV}
+
+DESCRIPTION="A complete Ada graphical toolkit"
+HOMEPAGE="http://libre.adacore.com//tools/gtkada/"
+SRC_URI="http://mirrors.cdn.adacore.com/art/591ae7a8c7a4473fcbb154c9
+ -> ${MYP}-src.tgz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+shared static-libs"
+
+RDEPEND="${ADA_DEPS}
+ dev-libs/atk
+ dev-libs/glib:2
+ media-libs/fontconfig
+ media-libs/freetype
+ x11-libs/cairo
+ x11-libs/gdk-pixbuf:2
+ x11-libs/gtk+:3
+ x11-libs/pango"
+DEPEND="${RDEPEND}
+ dev-ada/gprbuild[${ADA_USEDEP}]"
+
+REQUIRED_USE="${ADA_REQUIRED_USE}"
+
+S="${WORKDIR}"/${MYP}-src
+
+PATCHES=( "${FILESDIR}"/${P}-r1-gentoo.patch )
+
+src_prepare() {
+ default
+ mv configure.{in,ac}
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ --prefix="${D}/usr" \
+ $(use_enable static-libs static) \
+ $(use_enable shared) \
+ --without-GL
+}
+
+src_compile() {
+ emake -j1 PROCESSORS=$(makeopts_jobs)
+}
+
+src_install() {
+ emake -j1 install
+ einstalldocs
+}
diff --git a/dev-ada/gtkada/gtkada-2018-r2.ebuild b/dev-ada/gtkada/gtkada-2018-r2.ebuild
new file mode 100644
index 00000000000..3e45f9b6dc9
--- /dev/null
+++ b/dev-ada/gtkada/gtkada-2018-r2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ADA_COMPAT=( gnat_201{6,7,8,9} )
+inherit ada autotools multiprocessing
+
+MYP=${PN}-gpl-${PV}
+
+DESCRIPTION="A complete Ada graphical toolkit"
+HOMEPAGE="http://libre.adacore.com//tools/gtkada/"
+SRC_URI="http://mirrors.cdn.adacore.com/art/5b0cf840c7a4475261f97ced
+ -> ${MYP}-src.tgz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+shared static-libs"
+
+RDEPEND="${ADA_DEPS}
+ dev-libs/atk
+ dev-libs/glib:2
+ media-libs/fontconfig
+ media-libs/freetype
+ x11-libs/cairo
+ x11-libs/gdk-pixbuf:2
+ x11-libs/gtk+:3
+ x11-libs/pango"
+DEPEND="${RDEPEND}
+ dev-ada/gprbuild[${ADA_USEDEP}]"
+
+REQUIRED_USE="${ADA_REQUIRED_USE}"
+
+S="${WORKDIR}"/${MYP}-src
+
+PATCHES=( "${FILESDIR}"/${PN}-2017-r1-gentoo.patch )
+
+src_prepare() {
+ default
+ mv configure.{in,ac}
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ --prefix="${D}/usr" \
+ $(use_enable static-libs static) \
+ $(use_enable shared) \
+ --without-GL
+}
+
+src_compile() {
+ emake -j1 PROCESSORS=$(makeopts_jobs)
+}
+
+src_install() {
+ emake -j1 install
+ einstalldocs
+}
diff --git a/dev-ada/gtkada/gtkada-2019-r1.ebuild b/dev-ada/gtkada/gtkada-2019-r1.ebuild
new file mode 100644
index 00000000000..e11e401e281
--- /dev/null
+++ b/dev-ada/gtkada/gtkada-2019-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ADA_COMPAT=( gnat_201{6,7,8,9} )
+inherit ada autotools multiprocessing
+
+MYP=${P}-20190424-19D98
+
+DESCRIPTION="A complete Ada graphical toolkit"
+HOMEPAGE="http://libre.adacore.com//tools/gtkada/"
+SRC_URI="http://mirrors.cdn.adacore.com/art/5ce7f58931e87adb2d312c53
+ -> ${MYP}-src.tgz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+shared static-libs"
+
+RDEPEND="${ADA_DEPS}
+ dev-libs/atk
+ dev-libs/glib:2
+ media-libs/fontconfig
+ media-libs/freetype
+ x11-libs/cairo
+ x11-libs/gdk-pixbuf:2
+ x11-libs/gtk+:3
+ x11-libs/pango"
+DEPEND="${RDEPEND}
+ dev-ada/gprbuild[${ADA_USEDEP}]"
+
+REQUIRED_USE="${ADA_REQUIRED_USE}"
+
+S="${WORKDIR}"/${MYP}-src
+
+PATCHES=( "${FILESDIR}"/${PN}-2017-r1-gentoo.patch )
+
+src_prepare() {
+ default
+ mv configure.{in,ac}
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ --prefix="${D}/usr" \
+ $(use_enable static-libs static) \
+ $(use_enable shared) \
+ --without-GL
+}
+
+src_compile() {
+ emake -j1 PROCESSORS=$(makeopts_jobs)
+}
+
+src_install() {
+ emake -j1 install
+ einstalldocs
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-ada/gtkada/files/, dev-ada/gtkada/
@ 2019-10-19 20:44 Alfredo Tupone
0 siblings, 0 replies; 5+ messages in thread
From: Alfredo Tupone @ 2019-10-19 20:44 UTC (permalink / raw
To: gentoo-commits
commit: f4250900c8ae6f2e63407e2f0467c5ac082edaf4
Author: Tupone Alfredo <tupone <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 19 20:44:21 2019 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Sat Oct 19 20:44:21 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4250900
dev-ada/gtkada: stable
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
dev-ada/gtkada/files/gtkada-2019-gentoo.patch | 11 +++++++++++
dev-ada/gtkada/gtkada-2017-r1.ebuild | 2 +-
dev-ada/gtkada/gtkada-2018-r2.ebuild | 2 +-
dev-ada/gtkada/gtkada-2019-r1.ebuild | 7 +++++--
dev-ada/gtkada/gtkada-2019.ebuild | 2 +-
5 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/dev-ada/gtkada/files/gtkada-2019-gentoo.patch b/dev-ada/gtkada/files/gtkada-2019-gentoo.patch
new file mode 100644
index 00000000000..79f58a41b2d
--- /dev/null
+++ b/dev-ada/gtkada/files/gtkada-2019-gentoo.patch
@@ -0,0 +1,11 @@
+--- a/Makefile.in 2019-09-21 18:47:40.749628914 +0200
++++ b/Makefile.in 2019-09-21 18:48:08.547200073 +0200
+@@ -30,7 +30,7 @@
+
+ GPRBUILD_FULL = ${GPRBUILD} -j${PROCESSORS} -m -p ${GPRBUILD_SWITCHES}
+ GPRINSTALL_FULL = ${GPRINSTALL} -p -f --project-subdir=$(PRJDIR) \
+- --build-var=GTKADA_BUILD,LIBRARY_TYPE --install-name=gtkada \
++ --build-var=LIBRARY_TYPE --install-name=gtkada \
+ --prefix=${DESTDIR}$(prefix) -XGTK_PREFIX=${prefix}
+
+ GETTEXT_INTL=@GETTEXT_INTL@
diff --git a/dev-ada/gtkada/gtkada-2017-r1.ebuild b/dev-ada/gtkada/gtkada-2017-r1.ebuild
index b3522240fd8..8c14fbefe83 100644
--- a/dev-ada/gtkada/gtkada-2017-r1.ebuild
+++ b/dev-ada/gtkada/gtkada-2017-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/591ae7a8c7a4473fcbb154c9
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="+shared static-libs"
RDEPEND="${ADA_DEPS}
diff --git a/dev-ada/gtkada/gtkada-2018-r2.ebuild b/dev-ada/gtkada/gtkada-2018-r2.ebuild
index 3e45f9b6dc9..eab34d509ac 100644
--- a/dev-ada/gtkada/gtkada-2018-r2.ebuild
+++ b/dev-ada/gtkada/gtkada-2018-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/5b0cf840c7a4475261f97ced
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="+shared static-libs"
RDEPEND="${ADA_DEPS}
diff --git a/dev-ada/gtkada/gtkada-2019-r1.ebuild b/dev-ada/gtkada/gtkada-2019-r1.ebuild
index e11e401e281..036d2b05dd8 100644
--- a/dev-ada/gtkada/gtkada-2019-r1.ebuild
+++ b/dev-ada/gtkada/gtkada-2019-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/5ce7f58931e87adb2d312c53
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="+shared static-libs"
RDEPEND="${ADA_DEPS}
@@ -34,7 +34,10 @@ REQUIRED_USE="${ADA_REQUIRED_USE}"
S="${WORKDIR}"/${MYP}-src
-PATCHES=( "${FILESDIR}"/${PN}-2017-r1-gentoo.patch )
+PATCHES=(
+ "${FILESDIR}"/${PN}-2017-r1-gentoo.patch
+ "${FILESDIR}"/${P}-gentoo.patch
+)
src_prepare() {
default
diff --git a/dev-ada/gtkada/gtkada-2019.ebuild b/dev-ada/gtkada/gtkada-2019.ebuild
index 0b4c73a820f..2f1f273e3bc 100644
--- a/dev-ada/gtkada/gtkada-2019.ebuild
+++ b/dev-ada/gtkada/gtkada-2019.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/5ce7f58931e87adb2d312c53
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="gnat_2016 gnat_2017 gnat_2018 +gnat_2019 +shared static-libs"
RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-ada/gtkada/files/, dev-ada/gtkada/
[not found] <1640603412.f77708f4c8695462e5da7be8a5720119711d0c93.tupone@gentoo>
@ 2021-12-27 11:10 ` Alfredo Tupone
0 siblings, 0 replies; 5+ messages in thread
From: Alfredo Tupone @ 2021-12-27 11:10 UTC (permalink / raw
To: gentoo-commits
commit: f77708f4c8695462e5da7be8a5720119711d0c93
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 27 11:09:48 2021 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Mon Dec 27 11:10:12 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f77708f4
dev-ada/gtkada: drop uninstall phase
Closes: https://bugs.gentoo.org/830017
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
dev-ada/gtkada/files/gtkada-2021-uninstall.patch | 13 +++++++++++++
dev-ada/gtkada/gtkada-2021.ebuild | 1 +
dev-ada/gtkada/gtkada-22.0.0.ebuild | 1 +
3 files changed, 15 insertions(+)
diff --git a/dev-ada/gtkada/files/gtkada-2021-uninstall.patch b/dev-ada/gtkada/files/gtkada-2021-uninstall.patch
new file mode 100644
index 000000000000..c782aac633b7
--- /dev/null
+++ b/dev-ada/gtkada/files/gtkada-2021-uninstall.patch
@@ -0,0 +1,13 @@
+--- a/Makefile.in 2021-12-27 09:42:14.575136019 +0100
++++ b/Makefile.in 2021-12-27 09:42:31.159870381 +0100
+@@ -113,10 +113,6 @@
+ endif
+
+ install-clean:
+-ifneq (,$(wildcard $(prefix)/lib/gnat/manifests/gtkada))
+- -$(GPRINSTALL) --uninstall -f --prefix=$(prefix) \
+- --project-subdir=lib/gnat gtkada
+-endif
+
+ install: install-clean
+ ${GPRINSTALL_FULL} -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) \
diff --git a/dev-ada/gtkada/gtkada-2021.ebuild b/dev-ada/gtkada/gtkada-2021.ebuild
index da08ed425283..1005a7ba1034 100644
--- a/dev-ada/gtkada/gtkada-2021.ebuild
+++ b/dev-ada/gtkada/gtkada-2021.ebuild
@@ -39,6 +39,7 @@ S="${WORKDIR}"/${MYP}
PATCHES=(
"${FILESDIR}"/${PN}-2017-r1-gentoo.patch
"${FILESDIR}"/${PN}-2019-gentoo.patch
+ "${FILESDIR}"/${P}-uninstall.patch
)
src_prepare() {
diff --git a/dev-ada/gtkada/gtkada-22.0.0.ebuild b/dev-ada/gtkada/gtkada-22.0.0.ebuild
index 8a1efe2e0af3..6cb33f81492e 100644
--- a/dev-ada/gtkada/gtkada-22.0.0.ebuild
+++ b/dev-ada/gtkada/gtkada-22.0.0.ebuild
@@ -33,6 +33,7 @@ REQUIRED_USE="${ADA_REQUIRED_USE}"
PATCHES=(
"${FILESDIR}"/${PN}-2017-r1-gentoo.patch
"${FILESDIR}"/${PN}-2019-gentoo.patch
+ "${FILESDIR}"/${PN}-2021-uninstall.patch
)
src_prepare() {
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-12-27 11:10 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-09-13 20:30 [gentoo-commits] repo/gentoo:master commit in: dev-ada/gtkada/files/, dev-ada/gtkada/ Alfredo Tupone
[not found] <1640603412.f77708f4c8695462e5da7be8a5720119711d0c93.tupone@gentoo>
2021-12-27 11:10 ` Alfredo Tupone
-- strict thread matches above, loose matches on Subject: below --
2019-10-19 20:44 Alfredo Tupone
2018-02-11 15:44 Alfredo Tupone
2017-06-30 14:32 Alfredo Tupone
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox