gentoo resync : 07.04.2018

19 files changed, 179 insertions, 89 deletions

diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 8f02d3143a53..ce33df19ceff 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/beep/Manifest b/app-misc/beep/Manifest
index af990013bf60..ae18d2a91c68 100644
--- a/app-misc/beep/Manifest
+++ b/app-misc/beep/Manifest
@@ -2,5 +2,5 @@ AUX beep-1.3-CVE-2018-0492.patch 3292 BLAKE2B fafed7dbe65438869adccf674b19c4e5b6
 AUX beep-1.3-Makefile.patch 516 BLAKE2B f69b5907e7a1342a574bedc273e609415e5853939aa694894c732333e482f2507462748cfb9ba1f0945f4778653d44c3fa04c4aca3eb78afb7152597beba759a SHA512 b21f788780a13bbef436b80ec020b8727b9c1a8ddac3552cb8bf05d7ab937851d05d72279b53b51dd0ae1f99e44f55caa494b7e61b59800d91dd186497b65009
 DIST beep-1.3.tar.gz 19344 BLAKE2B 4f9cf12f6983eeb53502fd85e5e1d428e1c1af481f8f424f6ae18cbe104462e8fdcc96670a72daa8a8a0d1430d00824d8795b4db53437e7bb7320cddfd84cfd3 SHA512 3f71146202208fa0c0cda360d125dd972ea003cf8cd62da21d67eb544c92f7b82640e7ce7c3835cbc65c75909a882edfa54dbd8d8b748d6f243711ea331477fd
 EBUILD beep-1.3-r2.ebuild 639 BLAKE2B dc9f0e4ce7d73941801fff7c7a872f1295c2b59aec1a076b3700aca6aa21520ac71a104e0e84c60545684120e6d619e82117e8e145e48c803a85887cb7f82c58 SHA512 8efda568f0faa4471f495c243ab64fa0fc360ad6e05fb7752b615a8ecd527a44667a2829eab35413cb0642805abd387e0033dedca05affc5269f68178fbbe485
-EBUILD beep-1.3-r3.ebuild 684 BLAKE2B 261c3dd6a2e90c923f74ba01d66a2d29873dfd411ac50bc49375aa8c672995f12d21757ffefecc41eca0b7c8fc80c79cb002470f774e8aeaa7099c998968228f SHA512 29560fd571aa6ad5d7222223b54330e278ff33c5ad69dd68440333dafc3cec128f3b24baebeff2abd4fda3f148caa79ccd2bca93ba3a5e18557509e5b490e31f
+EBUILD beep-1.3-r3.ebuild 683 BLAKE2B 0c543b903328adadf5148fe6406c9a6a3ec2576a9f22be340fb68edcd7755bd6b0d78242a3b5011482ae01af24176ec650b550dba1e7d756c8c0df0cac1c3ebf SHA512 fbe4703fd86a603b2eefc605e2d634ba9ae951a796985571cc4c7e503252aa397f7ced5d3507f0bf150a5504bf4e95dc58937586930a67b3424aa4e310405467
 MISC metadata.xml 271 BLAKE2B 46146f4bf13e9f4d33435225ec1012dd9bb89b20812963dc50368cab2a60a3c542052cb72f8963cc72074b2c13a5b054c77152de1d108027752601a349bc4ef8 SHA512 3e98f5382cf789992bdfc0f32e6e36eba31944be654c03f2ed9bd00baf56c8b768c256c4f8778d5775d6df38da4afcf8e32b6e6495a1ecfc8e7982c7c8943b1b
