gentoo resync : 05.02.2020

12 files changed, 41 insertions, 11 deletions

diff --git a/app-cdr/Manifest.gz b/app-cdr/Manifest.gz
index f1be20d343dd..5bcfdbf19161 100644
--- a/app-cdr/Manifest.gz
+++ b/app-cdr/Manifest.gz
diff --git a/app-cdr/bin2iso/Manifest b/app-cdr/bin2iso/Manifest
index 524262e88f90..61191337384a 100644
--- a/app-cdr/bin2iso/Manifest
+++ b/app-cdr/bin2iso/Manifest
@@ -1,4 +1,4 @@
 AUX bin2iso-19b-sanity-checks.patch 903 BLAKE2B cdd4efb8e631114aa593dbbec3d4f6f0cc88b8c2dee30d138212269d86b55eaaef70d520c91a13bcb408b507a5020c51f1170d4cc5a237a412b3a113ad1e534e SHA512 cbeaf8e620bc54e531293cee179b94c63cb6e8925ac579d65d0f700013235d9da683af8f367f1687828d23c3aa6f6bd20196e2d4201593048ae0152baf7e26a3
 DIST bin2iso-19b.tar.bz2 9805 BLAKE2B 0800f00d4c67481e1fa4c681450ac4f7c5110aadb1f06e70219ac980590af6e37407c75c9e41d3189726922157af843d951461f19915e66da3a30eb2645d7379 SHA512 1f2dbde824ee32eb3be878bf1b96167d753a3f40eb0baf59f3c72907dcc6ce4c999c04d008efde5269dec306b6eab3dd2b15a18a81388c105545abd04e1769c5
-EBUILD bin2iso-19b-r2.ebuild 655 BLAKE2B 9a8eb4c7cba476324bfe564988d43c869277285d98f5f8c826b61d1aa7183cc443a5acec2bc13d2d2de807c2875368e82b71f454019fcacc8805bfedcdcc1063 SHA512 8f6c51bd162836ec0e7ddc482ef4908ccab8ce4887adf03284ea1c004dc5228c11db0d7c02153ef7aeaf96a38c8fad1a3ab388f2c83966ef2a0fad9a86f4d963
+EBUILD bin2iso-19b-r2.ebuild 656 BLAKE2B aad4339517427176a3728a5c3dd5719bf234fa0c2e3a6601e44b3ed06d67fc9aff4d6e666626d15cd290882bb0cb5a05a20529b7f633b9ba03ab0cebe1420815 SHA512 d681133adb80b43e6a09e90b2e0a422c34915dd50855132232fae65536c6758ff22527a2809d1e9bed39a5fee30fc14febf0b7d04ca26bd8b1daf3d35653235a
 MISC metadata.xml 294 BLAKE2B 0b315a1e4e53307837d80443e3fffa228f54ffcfc5dfbb1acc8d7a011f4c75b5e49bc638376724f21b242d4cff8030edb0c0c5f9131aad3d7b2b25e76c9fc5ba SHA512 b6fdc3ce5da8e1fdf502c3542820e10a75d054661376f8c75498e5b77f3f2f7ae1f939798661ec4235239ea261a4c9aaa1aa2a03beb6a496bc373ce794e766f5
diff --git a/app-cdr/bin2iso/bin2iso-19b-r2.ebuild b/app-cdr/bin2iso/bin2iso-19b-r2.ebuild
index 7d565d3a1013..95e7573ac3a7 100644
--- a/app-cdr/bin2iso/bin2iso-19b-r2.ebuild
+++ b/app-cdr/bin2iso/bin2iso-19b-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="alpha amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 S=${WORKDIR}/${PN}
diff --git a/app-cdr/cdrdao/Manifest b/app-cdr/cdrdao/Manifest
index 4f434345015b..b2ff22b47882 100644
--- a/app-cdr/cdrdao/Manifest
+++ b/app-cdr/cdrdao/Manifest
@@ -1,5 +1,5 @@
 AUX cdrdao-1.2.4-ax_pthread.patch 16846 BLAKE2B a76c7c68c53a57731e652325d98f9f2ce434c9c9385e8583fb948fe2e1c120ad564a95bc247993493afbef1163206c30fc8a141d72ee723b3bcabb20a5f9f36a SHA512 83789963569dbaa599294bd79447e3351309675817eef683e2f90974d68fda00c705eca43c015128d6c6e9ec98f14bf7f205f8e3ab46f33c1bf0afaf0f055694
 AUX cdrdao-1.2.4-wformat-security.patch 4864 BLAKE2B fa300eefe5d714de0245a9e745d13f051dcbc14590efb33a367dd113474984618e62e347fc3cdc26a057169ff95bdde25b36d9b7bcb25aa9cdd5fd9b07a42ec1 SHA512 a40fd8c91fa207ad52f3cde9318fc4422f14aeea15bab4d2cd1e04d3f09a2fc2b666397cdbddc89245c97a6a98ac155c0ecf71c1e2993a366a21016bd337a33e
 DIST cdrdao-1.2.4.tar.bz2 1442181 BLAKE2B e1163b25c165a7acd7ec8c53069794724d93f09a486150255a58985e3fd0a222ba7ac5c124cb7a6991cf440ac701651be38754615fd3d0d295affa93595dc388 SHA512 41f20275ca44ec9003d0e3ed280cc98012353005cda6f544ebfa44f3f79f991845c0ef17af74db9456f1bacc342a7fd48c9e942d757927a4a9ff91808f7bbb09
