gentoo resync : 13.10.2019

5 files changed, 8 insertions, 16 deletions

diff --git a/virtual/libffi/Manifest b/virtual/libffi/Manifest
index 90612b7122df..e408a616b41d 100644
--- a/virtual/libffi/Manifest
+++ b/virtual/libffi/Manifest
@@ -1,9 +1,5 @@
-EBUILD libffi-3.0.10.ebuild 600 BLAKE2B 0c6732b0db5ba900f94ae65aae06c196efe64d70fd895aaf58d666bb3d9a43e8a217a0fae75554568ec8c7f44e8fc3b97256d59873ab27c3c3fdae5b6019c9e4 SHA512 4816f4904e24674caea50e8a0ae621a70a53fe2635a91d6e1e3354f35b93d1cb94c0eb92c52b31ce8fe61a5df804e8ab7b2e1cc352f123bc19320b325189002e
-EBUILD libffi-3.0.11.ebuild 601 BLAKE2B be01a763073cd8874f1c3ec07dcd0b9058536f43cc3adf9da5f5e893bffabd37a99971ef52c3dbd6e70db62595fbfe306094a54ae1b616a4a45c291f80fc6e62 SHA512 6651fd8cec053b59ea1297945bc590da58f147fc4d6fed6dcb2b08f8fc9b6277dc5a4124293fea79c2ffdcf85efdd1b799701fd10f84d6e64ad1829445b84cd8
-EBUILD libffi-3.0.13-r1.ebuild 676 BLAKE2B 75a53a2cfe5ea7056c115adb95b980233fad60397c6e5b152b12d4214b0c4866181e48d8cb2ff4ca5868538cc3e46def2dc22c7b77f20b1d613844037c7b0b23 SHA512 e4a943c879412c740720192c9f659ff339226536fcc08b6df0d61845317cea622b24f0aa35071eae8ee8d507e44bad131aae3cd84a31aedb2ba916652d1a61df
-<<<<<<< HEAD
-EBUILD libffi-3.3_rc0.ebuild 716 BLAKE2B 04cbe11690a0db5e5d857f06ba10e8d4cab169b5ab846eb52d3161ff6ce1ba6e94f38d8e2886374057988cf812731f3018d9d6e745f2b354464a04fe12c57430 SHA512 c955a86ea696f7da5920824e98fb83231395dae6258b0d05adfa421f56d3c057b68890fc0cb216fb23c0b8038a0b45b8f43898489342ad55ceee733b7b7f73fa
-=======
-EBUILD libffi-3.3_rc0.ebuild 714 BLAKE2B 32c0be2aded325b77a03faa04bf061322bc54a1a501f2c13048b0b5c1e80bdd70c65320067521d4077febed399a539644d8fddd3b1cbd781fe69ddb49bfbcfdc SHA512 e27dffbe1c3281de3aa44de04e9b57827d17572960facb0a963224e0ab24808f4d6de8c85d7753343b68b6811e02c2333df3bb8bf583f5bd30289ae5fc3f9459
->>>>>>> next
+EBUILD libffi-3.0.10.ebuild 578 BLAKE2B 6e2bd3930f5ceb99dc0603806538c263fab1707a44a8ad54706e5c46026c4291dc70e3ca56cb8c5333d884bce4acf3bfc729b261013e8c1664223fe44fe2427f SHA512 91d796e485f68c031353082a8d2483833223a61b16bc9ab463f2e4a592f94f24279c1483e7c89b8fecf975cb4ae9030b721519745d085385a3ac945956b431dc
+EBUILD libffi-3.0.11.ebuild 579 BLAKE2B c1fd83e3d55b1c5d5542e8564560c9cde2afb48ee56ab4551c018edc87d1347d33dc5f1e7a0d1e96bd25bd3c96f6529e630c1bd4f012f97fa1dd9a41c52ca40f SHA512 4e7093e3a6e2858f2961a4b42044fd660743620ab1b195d2a4123b67037ddc3f396d099415487271c38438740bcfa254c0f05ab1e853ab2d8b770fd995c7f373
+EBUILD libffi-3.0.13-r1.ebuild 654 BLAKE2B 2ab7f775335768cbe32f0dbffe4b15f4d53fdcc7b02916d1aa3fa56682760c4ef7ae55918335ea7333093a2bf862530fb2b7b3bc327bfb7c517471886f9c8e89 SHA512 e8f2464d28799772e43ed4df7373723bde3949b55c5709675375e6d361734f9241cef4faf6807c89fa8421e0be833c7c4bcd38ad95fcf579625d2e02ba71b400
+EBUILD libffi-3.3_rc0.ebuild 688 BLAKE2B 482f278be58cbb854c1e52120405d9c76abc5721fa91db4132da051504f1c772cb6b63055d9970487be4acd6a14afc9292374754b7bbcc72f7b678a9e6245654 SHA512 ed4bc7a4f3a3b29cb44a3e75804cee126ab122540ec11f5102a04489bc3e830b847d33abaedd1e69c314590f03e98926531e89cf8a58ed159be8e7fba909841b
 MISC metadata.xml 267 BLAKE2B 5267526ad53ec7bedfe46f8cba86c810629394fa4f3c59e1b69619b0a11a9edbb746ae6abf818182da7ade72c862360f43a19209007a23da9701df26b96f77dd SHA512 715bb37d958c1e508b2ef00711ab3a4abee982efe90867fd2bcf91fa91305d5a413a4f3d13d01ea6e27eb15f5f9dcb58fa13ecfed7025cae43745792ac1a105d