diff --git a/app-misc/beep/beep-1.3-r3.ebuild b/app-misc/beep/beep-1.3-r3.ebuild
index 123132094977..c7a6706fc982 100644
--- a/app-misc/beep/beep-1.3-r3.ebuild
+++ b/app-misc/beep/beep-1.3-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.johnath.com/beep/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 ~arm ~ppc ~ppc64 sparc x86"
 IUSE="suid"
 
 PATCHES=(
diff --git a/app-misc/binwalk/Manifest b/app-misc/binwalk/Manifest
index 42c0a6265cab..3c783d753a71 100644
--- a/app-misc/binwalk/Manifest
+++ b/app-misc/binwalk/Manifest
@@ -1,5 +1,5 @@
 AUX 0001-Added-check-for-backports.lzma-when-importing-lzma-m.patch 2295 BLAKE2B 42ceab5a3b276d9bb0206fc71a4d95e93a1ea8b93e623c7bdac3f846d957586b7522bc6b4a36d24ef182a8fc8623665b17abe0a8ebd529f12d55dd34b200786f SHA512 ad0a89521948ea381fef71c53f2a85e692ac46666fd93a18955f568fca583f5b5685a024152cd774a33df30e9b965513a57139d43db8357836e145d22710c006
 DIST binwalk-2.1.1.tar.gz 263977 BLAKE2B 8fd5f20dcdb22a6528131fbebc1454cc496079bfeafa63ddb0679c7c7b5d5c29d81dccd4f52e8f6f7d8881d9e672d691c2b2ef367f2bf3180ffbb4ad22dca021 SHA512 373e276a4d6ec845952f1091f85f953d3b0d52d561d9b74a54000ebdef85d13cafc997a4f8f76f25842db8b76fdcd1e602d4d81792a3ea01c9dea6c6ed5c2168
-EBUILD binwalk-2.1.1.ebuild 1099 BLAKE2B f743e5502cc02f448a2a22e3dca3aa77bbc90ecdda74bc4081580e66bed9a4e9deaef2ff0f9f5ff97ae04ac4024633800073cf73f6862bc44f25ca93eccd32da SHA512 afcff195011fa4c8cfb56d82b0984057c51e15919243260b6830ae093ffe11aeb6f22a69602ea61e14d6603db0c224bfa2c17b4b23affd752a3db13f50dcdfa4
-EBUILD binwalk-9999.ebuild 1010 BLAKE2B b9967a0bb5f70bc0aa4358d8491e24ddbaefa11bf2cda79ea845c8c7c08315fa4fecbbb2fc3082ca2b68c7aa746182e84f97db7c9de411e81139a3452068ce7b SHA512 112d781d9aa9e513df88669b9552677a786e4dd1de435eaba983439699167fc2ac185e221a82627dd676ac3f3711c78e79531568447bcf5bb15eaa87b227084c
+EBUILD binwalk-2.1.1.ebuild 1110 BLAKE2B 91138bcad83793cbafed2da690706491f2e4481e35b740123da388b48502a678eefe3d85113ee9500ab85d6dec5639d3efd3153216af78d0dcfcfbe78579aac4 SHA512 77585899a0f0cb775376ea767f4b5f1ae8f6bacebc6d2df7ec4b6a4eb3a293ba3817a6c63be6e3714f386ddec685c921255f806058954f00e0cf56bb15a76f4a
+EBUILD binwalk-9999.ebuild 1021 BLAKE2B 2b1209d4211d85d9e2b7250234777b81c308a4551f21a2caa91c0dc325ea64034b7e670fcc9f836b3308d83c798a5f3b58b4c260e08b89fd6f78a8470364ecc2 SHA512 ec0c1b3954b6ec60982266666e3a64e989a1cd87f58451df7f2622cd8116b36fb66831bea034eca6dcdba6bba7ae5dada6fe86733150da62d79cc9c72d1acc57
 MISC metadata.xml 1043 BLAKE2B 3c31b5153464d9c439fdcab70b47aeccce5d0a8ec4acb57bf519830b80915bfe3e38dc0d995fc875f5b217bb354bc250043684188a2fc7988948039761204c2e SHA512 4f8c75bff33aee8f04748e52a6c13a866c08b1e0a9e4ff47fa5ccbf2a4e203e1324c6571edc57ce7713a1fc18af3f6d68645a725df84530aab03cf6f87dda5bc
diff --git a/app-misc/binwalk/binwalk-2.1.1.ebuild b/app-misc/binwalk/binwalk-2.1.1.ebuild
index 5bd6562744d1..fd5e23c75834 100644
--- a/app-misc/binwalk/binwalk-2.1.1.ebuild
+++ b/app-misc/binwalk/binwalk-2.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/devttys0/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86"
+	KEYWORDS="amd64 x86 ~x64-macos"
 fi
 
 DESCRIPTION="A tool for identifying files embedded inside firmware images"
diff --git a/app-misc/binwalk/binwalk-9999.ebuild b/app-misc/binwalk/binwalk-9999.ebuild
index 4b5c50dcc0bc..4e8eaf67d0ef 100644
--- a/app-misc/binwalk/binwalk-9999.ebuild
+++ b/app-misc/binwalk/binwalk-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/devttys0/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~x86 ~x64-macos"
 fi
 
 DESCRIPTION="A tool for identifying files embedded inside firmware images"
diff --git a/app-misc/dtach/Manifest b/app-misc/dtach/Manifest
index bf4919e7933f..a92a8840d00a 100644
--- a/app-misc/dtach/Manifest
+++ b/app-misc/dtach/Manifest
@@ -2,5 +2,5 @@ AUX dtach-0.8-CVE-2012-3368.patch 1040 BLAKE2B ded617740765ca7aa814cc98acb46a368
 DIST dtach-0.8.tar.gz 55472 BLAKE2B 9627075763f02787d7071658d1ae040d0c18dfe91f2954546398431e677b7c90cf67c23af0cc20182b354656d50b579c378f54d9f691853b7707a5761bc69b4f SHA512 ad0a788d10a5e1e1be4c353b64e1e4a0dc8c888492a638b2442d7c59ef31d67975357116435a1059141bfc2c82a3a6e9e490faa87cf81e5fc3bc7457a99c1193
 DIST dtach-0.9.tar.gz 60608 BLAKE2B 915b3a13cfd86a2e72505c9f8778ebbc9f25db761815e1352c0bc1281aaddcc95a837a880999379c19912fd3980bb77a20711796ef71b06282f1a27a6cc3572d SHA512 28c13dc8c96c16b9c6153a3a11fdeb4a4bc72e84e1f2575043b047cd8e600a47232f29544ffd87d82e2575623ec2e999a26e23e9eac25ec81c7722bdf98cfb18
 EBUILD dtach-0.8-r1.ebuild 472 BLAKE2B fe7f93c1bb254d2d1115f0cc96ead198ab266712fab96a4dc55bf93e04311cbbeea74b1f25b2bdb16e70520c3f3b70d2c3f4dd167271d1d4ba0c54cb46a28d4e SHA512 cddc92673cb9ab6153c477c2a77f95584edcb4a7140c5e275ddb9ad64773c56084e9609d06c9a00cb226ac3cbe71842114b6fd3522e0db6b624f4adb1fdd216a
-EBUILD dtach-0.9.ebuild 456 BLAKE2B d9aafb782a0b2b8d300450330eefb4c85a5a1e5fe0e60a6c0e5ef69b33b6e00388be91d930885ec7ae39a8222c6ca0b85e8272d86e5226778ab73e339881dadf SHA512 4eec7d0e1c170b86af0b83e35a5648ddcdbccf8850caf413a4b71f604d9f55c8c8d9b0f1178525f3a47f0667243a83473d48437726bf1846dd675e963cb8f918
+EBUILD dtach-0.9.ebuild 455 BLAKE2B 572cadc893cb25d1a95b48c184f61f870711f17874373e2c8e27117b489190b20b817d947cbb509351074cbc7fd8f31a87946e9d31da55dfe014b68f2c0f93f8 SHA512 3afa9818d0e6096de35f60daab40ebec244f22e0b64f86fef53b26de4637295f55355a431dc05756537604898296b3c20714dec33907ca27d852f096fe8a69eb
 MISC metadata.xml 393 BLAKE2B 0a07b0eac6407190f07439b29f3cfbe185450ba5dfe0c4d3988c6d6abfe12c728029bda874cfaef61c48abe6182288e70ceee27d5db22b8eec03b20476db2991 SHA512 39071ddc8ee3913fb6898bbf5ce5488c76f6a7fa5f3f3905359a228d432cc76fe0336c0640d0fcd26c1be97abc220626c4258c5cd1de280a50d033b57d84aaa7
diff --git a/app-misc/dtach/dtach-0.9.ebuild b/app-misc/dtach/dtach-0.9.ebuild
index 29d85da77d1c..c7f69857e236 100644
--- a/app-misc/dtach/dtach-0.9.ebuild
+++ b/app-misc/dtach/dtach-0.9.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
 IUSE=""
 
 src_install() {
diff --git a/app-misc/dvtm/Manifest b/app-misc/dvtm/Manifest
index cdfde30620e1..4237df92afdc 100644
--- a/app-misc/dvtm/Manifest
+++ b/app-misc/dvtm/Manifest
@@ -5,6 +5,6 @@ DIST dvtm-0.14.tar.gz 35893 BLAKE2B 3fc98614f4a8d3013a98a0e2766c2827a5d9f1046fb3
 DIST dvtm-0.15.tar.gz 40511 BLAKE2B cc5075b5337a66b3eb5a3845f18aaadc6be36804e1a0e217e6bfe640893ec5af7553aa69578f8bda6c3b11b28c02ba5398e19f9cad9844bfcb1bd32ca4f24c12 SHA512 48a0c8fd6a50fe5d43414d0223c9f4b9920a31d42fe3bfc428ce1ae7d0e41a41ebe2597eae0824c7c76bfb0e32a13e440c8d5fcdb1886d55d6791fa3fe3fd77b
 EBUILD dvtm-0.14-r1.ebuild 1527 BLAKE2B 43ab1e43a55d399c801e328368b11c31f99111d2573c723150b0afffd94ebf477e5d17b470eb915dae374ff208e99fed8be85613224657567d136472503f08d5 SHA512 5909230c679470ed169370fdec465f07965934df68446dee6c3bd8312c6cd36ad38fb5a728a3396853abe48e191a8e081db38a3707878958517f82e83d19f45d
 EBUILD dvtm-0.15-r2.ebuild 1280 BLAKE2B d97bac0c3363f068dbb02a464db283cb543e326320615b8062f52e265cf9e738dcbae80a60d40901424f23be18b4b4e832bb9f113ddbd77b5523f5fc301f1383 SHA512 5057a1e1d31f940e71abc9befe7bccf5ea913a1679566524d7bb88ec6aa1a5df27fd01299a47b57c610c87875f94535a37b78f85a650ec4a2f8539d7ba04e374
-EBUILD dvtm-0.15-r3.ebuild 1277 BLAKE2B 602b0fa58719fdab4d261e7b4783440d565cd9f9c1f87c7b5903bdfc65522c57929ec845663f473dbf3c565bd6c0aa08a293d79a045ba63f326beea1d0e8040f SHA512 a1d3ecd85b8c6395de79d5972cfaeef45dd1ad23dd61254fda2aac16aa6cae3713013958a7f63438d4a48a1471d0826cf8b48f7b9d9fe07266d0d83cb8f60714
+EBUILD dvtm-0.15-r3.ebuild 1276 BLAKE2B d29b99b61ea839c75886df1ec7db7049b9784680b78f8d697a2ff47e6b76c2deb1297275db285272414af7d4d72902d0b1ce0ccb134f86d1474fe8da5cb5605b SHA512 df47430d1acd215cebc6b94154783eb0b96aa15f77dd92aeb9bfb4b87d169af29f641a077087d46b9b2313cdcc81c9adfeade6f8b2cdfd505b236df9bd8a7a9a
 EBUILD dvtm-9999.ebuild 1279 BLAKE2B 3bfb84aa483fc756132d4a51d1662365cb059393c365781c62ff5e4a462f731b6984dbd1a6f8112132c7738e3e13e596d3a141d9641ee5150538ee15efccdcab SHA512 8511e37e945f0fffacfbacb5a6bb0e850a2e72a06365e1fc4f8ca627d80788ce646212f13abc9bc782cec844d599302249f78cccd50c3e9ac74f0169388466f0
 MISC metadata.xml 266 BLAKE2B dcea8fa0295f75ca11474aafd9d1b56cf5c6d01fdb4444a82a0b93e818cf8e692076a1f5dc30a5098779afdff5190e2f877836b3ee87cbc1f8a529c32149ea94 SHA512 4da13e3e2134d06372d9bdc1de80cef972ac5db82e7ee8b3cfe620712610fd863c9037a6b8c84ee7a6c8eb8f0cb52568f040474eddb73a7afa07b5a53f512ac5
diff --git a/app-misc/dvtm/dvtm-0.15-r3.ebuild b/app-misc/dvtm/dvtm-0.15-r3.ebuild
index 1f6287f41cfb..798f8fe14fba 100644
--- a/app-misc/dvtm/dvtm-0.15-r3.ebuild
+++ b/app-misc/dvtm/dvtm-0.15-r3.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="git://repo.or.cz/dvtm.git"
 else
 	SRC_URI="http://www.brain-dump.org/projects/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~x86"
+	KEYWORDS="amd64 ~arm x86"
 fi
 
 LICENSE="MIT"
diff --git a/app-misc/inputlircd/Manifest b/app-misc/inputlircd/Manifest
index 17f510ac043a..d6f642d19abc 100644
--- a/app-misc/inputlircd/Manifest
+++ b/app-misc/inputlircd/Manifest
@@ -4,8 +4,6 @@ AUX inputlircd.init 259 BLAKE2B 19ed54f2a354fc9efd4a6f48944c5546901d8d23c7e2a45d
 AUX inputlircd.init.2 297 BLAKE2B bf8676b94101dcc9e4ed5480ac5a0f0c3654188892d9049af0fd72359b5da4e160c9e34e371d68278264ca810af0dca4174e97c09e30e4602913a78e3bba5915 SHA512 50f50859ed048b561416e7c21cf083ddda3114331ea14abef470fb04c0108f925f47a75be2b4396fd98b7d140d988288852f2c0ce9fce8218ce2a31e90c48626
 DIST inputlircd-0.0.1_pre11.tar.bz2 4370 BLAKE2B 9fd957a2558d1d81cefc6f40dfe0c9a8939be0a2ebb1c04e6d13759fc94a28f0c958947e36c4cacd05e0e1c8b995a6877730381d1ee06a75fdeb5142a55af5f9 SHA512 e09546340843f4df01f22c2e5347bcbae7078c521c7e4d5216d061beb93f7ae660e96d1942e6e931e0f72c930b8383cf6f83c70f1f242587da82edc4a04b6d76
 DIST inputlircd-0.0.1_pre15.tar.gz 5226 BLAKE2B 92339021451b2575de5adbf6123f1083e93bfbd8cdd3233389301032678160bb622cf4b92837470151494ec87bcbde5462c557e5cef9fa601ad6da71607dbb78 SHA512 6f7dd15875eeccac1f666af82dabba243707c9b3c3b2e39070032fb3d4a40c1c0ae6fbca2e7be02ce7061d289d9ad07b9ee38c5f5b0f33d5a6c413df5bfd6365
-EBUILD inputlircd-0.0.1_pre11-r2.ebuild 788 BLAKE2B 186c968570aa829bf7a4a947f7a6210db4edb38357ac59f3e30afacd97acc6b8473cee1c1e191db7391684c0c582a32921d1d4625e6f2aae3cc63f3440cb6db0 SHA512 dbb451f60f1da705f5d87273dafc96e145bad81f45a3789d900385c6c99d016c8efd71082c6ee9eacd96d25a440755d529a915d44f8e6ecf0d0276918ed5db70
 EBUILD inputlircd-0.0.1_pre11.ebuild 586 BLAKE2B abe1411ab4f1e339b4c4ae6737e3c8f644d15c1b704d6dcdad3ebf0b3754b1bdfbd03d2d9b0a2c0e22cd27e08a86b331a8a2b62809b31b7532b0eccdcd5de281 SHA512 62ca7270bbcc7d621d936753ed7f5fa3f6b572de4313b52ea3d8318f06e1ebb316259b78111aae9a8240ade4523a05b11ce6a286d837d7981f53f18d8d2c48bc
-EBUILD inputlircd-0.0.1_pre15-r1.ebuild 787 BLAKE2B eb23152b943475a63ed158407ec48945574adecf125f700287dc90180181731cb47b644e403bddf53e21a14ba895d41fbdbd9154cd9ad4bbb31b16d81fc9b8aa SHA512 0a6ef5f19829c0d63b2c54baefeae293f693e21af88df9d4a10cec4f27ccaf77f915c4d78c3db6a5b4e43c64ac596a07c654f04b3ede78b8c900945a3718a2fd
 EBUILD inputlircd-0.0.1_pre15-r2.ebuild 914 BLAKE2B 98e4f899ee14a9b79906329216dd68a392f964004ba34ffcf57e3f0ca04fd8cb4cbd77cf265c8868430ee2300d8b971ee25aea06dc9b5132e02cd2a9b69608b8 SHA512 055e5c0398eeb24718b70ba50db43a357d6dd52fcda61304a7023eab93f9c14c1246e69cb2fd6ad02bc69bd2b1b0a53e4a8bd9dbbd52e362bc13a7170a165e9f
 MISC metadata.xml 258 BLAKE2B 1878517d827956dbd45c2d86e97fc066cd4293c3cc94d6d4beaff553462c1badb68aa38b3082c01fe6e21ca1519fc482e2670931d007382b8b2c38af715fe02d SHA512 33d52c9b472999f5722ba6a13598524745093ff45394dd1c9f560b051c9d28be465f72db260a148831b1ff8bc175f41d0c1e4b2d038afc0afdd230b039c67c2b
diff --git a/app-misc/inputlircd/inputlircd-0.0.1_pre11-r2.ebuild b/app-misc/inputlircd/inputlircd-0.0.1_pre11-r2.ebuild
deleted file mode 100644
index 924922e09565..000000000000
--- a/app-misc/inputlircd/inputlircd-0.0.1_pre11-r2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit toolchain-funcs
-
-DESCRIPTION="Inputlirc daemon to utilize /dev/input/event*"
-HOMEPAGE="https://github.com/ferdinandhuebner/inputlirc"
-SRC_URI="http://gentooexperimental.org/~genstef/dist/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -e 's:$(CFLAGS):$(CFLAGS) $(LDFLAGS):' -i Makefile || die
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" || die "make failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX=/usr install || die "emake install failed"
-
-	newinitd "${FILESDIR}"/inputlircd.init.2  inputlircd
-	newconfd "${FILESDIR}"/inputlircd.conf  inputlircd
-}
diff --git a/app-misc/inputlircd/inputlircd-0.0.1_pre15-r1.ebuild b/app-misc/inputlircd/inputlircd-0.0.1_pre15-r1.ebuild
deleted file mode 100644
index 379169e2d9c7..000000000000
--- a/app-misc/inputlircd/inputlircd-0.0.1_pre15-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit toolchain-funcs
-
-DESCRIPTION="Inputlirc daemon to utilize /dev/input/event*"
-HOMEPAGE="https://github.com/ferdinandhuebner/inputlirc"
-SRC_URI="http://gentooexperimental.org/~genstef/dist/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -e 's:$(CFLAGS):$(CFLAGS) $(LDFLAGS):' -i Makefile || die
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" || die "make failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX=/usr install || die "emake install failed"
-
-	newinitd "${FILESDIR}"/inputlircd.init.2  inputlircd
-	newconfd "${FILESDIR}"/inputlircd.conf  inputlircd
-}
diff --git a/app-misc/lirc/Manifest b/app-misc/lirc/Manifest
index 0feb389a9de2..36e34b5616ce 100644
--- a/app-misc/lirc/Manifest
+++ b/app-misc/lirc/Manifest
@@ -22,13 +22,15 @@ AUX lircmd-0.9.4a-r2 382 BLAKE2B 14e6f7822d8878a9047fc26cb0927ae61c70092788133a3
 AUX lircmd.conf 65 BLAKE2B e63ba72d49e51a09ebe848a63c8ca3865fe7cab40663e58e0c03ec303c7700f27017d2d127d54555c94bcd4a7e996f2cc992ef26acd96f7e5ec39889ce655d6d SHA512 75cea93359a18f5d3f398795904dac4b49abac8bdaf19e06d17a713a3bfc2e5ee154b1f137c3d731fb659ecc245ad880053378a5b5958a28af3f884f5827e228
 AUX modprobed.lirc 549 BLAKE2B f58dcefff1becd48edaddab0d48e46f361b99de714bc8d3ae0d72f49fc8699fe9b9c7d8818a94eb7b40a5a653bfc8ca61ec11374c49ecebd1ef235d4ed8b8c08 SHA512 a64cac97e21ab53c247d8dd3e518b3caee5eeb9c3558727eba8a04684894c6be1695ce681e71d559474f4e78bbb39130d97f843eae18e56b3d3eb70f1fbefc63
 DIST lirc-0.10.0-rc2.tar.bz2 2552982 BLAKE2B d68639198dd7041865f6b7ac79cb94b63d8a85ee70f97628e27887d14f62814388a51521dabe91730570c382c6bb7edb36c15eba0f8ea9f5d4490dfce2bd121a SHA512 ab3426477f017e3a1b9da690189beae5086bbb52f88d302e6c91d7633f74ef781e6747f6b697b3ed6df13497a3e666f11c846104d2f00b975746d24bfd2a6cd5
