gentoo resync : 13.10.2019

5 files changed, 8 insertions, 13 deletions

diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 2ff4440fbcc5..166a7faea770 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -8,13 +8,8 @@ DIST mutt-gentoo-1.10.1-patches-r0.tar.xz 108396 BLAKE2B 86edca04154f96efce27543
 DIST mutt-gentoo-1.11.4-patches-r0.tar.xz 107064 BLAKE2B f8ad915fd0ceea729fdc14719e69c43751e75fd4afc9f19460d15493fd97baee9606703d7d6a8239a34b2c0d6f2458fc007277933bbc724b6a8588bb7514decd SHA512 57714259f802efe54e21cd23560bb158777b50320604db0a8ff8a47c25166a873d13d64b03eba4cb1c5067a586e7c64d9d0ba84ddbe0e179745e92d704a55cd1
 DIST mutt-gentoo-1.12.1-patches-r0.tar.xz 106064 BLAKE2B 60b73bcfd9713261c7b88fe74d70a630954511a38331c3e8e958ef7f6459b3bf8548211ee920fe238085c6481c03633cec21e7ae70c1473c89914ce720bd7c21 SHA512 feffbd49ad8156e226e7d4dc56b1c976f3f2a0f8dc3551c11696d5653342b91b4406a494d6081b969fe8267bf09a441a4f3c5a0014d108000e55c985aaafa596
 DIST mutt-gentoo-1.12.2-patches-r0.tar.xz 106384 BLAKE2B 9329c3629d4c8d34e42a422e76dc0ec0f3a4b697fc59586c0258716bb9e4a1ff26cccc20f7ecbc340a92e23b24baa7514041274b3b2b4a73ef9dd36536d8206a SHA512 0aafa589a98e10044a36e578cae5e1e08ae66a0fe773763852441d9410f65f8bf6bd0256e1b0f059bd5ace6fb7ed90f63b5c3dd4b6fbdb6e7c3d2af8a95b266f
-EBUILD mutt-1.10.1.ebuild 9182 BLAKE2B 04bc41d9445b10bb829b7506f76e7d47b4c98a08428f7ad4ba693ba3c1badea96dd69c1895fd3ea7953be657d08913d9a56e6b1a62afc07c9848c6768c249007 SHA512 3439e6b15dbc93f99392ae36e0e5bd36f2f987c1ff4fa65d31195543f97b6ef010bdcec9539acf15ffa03190df278f2e31e152e67883e518243bfc39fb4b3287
-EBUILD mutt-1.11.4.ebuild 9465 BLAKE2B 34cdefad0da015cb40cdb2ee86e91751b7d0034bdecb950e575272af64c63a6ae583cba3a7354f7205522abf67b61128f3e6cb83250fab4648352e7d2e820911 SHA512 b4ed87fd162eeee0e29ce6d0882e0359c248e2d46cd9cae2cdc087b1c26804fc3844c45417c9030a4c1acf32c3f8b4897d14c489b9d08b3dd727ff5b1f436d8f
-<<<<<<< HEAD
-EBUILD mutt-1.12.0.ebuild 9465 BLAKE2B 34cdefad0da015cb40cdb2ee86e91751b7d0034bdecb950e575272af64c63a6ae583cba3a7354f7205522abf67b61128f3e6cb83250fab4648352e7d2e820911 SHA512 b4ed87fd162eeee0e29ce6d0882e0359c248e2d46cd9cae2cdc087b1c26804fc3844c45417c9030a4c1acf32c3f8b4897d14c489b9d08b3dd727ff5b1f436d8f
-EBUILD mutt-1.12.1.ebuild 9503 BLAKE2B 4bbfa37e53ed6e8cb441209125c9b41dbe71cb6a8cf8098076002c58e409ee3b58b4eac01eb6b51c8aff72779d4d1e43d434769fde75f145909709f3d445fc74 SHA512 30aea3779998c9982e0bd8a98c967030c1877fd2b161849636827f57bbed351b34dc73a6ae58e0d0fda43768fd3ecafac8b6b8030c04331dbdf985925faedecf
-=======
-EBUILD mutt-1.12.1.ebuild 9503 BLAKE2B 4bbfa37e53ed6e8cb441209125c9b41dbe71cb6a8cf8098076002c58e409ee3b58b4eac01eb6b51c8aff72779d4d1e43d434769fde75f145909709f3d445fc74 SHA512 30aea3779998c9982e0bd8a98c967030c1877fd2b161849636827f57bbed351b34dc73a6ae58e0d0fda43768fd3ecafac8b6b8030c04331dbdf985925faedecf
-EBUILD mutt-1.12.2.ebuild 9503 BLAKE2B 4bbfa37e53ed6e8cb441209125c9b41dbe71cb6a8cf8098076002c58e409ee3b58b4eac01eb6b51c8aff72779d4d1e43d434769fde75f145909709f3d445fc74 SHA512 30aea3779998c9982e0bd8a98c967030c1877fd2b161849636827f57bbed351b34dc73a6ae58e0d0fda43768fd3ecafac8b6b8030c04331dbdf985925faedecf
->>>>>>> next
+EBUILD mutt-1.10.1.ebuild 9172 BLAKE2B 193ea31b3ee6fd8a65082361d824ab27babedda8e9547f132832080fd6cd7fa7a4fac9ea8bb532d0b8597fcd8d7cc008d0f2718a498f4d32259121ee4a779fde SHA512 0c025d12aad93596931310140b561d9964bea527d26070b094a22ed918c590df01b69945aa82ee359abe702dd0a90885786ca037b1c28d9ef890f954286ae2c5
+EBUILD mutt-1.11.4.ebuild 9455 BLAKE2B b61fa4ed1a67a8068631d5ecd71c512afce81794c9e3bd5669dcf14b8b14a435cf1843b516e7aa15f335b4d5fe35e8e28ea5572453f4ec757318e28309cdd993 SHA512 1f7e20cd4d8a5595790c8a68689faf73ec13025c18cf85313a994510414289a9dbe56271adf72b731c450182d5d2a4c8ba7a2f1ddfddb5c9b9f287796b67fdb7
+EBUILD mutt-1.12.1.ebuild 9493 BLAKE2B 64fbef4a2abd922a8161303a343bec10737c0e3089bee00a1d97c459a15cc60089cefd943f7dce72051adc2813581e50a0c90a95fbe075adbf18ab8c2fa0f1c9 SHA512 3b6359164106898bc039cd2115f212bca412ef80c3722aebace5446df1ae98a6f38936bf540422be5d75dc3fd013e2bca41c2089af15753fd5c273696a3239b7
+EBUILD mutt-1.12.2.ebuild 9493 BLAKE2B 64fbef4a2abd922a8161303a343bec10737c0e3089bee00a1d97c459a15cc60089cefd943f7dce72051adc2813581e50a0c90a95fbe075adbf18ab8c2fa0f1c9 SHA512 3b6359164106898bc039cd2115f212bca412ef80c3722aebace5446df1ae98a6f38936bf540422be5d75dc3fd013e2bca41c2089af15753fd5c273696a3239b7
 MISC metadata.xml 1606 BLAKE2B 4b25867379e06da3cb6cc6500c42c731e18512be107f69df9764689ce2de3741ce235d0f610711e4fbfb256319b1343647075da7808532a63946451f7e6107f5 SHA512 054aee931ba2bffe79982ffbb2f32282f8c7277319915ef55a2a2cd3e39f20b1ab90c664016630aef63f0d325fbd3934336f0d5bb25ff610ecb26fc9f9fc66d1