diff --git a/virtual/libffi/libffi-3.0.10.ebuild b/virtual/libffi/libffi-3.0.10.ebuild
index 3ad31332ea43..8682fa658c68 100644
--- a/virtual/libffi/libffi-3.0.10.ebuild
+++ b/virtual/libffi/libffi-3.0.10.ebuild
@@ -8,6 +8,6 @@ EAPI=5
 
 DESCRIPTION="A virtual for the Foreign Function Interface implementation"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND=">=dev-libs/libffi-3.0.10"
diff --git a/virtual/libffi/libffi-3.0.11.ebuild b/virtual/libffi/libffi-3.0.11.ebuild
index 415b6462a41c..ef72669e366d 100644
--- a/virtual/libffi/libffi-3.0.11.ebuild
+++ b/virtual/libffi/libffi-3.0.11.ebuild
@@ -8,6 +8,6 @@ EAPI=5
 
 DESCRIPTION="A virtual for the Foreign Function Interface implementation"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ~ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ~ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND=">=dev-libs/libffi-3.0.11"
diff --git a/virtual/libffi/libffi-3.0.13-r1.ebuild b/virtual/libffi/libffi-3.0.13-r1.ebuild
index d7ca4dfb3bd8..34a4f91ea29c 100644
--- a/virtual/libffi/libffi-3.0.13-r1.ebuild
+++ b/virtual/libffi/libffi-3.0.13-r1.ebuild
@@ -10,6 +10,6 @@ inherit multilib-build
 
 DESCRIPTION="A virtual for the Foreign Function Interface implementation"
 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"
 
 RDEPEND=">=dev-libs/libffi-3.0.13-r1[${MULTILIB_USEDEP}]"
diff --git a/virtual/libffi/libffi-3.3_rc0.ebuild b/virtual/libffi/libffi-3.3_rc0.ebuild
index 42ada5056389..d3df4054609c 100644
--- a/virtual/libffi/libffi-3.3_rc0.ebuild
+++ b/virtual/libffi/libffi-3.3_rc0.ebuild
@@ -10,10 +10,6 @@ inherit multilib-build
 
 DESCRIPTION="A virtual for the Foreign Function Interface implementation"
 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"
 
 RDEPEND=">=dev-libs/libffi-3.3_rc0:0/7[${MULTILIB_USEDEP}]"