gentoo resync : 13.10.2019

6 files changed, 10 insertions, 18 deletions

diff --git a/dev-libs/libffi/Manifest b/dev-libs/libffi/Manifest
index 430dace65eb6..03e7567704b9 100644
--- a/dev-libs/libffi/Manifest
+++ b/dev-libs/libffi/Manifest
@@ -10,13 +10,9 @@ AUX libffi-3.3_rc0-hppa-no-TEXTREL.patch 2821 BLAKE2B fcc7eb0ed4a3f9b31718bf7761
 AUX libffi-3.3_rc0-ppc-macos-go.patch 2100 BLAKE2B 7ae1309b08be9293acee042d141bb632b0763af9e14200ef7206db763b01e289a68ce544709c8abc5a86adca5f1c0c895c6bf24f667429b118bf660ffa95bb39 SHA512 4684b87f1d36a0098ebde7996e4417718b3535eb66ec7c619be74fa30e4446849c246b491cad3aea1ac44bdf9e9fbf6e952000cb85299faf5b1d8598136b184b
 DIST libffi-3.2.1.tar.gz 940837 BLAKE2B d202ccaa185acfd2476ed2a9b011891507cd8efbbda60f67c583268d1563853442ed829acecbf81c9b6b9a930345780bb7a4bd80e71e50ef544c7f4eab8cb01f SHA512 980ca30a8d76f963fca722432b1fe5af77d7a4e4d2eac5144fbc5374d4c596609a293440573f4294207e1bdd9fda80ad1e1cafb2ffb543df5a275bc3bd546483
 DIST libffi-3.3-rc0.tar.gz 1084854 BLAKE2B 2c38d60f17ef52bcf270178c13c218f6ee320c9785091621d4689bcf6cee31d07eaaca12790965e1ae3ad71ad2c408342743968bf1d23f81a07fbdf6cfd55b90 SHA512 e6e695d32cd6eb7d65983f32986fccdfc786a593d2ea18af30ce741f58cfa1eb264b1a8d09df5084cb916001aea15187b005c2149a0620a44397a4453b6137d4
-EBUILD libffi-3.2.1-r1.ebuild 2269 BLAKE2B e2075034b9e9bec42427dcacbfc03aa114d9c2e5fd3cbda307bd24ae63573a8ab27459ed0b73177bd969232be7640b737a35bae7f5be69876b92de4351dfcbff SHA512 1f27cd306112d3de8762f0cfab1f6196819a6793585c477027b3e0a48fdf0259f764d87b8cb221c5b32aabd5ae47d8535f040d0960256064d14a4d78a67bcfb9
-EBUILD libffi-3.2.1-r2.ebuild 2328 BLAKE2B 26926447321e54807371c9e2154b062def22f04e298ee1ccbc5f92fed4bedab44d19622f034460c0727838fa1c6146c42cbd7fe83bc385df03c827535c42b949 SHA512 04a18c564ca898ffc3434ab7d62f2c2380300937726dae6c50f5e0d479009b059d020d48589b52970aa34723f6530bbeddd0f8f5f6fe3a865d90a48dd494e189
-EBUILD libffi-3.2.1-r3.ebuild 2380 BLAKE2B bfad9eae814e06536a2d6bedc8d746fb57d0746a4324fe6ed6474c7cec772b0b5e52cab4889a022489cbb3dc3a6dc368086462f8cde048ad0abfe102d2a05021 SHA512 03f7403c11b9b5395ff6ca0b57639a5c5a897372af9e9e638dd8d902dc35afdb5bb4615cc8408820853e79097d9350ea6794cfdd809e219418a4f675c2df4707
-EBUILD libffi-3.2.1.ebuild 1968 BLAKE2B 611f038994a687222d26a6709163e1848d15114dccd3e87c9b0a28cdc5851c6cb769eba5517d18f196cf0d27a1703ed01b40ae73e04d4e15b9cc26c07ecc9acb SHA512 f9f3b0a71a8a57adb563eb6c1ed64602976f18ff8e653f777d8dd14928bfc27417ee1aa81eab2529be1dd6b7fb70af274fe2d7cc1c0c09d29e48f37661ddeec7
-<<<<<<< HEAD
-EBUILD libffi-3.3_rc0.ebuild 2108 BLAKE2B a56dfde1ab20a6e7c327db771abb78ccd67d43710b3cc347ce0fe42fbbb1cd2d014cefac6afe8a29894111f819c639907d7388c025072af3b563e7d4ae53d410 SHA512 23cf7b84ee253a8e86125f51f6ee6ab2c63c9120526a139b486f665a50cdacc9c674a3894972278835ff63b2a522d58b156d594aeecea645241501c089fbecca
-=======
-EBUILD libffi-3.3_rc0.ebuild 2106 BLAKE2B 116e6e9d949b4103862727966ec48a18c002e3b676803cd99f4c3776915f520cfa1ed07903b5a039a497afbec90bdd6b580b028c95c0bdc2a64b9fa361a8b500 SHA512 8d88a86081c88caa9fd938560a84c2d29c27155be261517c0dc0e787d9886360145086bd3c8d16d9c7f5b2e5929aaf27ba92403cadb9ae3bf08bea6d966cd495
->>>>>>> next
+EBUILD libffi-3.2.1-r1.ebuild 2247 BLAKE2B af3fe29f0a3bed8dc2796651bee68f94133f1a3e7aebeab9fed8f2ab1e956e678e36dc746e5e19cb60707e0b8cc122a82c45229750b2b628a39c8d7665605fec SHA512 3d4f77b9d81d6963b34aed7a2677825187f811a49f0189114bdc94b358860913268dce3cbc27b9b4f862a23f18b226610f0c74c0d0ac54c1d3cac491b5dd89ac
+EBUILD libffi-3.2.1-r2.ebuild 2306 BLAKE2B 2aab5739ecccb926509487d44c113df73113f393c37ad55ab546b43172767ee93bf4e8d927831dc5d5ee406b4674cb73ca0a6b4503bf5190327cac9f2e2f42e7 SHA512 5f531fa8a5231a653e7a6dc1037cb6c3c37b7961a175d3ac3b346ac68f6030e266f1d8745e2ca29600965b03691146a545862a73ad59d189d5120509cc28278c
+EBUILD libffi-3.2.1-r3.ebuild 2358 BLAKE2B d9b06232210d47d8f46ec3d5ccecef1c01bdc434df74a521500dadb6879eb091c9954cff2277035676503318d50a8e30eb0d7626f1a1f2b0fa2f62a68646fb8f SHA512 6f05734cc0fdbdb82b869847c248aaae89aadd97f1aad87356002e020cf52464d0db311fdc37bebea8aa15aa4ccd3fa5c5017cabd1f6e18af06a7e49642f3ae1
+EBUILD libffi-3.2.1.ebuild 1946 BLAKE2B 064f5d08503166205bd4f7b655e36611703055e7b5a7e0313a406ffff6f20ca17f8ead0c5c4276e05b23cf6e73cd050b7953a2b279001359c96b30a106a7c5c1 SHA512 55c6e14e2a5ae1b9f1b2e3645fc8d4ddfa590b62d4fc1ad64b01de069e5c0b8bafedfdf3568239899141a20dbe3d87990f9890af9372b81f96c439e2141f3ef0
+EBUILD libffi-3.3_rc0.ebuild 2080 BLAKE2B 507e6e8f94ab4c3c21d268e699d1d7bf6c6203c2c66a36954f0b5e18fa85f79cf021b924d75206fe4aa748e2880ed27ad2c9c883eda7340541453cbc5de69f9a SHA512 0303f61e1a8a633b76dec8e61ee09508019eab8a48b8b4e55096bf53136584c370958e6016e6d3b6442f958bf3ec5824ae1473d1e6ae2fc68eef08ac8fdb962e
 MISC metadata.xml 1956 BLAKE2B fa40a1a4cfe54a77a1a7d8e4d5ae8a1f80c4497c38a2e700e242ddab26090ccbaf4738e67c288e5f337c393aab085b161f23138f50fb8b1bfdac2de1eb440428 SHA512 87638bd9030782e1e8e917fc1fb9e28744b7dfd927d42e36a249cec835f734db3c6430c2ebc807b7541fd9ba8d805b57ced30486e8bd046dde2edb56a4af7906