-EBUILD cdrdao-1.2.4.ebuild 1278 BLAKE2B 65a3964b50946c86cf9bec4e375e159c131c382897950df530aa87a2d4977b73fccb101439350e4d153432185941f3872180192cbebf62891dfd4a627ff4d3df SHA512 6fec4cc11fe4f78eb8cdf2c7f79d451d233ccb22c0c42e13259be16c3e36d0633c7d5af4fdb69caf8ea959d141f1cb84729c4d7cb8486c26c8a1d8615aaec31a
+EBUILD cdrdao-1.2.4.ebuild 1279 BLAKE2B 3d7a90f9fcb376e1a6f5fd9664ad108c8e9f0b3daf2b15ba9a262c3a191a5a6b2246e620dbbd4a6e353c53e970bf8f6651c01f25e36936e3eb0b457ca5fe8dd0 SHA512 ea84659f2d01aec0cf958d1f2af1ea8711de89c3d509cdcdbd98cb16c141e805f8fc6ef63c1a962e3a7e4272a24b7b864c699ef21e408a49ec8f565c97d5e2fe
 MISC metadata.xml 395 BLAKE2B 271ac8836e1bc4bd8b8405ab9fdfdaaa4046b47bb44b07bdb78d063853a82433117d69d4dd46e89b4f42008b55f10e69d8262340bd29fe396061add32ed9959a SHA512 66d6f12a07e09dd91c828d34941963b1a498e1be14f0cadcb145b47471e148559280fb237a68c1d99ba3c2360e0603a231f124b950b3debde76fe476a5491351
diff --git a/app-cdr/cdrdao/cdrdao-1.2.4.ebuild b/app-cdr/cdrdao/cdrdao-1.2.4.ebuild
index 453abb57b57f..ad7882844366 100644
--- a/app-cdr/cdrdao/cdrdao-1.2.4.ebuild
+++ b/app-cdr/cdrdao/cdrdao-1.2.4.ebuild
@@ -16,7 +16,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ppc ppc64 ~sh sparc x86"
 IUSE="encode mad vorbis"
 
 COMMON_DEPEND="
diff --git a/app-cdr/cdrtools/Manifest b/app-cdr/cdrtools/Manifest
index 03df80493f53..437ac5b1d394 100644
--- a/app-cdr/cdrtools/Manifest
+++ b/app-cdr/cdrtools/Manifest
@@ -1,5 +1,5 @@
 AUX cdrtools-fix-clone-uclibc.patch 2582 BLAKE2B dfa564f67e15dfcdab9e654572c95f89787fded558e88edecde89237ea5097b6a6cc0233b5950f0df460490af415255a56130d27b7198b3c1fee279e288835f9 SHA512 23031747c1d7bc0292beb754f059381df1f1ac7851c9fdb7f296c933f3a9d7c4e52848f90ab50c459432628d74a7546752b299d74199259d84eb89ce92ae0077
 DIST cdrtools-3.02a09.tar.bz2 2156745 BLAKE2B 3e7a7ed65faffc67d53df8dff78562dd28f2e71bb01c36f9c57c033a4a812e6a5579a212322a15c8abb5c8005d38e6e9ba5a5bfab46d9a729a673aa8ce3425e7 SHA512 59c31186f163c7aaa96083efeb0bc31e697c5d53d3343ec487eddd90dc8df6cfee50a69859a64a7004585c73a081cc453cc647c563b32ef74070d075039342d4
 EBUILD cdrtools-3.02_alpha09-r2.ebuild 8319 BLAKE2B ba0bb2b0a734f3eafb229450e0e3975d931037078acb6ba8b150587dcb5b453e0f15fe02936a5c795effd34d470473f9b07649d50c9800f5c30050cec98e30dc SHA512 44dde2b5a613443676eafdbb461189b22725cd86c0e3fe0f6b66fa80f7bb2f9c984a578b8ec76f08ddd3519efa9f612a4844ae62adc63d33a5eb94920466b0e3
