gentoo resync : 31.05.2021

4 files changed, 29 insertions, 27 deletions

diff --git a/dev-ada/gtkada/Manifest b/dev-ada/gtkada/Manifest
index 70b0738cd995..a404a2fab586 100644
--- a/dev-ada/gtkada/Manifest
+++ b/dev-ada/gtkada/Manifest
@@ -1,9 +1,8 @@
 AUX gtkada-2017-r1-gentoo.patch 2082 BLAKE2B 129c162fbc6d89565d4d383fe0f071b04513a66d138599d0b5dfce8f4bc40bb7609eb26a1df414dcac212827a2ece39c4db4a2f785d8eb5367688b83fd59c121 SHA512 defc57274798e8ff24436153bd4f6d6f94e25617eee249101708c1bfd01d3960a07a948407d2c126d21fba34a9f770762fc20d0c1711c28b4d77e11a190a9dea
 AUX gtkada-2019-gentoo.patch 468 BLAKE2B 80de36b927875d360e35be6b5829ced6fa1a0bff2c2e8f2186bdd375db27965cc9258b94c41ade6919047d0ac12deafe37b7a58c1365bd453b7293118f81709d SHA512 85b6e3d3060283370ab9d2ad5980a2aa110db44edcb615caf8ebfd6e49ca53011d5a049f4fac1584fce2755414883abde16824d28a5fa3db17d0d50cb00e8c81
 DIST gtkada-2019-20190424-19D98-src.tgz 12273911 BLAKE2B e2d0f3c410973d0412bf433f2e1cc60a5b00e9f34ad0471cb583596587e6073fdeb9b6441aa50dfa81894ce692101fe51c7714090477d585721571261737a823 SHA512 aed0758b42ee8eac752c2c83a0974ee0c7cddfa15149879472ff2fb8ee7565456a225ce783739ede76bc0f47340e97af5b5d1149e244611bcd3b3760e20f8cf5
-DIST gtkada-gpl-2017-src.tgz 11952333 BLAKE2B 2a333452ff271bba0521235598afdb1abebc4ceeab0f915f173862329ae0986b0fc4f654d3df28eac73af075db224c0b12340c3acd1e4ed0ffc965e4365f8b40 SHA512 f5bbb9ebdd966e70b3edcaaf359cb9e75edba3c3f4f8febfa7de9f634f8e96cd0dd1482fb16ad852b1c9f9b0e2c16eb3a437120d37f0638d90af666620f09f3f
-DIST gtkada-gpl-2018-src.tgz 11958880 BLAKE2B 4946918b52de5e15efc77411927812910d84d13cea66b86b1162b987c7849ba7fbb6da487881762f64005dc32a74fa73c9d759d25bb9ac0241d1d76cd4becbfb SHA512 9000de7675f8ee688b1c9cd93cf35b32f698aca8fc22d3b4e695d7c6b34feb60118cc687cf35432cd5ed9af7825eda7e20575a9fad4523a7b59cb0322bce0762
-EBUILD gtkada-2017-r1.ebuild 1101 BLAKE2B 844190bc4e75298c6854464062952d73f63103271a9c0bb4bbf451d0815c8fbc72471382af7253314b14737436e8a974a5ebef8508b223bb4decc4fe27b64383 SHA512 e47af143eda267de31b56d16e2884a1d22252516aeae5159992d9267ce78720cea8582880cee7e72fb9f7aac32d32df0a73d73340b1bb90afd0ff7c49d302531
-EBUILD gtkada-2018-r2.ebuild 1111 BLAKE2B 7156ea399e371958b6319e78e13cf34375dddef245f9b67631e1da424ae67bca44275118d47998b8fbf2a6837e9d68cd8e632b363bc46fccc929260f060cc376 SHA512 2ee7b3edc21dbe915c8c7cd5f838d2a3b806e7e08b5162da196df29b1a48f454c20eec658da3d909239e098e91da67db84ca7209972d79b4f68c2cd52780ebc8
-EBUILD gtkada-2019-r1.ebuild 1149 BLAKE2B 56fbfbd4dfa321def9c40e613f0df71f5538d2eb652c5b8bf2213e0df0d0d5d27b63409c831aa4dc12e4742b9b09296013de2b9a117cd5dd1a1619180a64f8af SHA512 38268434835bca957bc01332a1222717d9ea632cd59f2062f139abcb9eaef54ac5d03c88630dae47a3da0bde1864f937a282f8b2b3cf249970a1d5426e0bd85d
+DIST gtkada-2020-20200429-19B96-src.tar.gz 12232938 BLAKE2B fcd5fdfebced2fc2b4dd1251f81a61b1564a72a3cc1854a78c4d9e32824d55188dd440bceddd4e86f3dc03c455b1db109bc68d5cb29e2a61d62bf59895b68895 SHA512 d9405d03cc3bf375ddddca54f2fb935ecd64cdf6eedb32efbd994a6f8a7693c6ee7aa10d558cbf89e9ad3174a3ac9a0c8f0ea7e444ff5d2a8b9af76a6ff64d4b
+EBUILD gtkada-2019-r1.ebuild 1132 BLAKE2B 527d869f7db0ebd302597434f415d098fc136908bf425c732380d76d50aef3fb1e3d9ac874c478580199f30676427ff8463c5f1f93312f27eb769d949a140bd4 SHA512 5128d19e17e567cc07d0a2e98f66a223f5bc874ca4bb25ccc92fd7397bcd6921c03164e0ad1b28d5b5ebe80ecd5886cb101bc25b3e4d64ee8581fa2f197c6a82
+EBUILD gtkada-2019-r2.ebuild 1141 BLAKE2B cf4ad6b9bd19465ff7487cc2fea129af2bce20d63f78a42033724cada78d38c785923c0a6e93c912e3b99ec1eeadcfbdcc64c4921a745d3547dcd0fe7cad5b18 SHA512 181e64541b7632845f7402ad12b57245eafdc5b2a7e3337bb2051a4ba101e5e8ce9b73624e2e62d94734151444b7d30d7ab89dc9cbbfc29b4f169a114cd0a4dc
+EBUILD gtkada-2020.ebuild 1199 BLAKE2B d39e6592301c55d1faaebe615fa249aabf42f2a2452fffeaeb4db234304dbe41714017797592a777405e4975333e62abe1570528829eb9573c7b4937290278a1 SHA512 7cd661a9509b2a86ac45044780a312c1f78bf7773a1ced5f70988c2127553bfb46c6d93af6df54ffc91df6e1362784840a59e3bf8e93fd9ac4659098a881d3e2
 MISC metadata.xml 536 BLAKE2B 9809d3168ce41ea5f2aaaf8f9ed0c61ffca037a42dc1d3ba5424f68c399a24f64336494b0e73b3f6a3ab1be9c5ec2e499d93d62aa34a4e2a45af09bd15482b5b SHA512 f6ce7169d8015d691548836e074450d79afffdb7449bc7bd4b7ab868b967763675d8f69b1ad89a3642de0e1c5c9271261d72ee1b8fe448b9aa4afa4879b619d5