diff --git a/dev-libs/libffi/libffi-3.2.1-r1.ebuild b/dev-libs/libffi/libffi-3.2.1-r1.ebuild
index 94aacacd13b0..3d1b61e0fd72 100644
--- a/dev-libs/libffi/libffi-3.2.1-r1.ebuild
+++ b/dev-libs/libffi/libffi-3.2.1-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="ftp://sourceware.org/pub/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug pax_kernel static-libs test"
 
 RDEPEND=""
diff --git a/dev-libs/libffi/libffi-3.2.1-r2.ebuild b/dev-libs/libffi/libffi-3.2.1-r2.ebuild
index 99e5d165f3da..ef3e0d216648 100644
--- a/dev-libs/libffi/libffi-3.2.1-r2.ebuild
+++ b/dev-libs/libffi/libffi-3.2.1-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="ftp://sourceware.org/pub/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug pax_kernel static-libs test"
 
 RDEPEND=""
diff --git a/dev-libs/libffi/libffi-3.2.1-r3.ebuild b/dev-libs/libffi/libffi-3.2.1-r3.ebuild
index 45d1209a70d6..34d55005928a 100644
--- a/dev-libs/libffi/libffi-3.2.1-r3.ebuild
+++ b/dev-libs/libffi/libffi-3.2.1-r3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="ftp://sourceware.org/pub/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug pax_kernel static-libs test"
 
 RDEPEND=""
diff --git a/dev-libs/libffi/libffi-3.2.1.ebuild b/dev-libs/libffi/libffi-3.2.1.ebuild
index 8c103bd0cdbe..8143d37df311 100644
--- a/dev-libs/libffi/libffi-3.2.1.ebuild
+++ b/dev-libs/libffi/libffi-3.2.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="ftp://sourceware.org/pub/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug pax_kernel static-libs test"
 
 RDEPEND=""
diff --git a/dev-libs/libffi/libffi-3.3_rc0.ebuild b/dev-libs/libffi/libffi-3.3_rc0.ebuild
index a9cdaa09a785..ab6318f48edf 100644
--- a/dev-libs/libffi/libffi-3.3_rc0.ebuild
+++ b/dev-libs/libffi/libffi-3.3_rc0.ebuild
@@ -13,11 +13,7 @@ SRC_URI="https://github.com/libffi/libffi/releases/download/v${MY_PV}/${MY_P}.ta
 
 LICENSE="MIT"
 SLOT="0/7" # SONAME=libffi.so.7
-<<<<<<< HEAD
-KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-=======
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
->>>>>>> next
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug pax_kernel static-libs test"
 
 RDEPEND=""