diff --git a/mail-client/mutt/mutt-1.10.1.ebuild b/mail-client/mutt/mutt-1.10.1.ebuild
index 2dd27636988e..084c4add8e07 100644
--- a/mail-client/mutt/mutt-1.10.1.ebuild
+++ b/mail-client/mutt/mutt-1.10.1.ebuild
@@ -28,7 +28,7 @@ REQUIRED_USE="
 	kerberos?         ( || ( imap pop smtp nntp ) )"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~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 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 # yes, we overdepend on the backend impls here, hopefully one day we can
 # have REQUIRED_USE do what it is made for again. bug #607360
 CDEPEND="
diff --git a/mail-client/mutt/mutt-1.11.4.ebuild b/mail-client/mutt/mutt-1.11.4.ebuild
index e7a091241ec9..cee2882cd8fd 100644
--- a/mail-client/mutt/mutt-1.11.4.ebuild
+++ b/mail-client/mutt/mutt-1.11.4.ebuild
@@ -28,7 +28,7 @@ REQUIRED_USE="
 	kerberos?         ( || ( imap pop smtp nntp ) )"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~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 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 # yes, we overdepend on the backend impls here, hopefully one day we can
 # have REQUIRED_USE do what it is made for again. bug #607360
 CDEPEND="
diff --git a/mail-client/mutt/mutt-1.12.1.ebuild b/mail-client/mutt/mutt-1.12.1.ebuild
index 6c1d31ab1ce2..9f35aa2497e0 100644
--- a/mail-client/mutt/mutt-1.12.1.ebuild
+++ b/mail-client/mutt/mutt-1.12.1.ebuild
@@ -29,7 +29,7 @@ REQUIRED_USE="
 	vanilla?          ( !nntp !notmuch )"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~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 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 # yes, we overdepend on the backend impls here, hopefully one day we can
 # have REQUIRED_USE do what it is made for again. bug #607360
 CDEPEND="
diff --git a/mail-client/mutt/mutt-1.12.2.ebuild b/mail-client/mutt/mutt-1.12.2.ebuild
index 6c1d31ab1ce2..9f35aa2497e0 100644
--- a/mail-client/mutt/mutt-1.12.2.ebuild
+++ b/mail-client/mutt/mutt-1.12.2.ebuild
@@ -29,7 +29,7 @@ REQUIRED_USE="
 	vanilla?          ( !nntp !notmuch )"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~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 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 # yes, we overdepend on the backend impls here, hopefully one day we can
 # have REQUIRED_USE do what it is made for again. bug #607360
 CDEPEND="