gentoo resync : 03.11.2019

6 files changed, 24 insertions, 9 deletions

diff --git a/dev-ada/gtkada/Manifest b/dev-ada/gtkada/Manifest
index 06d9d21a187f..69e4b750157c 100644
--- a/dev-ada/gtkada/Manifest
+++ b/dev-ada/gtkada/Manifest
@@ -1,12 +1,13 @@
 AUX gtkada-2017-gentoo.patch 2270 BLAKE2B 54b7f2258ce0073b79f56a3c0c379123622e7d6e91f0a186d4792b68851521241d778ba7b30686f52d1e0d1afa5d0e239fa5bf401169b67fdc90c0ffab01d83f SHA512 cb104d21ac55046254f03de6d615e98174d92cf3af74d7677eee9620cb38cfce5aaac2e61d3dc248f735f6723bcb69d33486e21dd3c6f5cc64d81067d161f5e8
 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 1103 BLAKE2B f993d0345485180ff3309e488043eeaa9dafb2518ede54bd2671bfb338e74556f1482432b72631f5893c865370e7d3bfcca466b9dea8dfeb0bed81a3977c7b70 SHA512 8952d82cdba1fdaccbec9731bdd3567654c98e6fb0de43b4347e6b3bd6f4adc44ff7fb45553ae93ca797d7ed055865c6d3bb006d77a10361c4287f7b8a560ef6
+EBUILD gtkada-2017-r1.ebuild 1101 BLAKE2B 844190bc4e75298c6854464062952d73f63103271a9c0bb4bbf451d0815c8fbc72471382af7253314b14737436e8a974a5ebef8508b223bb4decc4fe27b64383 SHA512 e47af143eda267de31b56d16e2884a1d22252516aeae5159992d9267ce78720cea8582880cee7e72fb9f7aac32d32df0a73d73340b1bb90afd0ff7c49d302531
 EBUILD gtkada-2017.ebuild 1297 BLAKE2B 83536071e25bc43cff672b957b9473029d910d8ac283496ff9bde6b282b57d478999780340b74b16987e935f4b042b9ecc28f0f0455217bfd89df9f297a0a89f SHA512 396961a4521e82fabbde327e7d66fef20dc5815253275e3de9118c3538ad166c85e3cdb27db2867e6e06ae683fc381a859f0c5f2afcfcfc78af23fc66120293b
 EBUILD gtkada-2018-r1.ebuild 1552 BLAKE2B 4175046358b5a6abed6de7112a6d4c0d7f65f156ec417e5f8882c5580e032bf0dce6ba7d26544723d35ad3ee0ba04cd1763a11e6140f64168ef09fd8c71f50d9 SHA512 27b3f09407e484b3edf9344fea4ab1d5800f1c347b31e10a8cfa6fef4126dc6151e35ba122ea25b7a8c864ec900231db78f1c9b8efa978edf2133950f509a1c6
-EBUILD gtkada-2018-r2.ebuild 1113 BLAKE2B 4c95877c84b5cded18c12ffdbfc75c6c2660a671c1391b6b35a9a10307b16749ab2080f9c66fb98a6d591d7837d16aa0e348e662caa42be8aa40a4eb5df2810e SHA512 79689835cf8108705aad9db2a5c7b800b5346451c5457974796ae4f6c8e3308f287e099e1a68b207f12c75701a410c59003894fb47806f1d6afab52165d423a0
-EBUILD gtkada-2019-r1.ebuild 1117 BLAKE2B 24944cad342191a4b3c93e292ca4eaf9b177057b02f3f24861169a80420ee0da81bcd1df6e23bc641f1b77ea035f7d8831975d830e5e46fdb494b27fd9cf15fe SHA512 a471b2e227ab38f3dedecb339b44b5ab11a949025ba8690e4a38377857c3558fd3aafa2832c86899757d8437231a487f7b0dd37e51988f7feb6268006545fcf1
-EBUILD gtkada-2019.ebuild 1558 BLAKE2B 73b5b1b9b714981ce941e7d0bf8d25193b8ab36c7bcf1429fbdf8a681e808bee835f95c0b23f81480edfb4a29a82fe545827307307dd5dc4c4f3b2b386b19cbf SHA512 42620c9318ec624821ed9fef88bbf9f5bbfc00e4637d009bac9f29dd4be18744554a7d0cf03ad08aa1fd79698ebd57f6c374f5676d44196bab1103c77a68e531
+EBUILD gtkada-2018-r2.ebuild 1111 BLAKE2B 7156ea399e371958b6319e78e13cf34375dddef245f9b67631e1da424ae67bca44275118d47998b8fbf2a6837e9d68cd8e632b363bc46fccc929260f060cc376 SHA512 2ee7b3edc21dbe915c8c7cd5f838d2a3b806e7e08b5162da196df29b1a48f454c20eec658da3d909239e098e91da67db84ca7209972d79b4f68c2cd52780ebc8
+EBUILD gtkada-2019-r1.ebuild 1149 BLAKE2B 56fbfbd4dfa321def9c40e613f0df71f5538d2eb652c5b8bf2213e0df0d0d5d27b63409c831aa4dc12e4742b9b09296013de2b9a117cd5dd1a1619180a64f8af SHA512 38268434835bca957bc01332a1222717d9ea632cd59f2062f139abcb9eaef54ac5d03c88630dae47a3da0bde1864f937a282f8b2b3cf249970a1d5426e0bd85d
+EBUILD gtkada-2019.ebuild 1556 BLAKE2B 2a49f5336c6f52ba042a799a77b02b906f4bfa97f0b85df6c7e5ef07d7d2f91503e4e0c4e3abc2e0be09690339dfef840e2ff9a9f5b163d6c8a716f7779870f4 SHA512 1fa71bb6b73b119beb2bf41c6b4f8f0ecd4529eea34565502eab78dd186cdd450081807a0e104a784a62f3a5f6e3400793d4a21b2c13a01419f3cfccd7f7d2c4
 MISC metadata.xml 536 BLAKE2B 9809d3168ce41ea5f2aaaf8f9ed0c61ffca037a42dc1d3ba5424f68c399a24f64336494b0e73b3f6a3ab1be9c5ec2e499d93d62aa34a4e2a45af09bd15482b5b SHA512 f6ce7169d8015d691548836e074450d79afffdb7449bc7bd4b7ab868b967763675d8f69b1ad89a3642de0e1c5c9271261d72ee1b8fe448b9aa4afa4879b619d5
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 000000000000..79f58a41b2d1
--- /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 b3522240fd8b..8c14fbefe835 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 3e45f9b6dc9d..eab34d509ac2 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 e11e401e281a..036d2b05dd8c 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 0b4c73a820f3..2f1f273e3bc2 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 )