-EBUILD cdrtools-3.02_alpha09.ebuild 8243 BLAKE2B 9bd51603cdd2ba6a8e5e525ef5cfb2799695acdb088997221e0862e95d03b051f0e0cea014599420647799329a43b38b94bf5a30d7a45dc9fbbe542d42929521 SHA512 d5cae780aec3321a277cc84479b729c1e00d3ae4417018c757c511d16e13e2e8f9d3bc3c0e1cffe425e196f7db7f425dc13f8ac2ee730929183f5b30fafbd748
+EBUILD cdrtools-3.02_alpha09.ebuild 8244 BLAKE2B 1a44821017c69aa5bb333aa08dad68ce18508a90cca8a39dd7cd222d8df2305ec7a758786ff4b459ecdb25954ce7a7210c480533f7262bac5f10bffde99ba13f SHA512 d266b21d40d247dd4b7cbd4996285f2ae1ef3aea3ab2a66de076092fd3f3dc675759b42f4ab3ffffb78862309c33ade7ceed05061f0580b8d6c27d83242e3aa3
 MISC metadata.xml 533 BLAKE2B 13eeaf0e3fd17234f44138fc6b6fe1b0ef5e369b823a1adb9063743702b9afe86f1d939bb451df1cc6337c2e3790e38b1f890e68c46eeed9210ccc6d96e0944e SHA512 ddf004043b6d96ef6ec697f2452df1df68b234e4b899c047743a8cdd971167607f91c05435bc0a7978f65e13895fecec31a20a2b2f659a696fa3e4e704e18818