+DIST lirc-0.10.0.tar.bz2 2523528 BLAKE2B 5c133b40936060fbaa0a9463b1b07d9197d935388e3eb4e46791b1f844b82ea6b6d42ae0c6ce249ca306688fa5d15718f5a3a54b497fc9f168b8b736b06bdd1e SHA512 06ccc1c8c80bfd17a6d180ae39a17779cbba341086f90a03a2e552bfb71e3abcb13f991312fba0e57df79c1882c1e29a2f273dddcd46a9ff53160b556e1547ab
 DIST lirc-0.9.0.tar.bz2 857286 BLAKE2B 034c7b8492dd42301bb6d40da8c6c95f714b925ee50e7396290231684024dc3fe3bb64987db92d2a4e4d56203436007e68222bbf9a775bb9d29bbefcc4a7c1e4 SHA512 e91534c63e6065bd7da3b15e1676edf1672b8beb21864a6825df86247d7d165bf2dee6f8191732933e24e42a406e46afc55559948e4061eed2de7b08fac13431
 DIST lirc-0.9.4a.tar.bz2 2292119 BLAKE2B 6ca7562716fde3327aa3f8f9913da7d349969f1bcac095bf2e9b1e3025d1e39176e2fb386ca08bcf80d458262f9eb96dab363ef3aa2c1d56b914ac8a36fcbacf SHA512 16be0ac5dd9b07d717ceba63cdc38c0db4a2bdcfc373ca6346d7cd4ab2cd2973aa7585d10b045fcaea952a3aabf7617c564ccb8268db6c62b172683a4b2cc188
 DIST lirc-0.9.4c.tar.bz2 2311300 BLAKE2B f58f3b3a701e0ae787e34ec65c1d29b0faa75958b95aa43663a78dbe04c1c1d5456df5a6c5e41c673db9f589a7c2d41423b5f6a667fac890fb18f29fd797438b SHA512 0a0d0e025b87a55ec919c92824d8288bfaf35cfebae0ee97d86e344109f584baa72a2eff6d24fbc526900671d6092e0eebef8d1566559b0d153e122e3127c0cb
 DIST lirc-0.9.4d.tar.bz2 2489704 BLAKE2B 89cf8989aa84905d292fdf72632b7e5854aa2b225a6a6183839fa3e5fbc6624474e2723d3456cf5c5e6216abd134805fba495e89469808cd5ff139c31f86c032 SHA512 fb3892e12fbe5277e04c451694f1ea4ed45cc424d66ea57b11c4ac4760afa7df4b37897f380b4ade464a82523a0cee336f216d2009ea9431333fd7ca74a8336c
