gentoo resync : 04.01.2022

5 files changed, 26 insertions, 6 deletions

diff --git a/dev-ada/gtkada/Manifest b/dev-ada/gtkada/Manifest
index 491a533a7d9f..a3a9d513be5a 100644
--- a/dev-ada/gtkada/Manifest
+++ b/dev-ada/gtkada/Manifest
@@ -1,7 +1,8 @@
 AUX gtkada-2017-r1-gentoo.patch 2082 BLAKE2B 129c162fbc6d89565d4d383fe0f071b04513a66d138599d0b5dfce8f4bc40bb7609eb26a1df414dcac212827a2ece39c4db4a2f785d8eb5367688b83fd59c121 SHA512 defc57274798e8ff24436153bd4f6d6f94e25617eee249101708c1bfd01d3960a07a948407d2c126d21fba34a9f770762fc20d0c1711c28b4d77e11a190a9dea
 AUX gtkada-2019-gentoo.patch 468 BLAKE2B 80de36b927875d360e35be6b5829ced6fa1a0bff2c2e8f2186bdd375db27965cc9258b94c41ade6919047d0ac12deafe37b7a58c1365bd453b7293118f81709d SHA512 85b6e3d3060283370ab9d2ad5980a2aa110db44edcb615caf8ebfd6e49ca53011d5a049f4fac1584fce2755414883abde16824d28a5fa3db17d0d50cb00e8c81
+AUX gtkada-2021-uninstall.patch 398 BLAKE2B 2f5becba847173f5e780ca712d3fa3a8180fade82d36d6cbe3e94acb3e3d64e5754ee41b221878dbcfbb5db056e976a16837ce22aeb8c35027c0df6622a64bae SHA512 53a325b4b51e9d5dafc583e6001064b3d5cca9b5e1d4ccccc5280726c10a25f1a2563d1fe62c9d9c48ee058e4d4cc7bc8b722c5a89f4d276ddfac2bfa4726461
 DIST gtkada-2021-20210518-1A011-src.tar.gz 12341654 BLAKE2B 888e7f447b09218f54f6fc28743bf313163f30bcde5f0deba7c02a113340e2e73458cc98a8e9d9277f131cb4e28280fd69afa6797d47312c61e7d73929fb5a11 SHA512 fb5db2886a26c15b58180e53f22d4ee25ce23c19240b27352cb47becf19bb76b32c90a10f5085165913360d1cf87bf52b4588d8cdc2b9681e717f9af71ae86a8
 DIST gtkada-22.0.0.tar.gz 6070022 BLAKE2B ff5d13831acf839290923871a80a5edfff7d39c689175d528e50bfcae4f120381d8cc74a58f2d843e0aba6fd7c23bb43a34db279b0af9d7c9cc4f4bc9615b179 SHA512 abcc6152b0dac66b29ef791527bf6e8f0e1359e5a374732824561ca47d9b1951c168b9b27dbc1f24e496ef5afe6c68020edc9d374faf0495118630ef08a5c448
-EBUILD gtkada-2021.ebuild 1368 BLAKE2B 3e78916675f01a8dd10d44eda38498bb7364636e4c5f2a6c4a15b83d32643e18739a2ee9b6ef505a37216c2789d652a8cba58b3f3dfaa608893583ab1d4cbaa4 SHA512 8282daece575423c55e5cd9a9acab6643e796fc213e768a1391516ad8fa8e3d39278da9b7a5a474c2ac23c5d3ba762d5a80d3cb53995ee90076b236845ab57ed
-EBUILD gtkada-22.0.0.ebuild 1102 BLAKE2B 52776b987a85ec569430d344b3fae9624652de24422e0f896a54bc20d3b99b0bd31e2111e32561fdea388ee9af6bb07cd8600bd765a9ea5e4fede9c62b6c26d7 SHA512 33a315ea324e020edab354b32f3735a3e1c72a93e2780ddefc13375c98d166635b80c6e16015c29b9f354f8b32fddd38b6202955f5455e5cfb9a66c85d0bd978
-MISC metadata.xml 537 BLAKE2B 2504eb7e8c0fe1a143ea8f6f4ba3ac530245d3781f906536dc7680e775cf8b546e7019d43adbc78e1b7793825eb9bea849d78ef482325ccd16bc30d96691ea7a SHA512 4e683dd78d8d81851116548db6014157fcb363d96fa4df04e45c35705505ed3b3a863a3b082dc4a7e814df8587b7f5fba6e696c8ee12e14d0d04a71199977d17
+EBUILD gtkada-2021.ebuild 1404 BLAKE2B cbfae8b43653108baca7d0d7dcf91311687531d73065bfce0c9b0d7902358e75b85c5c8dd08e88034bcb5f2e422954d3864f1315784befedbefe048e029832fe SHA512 e31622e064b4252a591160a5b0756fcec0701bcc02990d901216634fc8c6cf142cbf9be11e6bae1ed57b4f69a4cdd19073dcf0e9286405fef64606274a152c8f
+EBUILD gtkada-22.0.0.ebuild 1190 BLAKE2B d1aac875a41602b4524a9e1cad26e95dcf2d03305509304cd714aa4634539f72fb00de5e5b1b78df7f9ce542d0a9c5f08436b9881a5c5c68c40fa86956fcfede SHA512 b8855baaced7dce5f721c09bc8d712f0c867765c84706f32c1a7df3df4c62ca08ad6ae994bd6795c1b0826277186b98831f787637ae2e3ddfaf3c67cb537f6dc
+MISC metadata.xml 609 BLAKE2B 999aae7c908ca80ba44e4183221ef3acd23d29dae2e4c13a5a930ecbae5cff34f8dbd3705953aced2a03a378d41465294d3960fcdb65384cd5b9a19a729e017e SHA512 5ea2cef4aec361935f1b3cf27572e2c062e56ff76aebf952fcc550176755b899615a5b19cc20b8c4548d47bf09f41b168f9ac985c40799e68982acd1354cb817
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 439153321466..6cb33f81492e 100644
--- a/dev-ada/gtkada/gtkada-22.0.0.ebuild
+++ b/dev-ada/gtkada/gtkada-22.0.0.ebuild
@@ -12,9 +12,9 @@ SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
 	-> ${P}.tar.gz"
 
 LICENSE="GPL-3"
-SLOT="0"
+SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
-IUSE="+shared static-libs"
+IUSE="+shared static-libs static-pic"
 
 RDEPEND="${ADA_DEPS}
 	dev-libs/atk
@@ -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() {
@@ -45,6 +46,7 @@ src_configure() {
 	econf \
 		$(use_enable static-libs static) \
 		$(use_enable shared) \
+		$(use_enable static-pic) \
 		--without-GL
 }
 
diff --git a/dev-ada/gtkada/metadata.xml b/dev-ada/gtkada/metadata.xml
index ed2a0cec8e00..bd7b67c76052 100644
--- a/dev-ada/gtkada/metadata.xml
+++ b/dev-ada/gtkada/metadata.xml
@@ -6,8 +6,11 @@
 	</maintainer>
 	<use>
 		<flag name="shared">Build gtkada as shared library</flag>
+		<flag name="static-pic">Build static library with pic code</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.
+		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.
 	</longdescription>
 </pkgmetadata>