diff --git a/app-cdr/cdrtools/cdrtools-3.02_alpha09.ebuild b/app-cdr/cdrtools/cdrtools-3.02_alpha09.ebuild
index 85f1b5f37ad4..dea868c25af2 100644
--- a/app-cdr/cdrtools/cdrtools-3.02_alpha09.ebuild
+++ b/app-cdr/cdrtools/cdrtools-3.02_alpha09.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/$([[ -z ${PV/*_alpha*} ]] && echo 'alpha')/$
 
 LICENSE="GPL-2 LGPL-2.1 CDDL-Schily"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="acl caps nls unicode"
 
 RDEPEND="acl? ( virtual/acl )
diff --git a/app-cdr/dvd+rw-tools/Manifest b/app-cdr/dvd+rw-tools/Manifest
index 756338e99695..670379be241b 100644
--- a/app-cdr/dvd+rw-tools/Manifest
+++ b/app-cdr/dvd+rw-tools/Manifest
@@ -9,5 +9,5 @@ AUX dvd+rw-tools-7.1-bluray_srm+pow.patch 427 BLAKE2B 5caea4e6afd1af9b0afd33e9cf
 AUX dvd+rw-tools-7.1-lastshort.patch 593 BLAKE2B e24b41b6eb39961568133f91a110afc87b26597ead0b623deb22bff11a40638bd5faca1de75b8289484889d2d2768077fd637dfe57fdb8bc9f61c1ddd6bed91d SHA512 554b1eb09a00e6bba38acc6ab983f3e0e810b919eb2205f9ee6473d83edd0fdd524e29b844f4c5a55f8044bb72457b2896a24488d691773a00aa355dd1be9975
 AUX dvd+rw-tools-7.1-noevent.patch 783 BLAKE2B 78f27d65759b98607ac6e3eb29ce44c2d88029f7fdaffd3a6d305166b82a069c8a8621b2c680bfbb3a9a2e6585370bc6c1503b4107e903f69099565bfdc0de8d SHA512 0df88a56b3b776934fea0caca1ac247b5b5416fa4985601ac7996633a833b4d264b334d6bb9c5d7587227529ee36a7f2087fad9f6851b4cde8918204d8718b47
 DIST dvd+rw-tools-7.1.tar.gz 140846 BLAKE2B e456be6ee8d1863e78abc6d494a1ce08a49e3aec9b45533408c33ff4620dfc450b968280ce0453b0c0d966f3afca0d23e1ed7e3497caee8216561ad85599b138 SHA512 938f9ec5597158af275c7bf63002696ba362f6f22a219108c6a1df28792f0485046a7af5ce57e41695aaaa0d69543bd66cbbeb4415df5c0e0a902a3f1d278a31
-EBUILD dvd+rw-tools-7.1-r3.ebuild 1540 BLAKE2B b60523f4f0b7b4ddd9139298ddb0d0a08a4987816b912c2a219b2fa06491fe1566430bf3243139c183488bbc2dfb66205120ce3b7f8766b444cba4757ebe4f61 SHA512 57b91e13bd004f8179665fcc825589428615aa69ac569a99f5447e87a67c85821e0ae89a6eaa789005753eeae01669290a14874491afae28236e6a27832d0d65
+EBUILD dvd+rw-tools-7.1-r3.ebuild 1541 BLAKE2B ec4254010959edd127e49ce88f69024e0891636b0d39d99ec9275d76a6500efc66436fad456c7a836efb36ba1b01da385689a1721c810257417cdc58058b0a72 SHA512 add8b36ce54442b1d7c6a01493541affdf5ce87508425b1a5de4c519f6ab251fc12c4ca399bb44406148f97536400975c43a92d1ba96ba3846bab5b15b072bc8
 MISC metadata.xml 293 BLAKE2B 52fa8d7ab0ea6ec8869040cbdfee249187f47ec2220813c866675c140ef3db973493e1469d7de9c6e9e2d02b3c3b72f08a0f0fe5923774a2b934cef35b7f07f3 SHA512 eb980abc7dc1cb53be1fe388de068272fc51aeae7d714738cd3a9f3b7b07b92f4f2e89e216e1067364d4496857b69545050e435a51a4ca1589e6c4a691bee16d
diff --git a/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r3.ebuild b/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r3.ebuild
index 74ed929233d6..be2cfe552beb 100644
--- a/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r3.ebuild
+++ b/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://fy.chalmers.se/~appro/linux/DVD+RW/tools/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="virtual/cdrtools"
diff --git a/app-cdr/isomaster/Manifest b/app-cdr/isomaster/Manifest
index 726149aeea13..2ad5f7f08a45 100644
--- a/app-cdr/isomaster/Manifest
+++ b/app-cdr/isomaster/Manifest
@@ -1,6 +1,7 @@
+AUX isomaster-1.3.14-include-path.patch 840 BLAKE2B e1247441758fb0ac40da3f2144187e62a80080181bb41bdddcf08de9745cfc3006bbe1a89db57c16a90365b41cb9411b942a1a46c8502dba7544ae6146ee4b4f SHA512 d25e5b8b81623b75377ba5ded5fe43d70a0879bc7956d3c1a60f9f417405cf7ebce808c4145c314a2c968561d8d26e7b8bba5488076593230e49824029626a6a
 AUX isomaster-1.3.9-iniparser-3.0.0.patch 780 BLAKE2B bd7f3cff83b01bb241e005ce200016dd7ee30ac8798a9c250924f20da55f1f774558b64d37bf0a4e30dc44f18ed06f585bda4e3c2c0edf31b203ce5554d7cc50 SHA512 0681ab5b4578f67b1eb9e8180fde951d4a34dbf40452ee29a6f09992afed6da5084791d86778296964cb39d59d2eaf51b97972e02582a5d6ff3698655bf09134
 DIST isomaster-1.3.13.tar.bz2 245085 BLAKE2B ae2333f5511aae8deed76e556cf6055f7ad257d613dcf5c85274946f31f0da879b5fb7953d065046371c6f20faa15663ecb3c5d976c4dff404140cd09d23207c SHA512 dbc6a77fabf8d454bbde25a7540e68820bf773bc991176e5684e87aeb6044ad1bbbcf1c4f537148c18ec8847572949a52d6578a14f68b8ad3f21d542685859ba
 DIST isomaster-1.3.14.tar.bz2 257674 BLAKE2B 7b7abeb586eb8c6964d7959222195c1999f81275dea305e7c4efec1fef6dd9d9d4969552e6a6a4a882a9fe227ea072c6639879896e50799db9e67732e1331ad4 SHA512 5454baa4ce4e09df8ec4331718df3e1d81c0647867a21cfc4c4b15d90e509371a636e8fada7e624c0cf6d1b03b564bf89a2a26e13b5ec1b4cca91407bbc518f5
 EBUILD isomaster-1.3.13.ebuild 1490 BLAKE2B 65c8871a3222bff5abac963ec42ca8547155e2b70c26bf87829e7d03714454a6724abae637882b3913e5e6fdb8b8f994570edfdf40ac492944ed3a252cfc979a SHA512 8693942b49c6b7c85e1c7db64f6f8cb98bb13848f3943c9b29e041e7978a44c089bc33fd1e342ec5b28108feb75f1f11621fb0e7f256879c8582cee462b5d4b2
-EBUILD isomaster-1.3.14.ebuild 1446 BLAKE2B d069fd19ebcae72e6cbb41d81abec823801beed145fc4d785b9da0fc69606a585d1a2b35339a76a17b8579efdf3a1f8393132c94d44c1a2f0bbec5d41e079631 SHA512 fc6c03f16ec9b1574149bcf4f809af20115ca58ec0c631c58a42457e8966361fe2d062ce71ed2fae89d9f3f1075a5c11abb7516574a72212e47b034069c21790
+EBUILD isomaster-1.3.14.ebuild 1495 BLAKE2B 3c508e9fb2edcad37f05cdf222f15e80453b3d150249ed47ca910769c7df07f288529f433c2c6d592eadcfc29ace212b0a9bc88f1b01d0e397cd5572b0bfbbe3 SHA512 e51aaf01126082cf2f2b41ce6ba7f240d04df5500663d65ed60870317130069486b04399c436920434ff2ff2a7f243c4eaae21a0f44cb11fdec92e1a212df437
 MISC metadata.xml 249 BLAKE2B 3647e2ef94ad009c86dc9d42c1396ad9420ade97042882b8d8f60f676c465cfd6ea3cea4b77caccadd99eb0cbe1ef83b18b799ec676da4ecfbff528d21bb5ffb SHA512 334ac61f9acc5c4917fd29afb3b420b1689b39be80cada419bed1db033e64130866d0995abe5f1c75eb1290f51734e9ad4c8d06fd8b49c288ecf617a0693d273
diff --git a/app-cdr/isomaster/files/isomaster-1.3.14-include-path.patch b/app-cdr/isomaster/files/isomaster-1.3.14-include-path.patch
new file mode 100644
index 000000000000..520a355e595f
--- /dev/null
+++ b/app-cdr/isomaster/files/isomaster-1.3.14-include-path.patch
@@ -0,0 +1,25 @@
+From 50113aa660d2a867f3f8bfd67e1ba601c8b5294a Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Mon, 27 Jan 2020 23:33:49 +0100
+Subject: [PATCH] Add missing (Gentoo specific) include path for iniparser 4
+
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 8f4f23b..124a035 100644
+--- a/Makefile
++++ b/Makefile
+@@ -65,7 +65,7 @@ CPPFLAGS +=  -DICONPATH=\"$(ICONPATH)\" -DLOCALEDIR=\"$(LOCALEDIR)\" -DDEFAULT_E
+ CPPFLAGS += -D_FILE_OFFSET_BITS=64
+ 
+ ifdef USE_SYSTEM_INIPARSER
+-CPPFLAGS += -DUSE_SYSTEM_INIPARSER=$(USE_SYSTEM_INIPARSER)
++CPPFLAGS += -DUSE_SYSTEM_INIPARSER=$(USE_SYSTEM_INIPARSER) -I/usr/include/iniparser4
+ endif
+ 
+ OBJECTS = isomaster.o window.o browser.o fsbrowser.o isobrowser.o error.o about.o settings.o boot.o editfile.o
+-- 
+2.24.1
+
diff --git a/app-cdr/isomaster/isomaster-1.3.14.ebuild b/app-cdr/isomaster/isomaster-1.3.14.ebuild
index c30620f0aa1b..cbe941cb2b92 100644
--- a/app-cdr/isomaster/isomaster-1.3.14.ebuild
+++ b/app-cdr/isomaster/isomaster-1.3.14.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit toolchain-funcs xdg-utils
 
@@ -20,6 +20,10 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	nls? ( >=sys-devel/gettext-0.19.1 )"  # bug 512448
 
+PATCHES=(
+	"${FILESDIR}"/${P}-include-path.patch
+)
+
 pkg_setup() {
 	myisoconf=(
 		DEFAULT_EDITOR=leafpad