+EBUILD lirc-0.10.0.ebuild 3624 BLAKE2B aebeafeab813fbe385de6fabe82eff81533030446fd94af464e0a83fe3e6218383a68a618f623851542bc7f6259ba10a73f56541ca8fbc48335ad479434e3512 SHA512 167ef954764d3fab43a3a085367bb8b274b6737b4ef3588db17496b5c36682450d1e1233c7439454211b88d85772015d0dab76afd60cd92693abb12c1d9dd2a7
 EBUILD lirc-0.10.0_rc2.ebuild 3624 BLAKE2B 1729fd08c45514c24a7d48ecdac50b17d9a8d52b95ee06c23af5f5a87f89ccb6704b61d0c6344ce4e28396ec754dfb9ed4a33403179b72ff8060053712f1b115 SHA512 bf10dd1f1fe53d0ffed5e2ed0a0439c8f29d6f291b8487dcd5f74a01bec67b06838c4e35816ad475f0b21f113b65696277f63d13567fd711da719718cd322acc
 EBUILD lirc-0.9.0-r6.ebuild 13250 BLAKE2B 81ca3c71e46089a8f3a1b412d53e60096f14c0825f8f4c7daf9fee9387e3eced4dda10c8e5dc4550a9e0eb1347b1db40972a3a2397154dce2a8e1d2ed8b99977 SHA512 0d620d93bccf35721830420a7e367b45c1b6a71891843db12fe4c96b0d1228de6367969545eeb0f0416833f195ed933eafef69d5d38a0a46a1f0ddc32829240b
 EBUILD lirc-0.9.4a-r2.ebuild 3412 BLAKE2B fee771153fbbf941641b86836d860f9bba1ccb00c834a7433fd48d1fbd51c737fbef0308119db2b7ca61e92b7ff615b7c0b4f0bedc5f9e4908b43db18acf9fdb SHA512 a4fbfa1f58525ba5ff464023b717a5c927299dfc2a57586e19d150de7600e76577004e9398f21cc062ee7e83e90c45f1b3bc8ed9f391be2ac3cda940683e1a66
 EBUILD lirc-0.9.4c.ebuild 3620 BLAKE2B 863f48ca71a933f76c7c8d307ef2545f54c5d66c9616a6ea171e46faa346c9644a6c1fb881d451b6c430f7111279ed783fe516068464b5c16f0b0858227c4d0a SHA512 f971cbe128d7516d21890f6a99ac581d059f41d769222a736da0779b2b551ec2267a04930faae27faced05549bcf1d725bc260b49c11ee400a7045a412a7ffd0