diff --git a/dev-ada/gtkada/gtkada-2019-r1.ebuild b/dev-ada/gtkada/gtkada-2019-r1.ebuild
index 036d2b05dd8c..fe02b028c8b6 100644
--- a/dev-ada/gtkada/gtkada-2019-r1.ebuild
+++ b/dev-ada/gtkada/gtkada-2019-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -47,7 +47,6 @@ src_prepare() {
 
 src_configure() {
 	econf \
-		--prefix="${D}/usr" \
 		$(use_enable static-libs static) \
 		$(use_enable shared) \
 		--without-GL
@@ -58,6 +57,6 @@ src_compile() {
 }
 
 src_install() {
-	emake -j1 install
+	emake -j1 DESTDIR="${D}"
 	einstalldocs
 }
diff --git a/dev-ada/gtkada/gtkada-2017-r1.ebuild b/dev-ada/gtkada/gtkada-2019-r2.ebuild
index 8c14fbefe835..d6f595288791 100644
--- a/dev-ada/gtkada/gtkada-2017-r1.ebuild
+++ b/dev-ada/gtkada/gtkada-2019-r2.ebuild
@@ -1,21 +1,21 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-ADA_COMPAT=( gnat_201{6,7} )
+ADA_COMPAT=( gnat_201{6..9} gnat_2020 )
 inherit ada autotools multiprocessing
 
-MYP=${PN}-gpl-${PV}
+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/591ae7a8c7a4473fcbb154c9
+SRC_URI="http://mirrors.cdn.adacore.com/art/5ce7f58931e87adb2d312c53
 	-> ${MYP}-src.tgz"
 
 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}"/${P}-r1-gentoo.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-2017-r1-gentoo.patch
+	"${FILESDIR}"/${P}-gentoo.patch
+)
 
 src_prepare() {
 	default
@@ -44,7 +47,6 @@ src_prepare() {
 
 src_configure() {
 	econf \
-		--prefix="${D}/usr" \
 		$(use_enable static-libs static) \
 		$(use_enable shared) \
 		--without-GL
@@ -55,6 +57,6 @@ src_compile() {
 }
 
 src_install() {
-	emake -j1 install
+	emake -j1 DESTDIR="${D}"
 	einstalldocs
 }
diff --git a/dev-ada/gtkada/gtkada-2018-r2.ebuild b/dev-ada/gtkada/gtkada-2020.ebuild
index eab34d509ac2..b8aa324b5e98 100644
--- a/dev-ada/gtkada/gtkada-2018-r2.ebuild
+++ b/dev-ada/gtkada/gtkada-2020.ebuild
@@ -1,21 +1,21 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-ADA_COMPAT=( gnat_201{6,7,8,9} )
+ADA_COMPAT=( gnat_201{6..9} gnat_2020 )
 inherit ada autotools multiprocessing
 
-MYP=${PN}-gpl-${PV}
+MYP=${P}-20200429-19B96-src
 
 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"
+SRC_URI="https://community.download.adacore.com/v1/96f85c875c161c36e7d0edb19aa4dbddf41ea671?filename=${MYP}.tar.gz
+	-> ${MYP}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+shared static-libs"
 
 RDEPEND="${ADA_DEPS}
@@ -32,19 +32,21 @@ DEPEND="${RDEPEND}
 
 REQUIRED_USE="${ADA_REQUIRED_USE}"
 
-S="${WORKDIR}"/${MYP}-src
+S="${WORKDIR}"/${MYP}
 
-PATCHES=( "${FILESDIR}"/${PN}-2017-r1-gentoo.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-2017-r1-gentoo.patch
+	"${FILESDIR}"/${PN}-2019-gentoo.patch
+)
 
 src_prepare() {
 	default
-	mv configure.{in,ac}
+	mv configure.{in,ac} || die
 	eautoreconf
 }
 
 src_configure() {
 	econf \
-		--prefix="${D}/usr" \
 		$(use_enable static-libs static) \
 		$(use_enable shared) \
 		--without-GL
@@ -55,6 +57,6 @@ src_compile() {
 }
 
 src_install() {
-	emake -j1 install
+	emake -j1 DESTDIR="${D}"
 	einstalldocs
 }