-EBUILD lirc-0.9.4d.ebuild 3620 BLAKE2B 863f48ca71a933f76c7c8d307ef2545f54c5d66c9616a6ea171e46faa346c9644a6c1fb881d451b6c430f7111279ed783fe516068464b5c16f0b0858227c4d0a SHA512 f971cbe128d7516d21890f6a99ac581d059f41d769222a736da0779b2b551ec2267a04930faae27faced05549bcf1d725bc260b49c11ee400a7045a412a7ffd0
+EBUILD lirc-0.9.4d.ebuild 3671 BLAKE2B a16deea9b8b715a085d908789d2c252c60b455aff352baf99ac20f7b708713bdac6c3069356072d2b2f996bd99347f4ee1f5552ca670c03a0f9d7e93b3bb5b16 SHA512 466f717db881bd0de70511960c878208efa989995fba7e24a7145c473e8fa81777d191daa2d67789694e2346cd26c7f24f1ff6a3e84300a0cebacd033f7981ef
 MISC metadata.xml 1311 BLAKE2B 4a944ee2bfec572a01ba493924490388f10609ac4c9f6d585e2a7169abbb96e395c181c2ccabe51faa81acb381f259c688bca9a3a217347c4256a29bbf1600cc SHA512 71aad60940c2cdd6e6059b749b6f7e2834dc4146429e78b8b66cc74be32a498f7b019766033baf089f217f95c48dc2576919730645e17d997a37acef058cd73c
diff --git a/app-misc/lirc/lirc-0.10.0.ebuild b/app-misc/lirc/lirc-0.10.0.ebuild
new file mode 100644
index 000000000000..8ddbc22037b4
--- /dev/null
+++ b/app-misc/lirc/lirc-0.10.0.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_4 python3_5 )
+
+inherit eutils flag-o-matic linux-info python-single-r1 systemd xdg-utils
+
+DESCRIPTION="decode and send infra-red signals of many commonly used remote controls"
+HOMEPAGE="http://www.lirc.org/"
+
+LIRC_DRIVER_DEVICE="/dev/lirc0"
+
+MY_P=${PN}-${PV/_/-}
+
+if [[ "${PV/_pre/}" = "${PV}" ]]; then
+	SRC_URI="mirror://sourceforge/lirc/${MY_P}.tar.bz2"
+else
+	SRC_URI="http://www.lirc.org/software/snapshots/${MY_P}.tar.bz2"
+fi
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="audio +devinput doc ftdi gtk inputlirc static-libs systemd +uinput usb X"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	gtk? ( X )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+COMMON_DEPEND="
+	${PYTHON_DEPS}
+	audio? (
+		>media-libs/portaudio-18
+		media-libs/alsa-lib
+	)
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	ftdi? ( dev-embedded/libftdi:0 )
+	systemd? ( sys-apps/systemd )
+	usb? ( virtual/libusb:0 )
+	X? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+	)
+"
+
+DEPEND="
+	${COMMON_DEPEND}
+	dev-libs/libxslt
+	doc? ( app-doc/doxygen )
+	sys-apps/kmod
+	sys-kernel/linux-headers
+"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	gtk? (
+		x11-libs/vte[introspection]
+		dev-python/pygobject[${PYTHON_USEDEP}]
+	)
+	inputlirc? ( app-misc/inputlircd )
+"
+
+pkg_setup() {
+	use uinput && CONFIG_CHECK="INPUT_UINPUT"
+}
+
+src_configure() {
+	xdg_environment_reset
+	econf \
+		--localstatedir="${EPREFIX}/var" \
+		$(use_enable static-libs static) \
+		$(use_enable devinput) \
+		$(use_enable uinput) \
+		$(use_with X x)
+}
+
+src_install() {
+	default
+
+	if use !gtk ; then
+		# lirc-setup requires gtk
+		rm "${ED%/}"/usr/bin/lirc-setup || die
+	fi
+
+	newinitd "${FILESDIR}"/lircd-0.8.6-r2 lircd
+	newinitd "${FILESDIR}"/lircmd-0.9.4a-r2 lircmd
+	newconfd "${FILESDIR}"/lircd.conf.4 lircd
+	newconfd "${FILESDIR}"/lircmd-0.10.0.conf lircmd
+
+	insinto /etc/modprobe.d/
+	newins "${FILESDIR}"/modprobed.lirc lirc.conf
+
+	newinitd "${FILESDIR}"/irexec-initd-0.9.4a-r2 irexec
+	newconfd "${FILESDIR}"/irexec-confd irexec
+
+	keepdir /etc/lirc
+	if [[ -e "${ED%/}"/etc/lirc/lircd.conf ]]; then
+		newdoc "${ED%/}"/etc/lirc/lircd.conf lircd.conf.example
+	fi
+
+	find "${ED}" -name '*.la' -delete || die
+
+	# Avoid QA notice
+	rm -d "${ED%/}"/var/run/lirc || die
+	rm -d "${ED%/}"/var/run || die
+}
+
+pkg_preinst() {
+	local dir="${EROOT%/}/etc/modprobe.d"
+	if [[ -a "${dir}"/lirc && ! -a "${dir}"/lirc.conf ]]; then
+		elog "Renaming ${dir}/lirc to lirc.conf"
+		mv -f "${dir}/lirc" "${dir}/lirc.conf" || die
+	fi
+
+	# copy the first file that can be found
+	if [[ -f "${EROOT%/}"/etc/lirc/lircd.conf ]]; then
+		cp "${EROOT%/}"/etc/lirc/lircd.conf "${T}"/lircd.conf || die
+	elif [[ -f "${EROOT%/}"/etc/lircd.conf ]]; then
+		cp "${EROOT%/}"/etc/lircd.conf "${T}"/lircd.conf || die
+		MOVE_OLD_LIRCD_CONF=1
+	elif [[ -f "${ED%/}"/etc/lirc/lircd.conf ]]; then
+		cp "${ED%/}"/etc/lirc/lircd.conf "${T}"/lircd.conf || die
+	fi
+
+	# stop portage from touching the config file
+	if [[ -e "${ED%/}"/etc/lirc/lircd.conf ]]; then
+		rm -f "${ED%/}"/etc/lirc/lircd.conf || die
+	fi
+}
+
+pkg_postinst() {
+	# copy config file to new location
+	# without portage knowing about it
+	# so it will not delete it on unmerge or ever touch it again
+	if [[ -e "${T}"/lircd.conf ]]; then
+		cp "${T}"/lircd.conf "${EROOT%/}"/etc/lirc/lircd.conf || die
+		if [[ "$MOVE_OLD_LIRCD_CONF" = "1" ]]; then
+			elog "Moved /etc/lircd.conf to /etc/lirc/lircd.conf"
+			rm -f "${EROOT%/}"/etc/lircd.conf || die
+		fi
+	fi
+
+	einfo "The new default location for lircd.conf is inside of"
+	einfo "${EROOT%/}/etc/lirc/ directory"
+}
diff --git a/app-misc/lirc/lirc-0.9.4d.ebuild b/app-misc/lirc/lirc-0.9.4d.ebuild
index 25ec10062e31..57072953cadc 100644
--- a/app-misc/lirc/lirc-0.9.4d.ebuild
+++ b/app-misc/lirc/lirc-0.9.4d.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 PYTHON_COMPAT=( python3_4 python3_5 )
 
-inherit eutils flag-o-matic python-single-r1 systemd xdg-utils
+inherit autotools eutils flag-o-matic python-single-r1 systemd xdg-utils
 
 DESCRIPTION="decode and send infra-red signals of many commonly used remote controls"
 HOMEPAGE="http://www.lirc.org/"
@@ -71,6 +71,11 @@ PATCHES=(
 	"${FILESDIR}"/lirc-0.9.4-doc-path-fix.patch
 )
 
+src_prepare() {
+	default
+	eautoreconf
+}
+
 src_configure() {
 	xdg_environment_reset
 	econf \
diff --git a/app-misc/screenfetch/Manifest b/app-misc/screenfetch/Manifest
index f3094b5c576b..35faf9e102ec 100644
--- a/app-misc/screenfetch/Manifest
+++ b/app-misc/screenfetch/Manifest
@@ -1,6 +1,6 @@
 DIST screenfetch-3.7.0.tar.gz 60223 BLAKE2B 5b28ec609bdc4019b4b4d13cd70ae7b5d8f31ac5ea22383926752f6e1595e1c8764bff8a65fed4a1089e149edc50126f5bd761069840f012d0b678f95ccba9d3 SHA512 9a6e89ef2cd48f12b22230c7aff356ac2ece8dc7437034a51a66f8026e5ca4a630af43511a60b21e9fc9f89af9e2493b8cfa3a06294e74c3d611ae3bb0db922d
 DIST screenfetch-3.8.0.tar.gz 71970 BLAKE2B 783d14bb30f5858f2f2f8ac81c6c8bca2fa4c1e7c9225d9ba13a7ace05c365459e277bea625b680fc3e3fedd0303507a583190d866627cedcb33e042aa8fdca7 SHA512 903f42e3bfcd719c4d6b91d10e5678063e223c2baa58214c7e8dae9ea925852f9e2c07ad90148e02d87ce5f9af7b989e80e93c2f569cd579e6f4f7d5c49c62f2
 EBUILD screenfetch-3.7.0.ebuild 668 BLAKE2B 80e3117130dce1b38173d77546cc0bc5e9c7730afe454da952b46ac461c43e7ef6dd40f6a83c88b9b56c5806733bb204675ca496530fe568743e64bdde85564c SHA512 f6d2a7847252534025bc28e068c7600334841329d8d52b5d9039a032400c2054c8f62a2e409c232233f121bdb481d6700dd08b70df83a5fa339f9dbab6c7538c
-EBUILD screenfetch-3.8.0.ebuild 684 BLAKE2B efc15ee760455a8206885a908e9922977336f93e93ad00779d200778b72e1ebfe72336b5489325cba9e860ea107f7c4cd8283c91066b7b78ed8d56ffb1964d6e SHA512 9a78377a310e57e106a16feab5b9958759612cc11b17e751ed2fab9408140f34bafb0954f00c8f946660f59151a9ceaa0c91503a89f9a8517c41c7b7fbf142fb
-EBUILD screenfetch-9999.ebuild 684 BLAKE2B efc15ee760455a8206885a908e9922977336f93e93ad00779d200778b72e1ebfe72336b5489325cba9e860ea107f7c4cd8283c91066b7b78ed8d56ffb1964d6e SHA512 9a78377a310e57e106a16feab5b9958759612cc11b17e751ed2fab9408140f34bafb0954f00c8f946660f59151a9ceaa0c91503a89f9a8517c41c7b7fbf142fb
+EBUILD screenfetch-3.8.0.ebuild 695 BLAKE2B aba8d3df8fcf9c7de4f83eee0fd1823160d1b7099dd22b20a3dd53b187472fb9bbabf0177a39473776fb2c2dc74056057250042188e43ac907aed246c944ecfe SHA512 bac3af4d7023f27284ec87186021d7e55d274675a719ce1785ba10ae6bbf5d52ddc97152f2c6096e6fca4e785c232016ff579ccb9f1eb44704872b7f694dfc24
+EBUILD screenfetch-9999.ebuild 695 BLAKE2B aba8d3df8fcf9c7de4f83eee0fd1823160d1b7099dd22b20a3dd53b187472fb9bbabf0177a39473776fb2c2dc74056057250042188e43ac907aed246c944ecfe SHA512 bac3af4d7023f27284ec87186021d7e55d274675a719ce1785ba10ae6bbf5d52ddc97152f2c6096e6fca4e785c232016ff579ccb9f1eb44704872b7f694dfc24
 MISC metadata.xml 452 BLAKE2B 29589bb06d4930268b6e8e1a2707a9e24d273b9a3bf88945e0aa643960deba4472877366de982f7d857af7c63a90b72edf10fdbfb5833dd71bb0dea0331db6b0 SHA512 f09da25b50fc92fe253cbd2eb32d158e4628fe4d5a62a028fc0437eb2f6e7d6fab7f568c9e165a8f02477dc11ecdec59d764c9d56a779f97d8805ab218741c1c
diff --git a/app-misc/screenfetch/screenfetch-3.8.0.ebuild b/app-misc/screenfetch/screenfetch-3.8.0.ebuild
index 517954aa4689..0c17327b86ac 100644
--- a/app-misc/screenfetch/screenfetch-3.8.0.ebuild
+++ b/app-misc/screenfetch/screenfetch-3.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -24,7 +24,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/KittyKatt/screenFetch.git"
 	inherit git-r3
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~x86 ~x64-macos"
 	SRC_URI="https://github.com/KittyKatt/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${MY_PN}-${PV}"
 fi
diff --git a/app-misc/screenfetch/screenfetch-9999.ebuild b/app-misc/screenfetch/screenfetch-9999.ebuild
index 517954aa4689..0c17327b86ac 100644
--- a/app-misc/screenfetch/screenfetch-9999.ebuild
+++ b/app-misc/screenfetch/screenfetch-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -24,7 +24,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/KittyKatt/screenFetch.git"
 	inherit git-r3
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~x86 ~x64-macos"
 	SRC_URI="https://github.com/KittyKatt/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${MY_PN}-${PV}"
 fi