Merge updates from master

18 files changed, 55 insertions, 567 deletions

diff --git a/dev-util/scons/files/scons-2.5.1-respect-path.patch b/dev-util/scons/files/scons-2.5.1-respect-path.patch
new file mode 100644
index 000000000000..d5da07bc980b
--- /dev/null
+++ b/dev-util/scons/files/scons-2.5.1-respect-path.patch
@@ -0,0 +1,34 @@
+Clang/LLVM is installed in an "odd" location (/usr/lib/llvm/<ver>/bin/)
+which is added to PATH.  Since we cannot know <ver> upfront, it's wrong
+to hardcode the PATH at the time of installation else we'd break after a
+Clang update.  Since Clang is the primary compiler on Darwin, just
+extract the relevant path on each invocation.
+
+--- a/engine/SCons/Platform/posix.py
++++ b/engine/SCons/Platform/posix.py
+@@ -87,9 +87,15 @@
+     pspawn = piped_env_spawn
+     # Note that this means that 'escape' is no longer used
+ 
++    with open('@GENTOO_PORTAGE_EPREFIX@/etc/profile.env', 'r') as f:
++        for l in f:
++            if "export PATH=" in l:
++                path = l.split('=')[1].strip("'")
++                break
++
+     if 'ENV' not in env:
+         env['ENV']        = {}
+-    env['ENV']['PATH']    = '/usr/local/bin:/opt/bin:/bin:/usr/bin'
++    env['ENV']['PATH']    = path
+     env['OBJPREFIX']      = ''
+     env['OBJSUFFIX']      = '.o'
+     env['SHOBJPREFIX']    = '$OBJPREFIX'
+@@ -104,7 +110,7 @@
+     env['LIBSUFFIXES']    = [ '$LIBSUFFIX', '$SHLIBSUFFIX' ]
+     env['PSPAWN']         = pspawn
+     env['SPAWN']          = spawn
+-    env['SHELL']          = 'sh'
++    env['SHELL']          = '@GENTOO_PORTAGE_EPREFIX@/bin/sh'
+     env['ESCAPE']         = escape
+     env['TEMPFILE']       = TempFileMunge
+     env['TEMPFILEPREFIX'] = '@'
diff --git a/dev-util/scons/scons-2.5.1.ebuild b/dev-util/scons/scons-2.5.1.ebuild
index fda9ae0c18fb..658b0ecb5c88 100644
--- a/dev-util/scons/scons-2.5.1.ebuild
+++ b/dev-util/scons/scons-2.5.1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 PYTHON_COMPAT=( python2_7 pypy )
 PYTHON_REQ_USE="threads(+)"
 
-inherit distutils-r1
+inherit distutils-r1 prefix
 
 DESCRIPTION="Extensible Python-based build utility"
 HOMEPAGE="http://www.scons.org/"
@@ -21,8 +21,11 @@ IUSE="doc"
 #PATCHES=(  )
 
 python_prepare_all() {
-	# https://bugs.gentoo.org/show_bug.cgi?id=361061
-	sed -i -e "s|/usr/local/bin:/opt/bin:/bin:/usr/bin|${EPREFIX}/usr/local/bin:${EPREFIX}/opt/bin:${EPREFIX}/bin:${EPREFIX}/usr/bin:/usr/local/bin:/opt/bin:/bin:/usr/bin|g" engine/SCons/Platform/posix.py || die
+	# bug #361061
+	if use prefix ; then
+		eapply "${FILESDIR}"/scons-2.5.1-respect-path.patch
+		eprefixify engine/SCons/Platform/posix.py
+	fi
 	# and make sure the build system doesn't "force" /usr/local/ :(
 	sed -i -e "s/'darwin'/'NOWAYdarwinWAYNO'/" setup.py || die
 
diff --git a/dev-util/scons/scons-3.0.0.ebuild b/dev-util/scons/scons-3.0.0.ebuild
index 976a1a92deb0..48fee1a5c385 100644
--- a/dev-util/scons/scons-3.0.0.ebuild
+++ b/dev-util/scons/scons-3.0.0.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=( python2_7 python3_5 python3_6 pypy )
 PYTHON_REQ_USE="threads(+)"
 
-inherit distutils-r1
+inherit distutils-r1 prefix
 
 DESCRIPTION="Extensible Python-based build utility"
 HOMEPAGE="http://www.scons.org/"
@@ -21,8 +21,11 @@ IUSE="doc"
 #PATCHES=(  )
 
 python_prepare_all() {
-	# https://bugs.gentoo.org/show_bug.cgi?id=361061
-	sed -i -e "s|/usr/local/bin:/opt/bin:/bin:/usr/bin|${EPREFIX}/usr/local/bin:${EPREFIX}/opt/bin:${EPREFIX}/bin:${EPREFIX}/usr/bin:/usr/local/bin:/opt/bin:/bin:/usr/bin|g" engine/SCons/Platform/posix.py || die
+	# bug #361061
+	if use prefix ; then
+		eapply "${FILESDIR}"/scons-2.5.1-respect-path.patch
+		eprefixify engine/SCons/Platform/posix.py
+	fi
 	# and make sure the build system doesn't "force" /usr/local/ :(
 	sed -i -e "s/'darwin'/'NOWAYdarwinWAYNO'/" setup.py || die
 
diff --git a/media-fonts/mix-mplus-ipa/Manifest b/media-fonts/mix-mplus-ipa/Manifest
index d4ec34fded40..719b0b23fdd2 100644
--- a/media-fonts/mix-mplus-ipa/Manifest
+++ b/media-fonts/mix-mplus-ipa/Manifest
@@ -1,33 +1,8 @@
-DIST MigMix-1M-20110825.zip 4329341 BLAKE2B 2d2c7f7ada0bdbe6ae9308c7ee1b5523b9fefb49eb6ace69730ced1e17226983b5a00c9cc8d27ddc59a4f821ffdadedda5fc2c73662d2e5e20e00a183e708250 SHA512 66293b0fc7151cfbd5df51f028db699f2ce36ed2a81634f20ef0a60db9e954a094959c9faa0f8ae367ea28b1fb2ef7f9963120c0ba48a36e65b9f45b49375f16
-DIST MigMix-1P-20110825.zip 4425294 BLAKE2B 3d8b58e1bac8101df3260af40b0ff7fd9a0e49b0039f6fb857f514cef1f9c3bc927e926755ea12c3125aba91679226466828036c7bd9ce25a9d7f59234fb8ba4 SHA512 0bc28994090590d1d5e91c560272f37dcb5a1d0506f884b7abc270d766410ac92aa4428fd723491a5c4a08f726ed41bf4690e78d55d261e4b60e915cd88a6a59
-DIST MigMix-2M-20110825.zip 4327015 BLAKE2B 97072bc6d7d5a4e12c2e47c1b25e2eeec776885b875b45485a2f7a9636635c3d3a50c58156799941967de00f9beeb85e304fc5846734dccc853cb8fdc1064ba5 SHA512 a630ea18861a4bd4843aee7ed21721509cd772fe55f5abee279f0fa4fbcea6346df0e2fbc7310c7da4415b0496f2491006646fa6b48e27c93c6d35fc1d4a8089
-DIST MigMix-2P-20110825.zip 4424802 BLAKE2B 7920f6048ea1ca9ff6d30a4b529af7ed9722d12754b2084cc674c50896b820c23e6f93a295973cbea0b010961402390198967b692b4abbba562cc7f752c49bb4 SHA512 d871d5050a6e268d583b113272fe6113bf3675e828909a4a9e92f0c418a9f1875b6f89850d0a5556a2788e37e81128331c697a1d58d34b7c8643e514514e142a
-DIST Migu-1C-20110825.zip 4433526 BLAKE2B b573c78b1f293aa7eefcbd4c1e84d449d06de7f41638d99319f48e4d7bfebfb35a037f537d19a64772cd4c0d7b17dc826d02322db419dd1b938d01b4a340157a SHA512 7017b3e17d2a75dc392491998b427185787b1f899a2d62f5ff888f81a1a83fd09dc2503d86e65921afdd145aa2cd4bb370077df9e3f04f7eccf51a8706d3e9af
-DIST Migu-1M-20110825.zip 4337420 BLAKE2B 5a88d2c72b5a8c42ab112030bb88bd8eb93209bf177257f5414ae24d0685cd632fb21eb4b2bd92104d8be8e3de1c071ed578348dc2c1a5c745278ed9940cb24e SHA512 8cdeea237c014ddc4babaabac48ab04a47124b2a28627b0a6e364ee688726fbb052ed706f15838589598a954ae1d1a591b9c8b55699b353c715d3f1c3d01031c
-DIST Migu-1VS-20110825.zip 4835029 BLAKE2B f4f5ae16a11b5bcffbf85ad206c0aff36701dfb26b4966d0ebdb4b93c9a35720650413de01df989a1cd35ea2b966287b83032a6f6203466dafcea97b8ee7a14f SHA512 9112d9ee658b4a1c0905b30cb52c3e04e91aa3a89810644dbcff2292db6df2567d1bf34741b2401cee344e4a42b4cb8f6662481c76f149bb54c5eab2cc3bd631
-DIST Migu-2DS-20110825.zip 4644604 BLAKE2B af4437c7d75a7bf60f93e6846a6af29d4e9ba5fd1e25443639daebfff00b9d1fc63729ca5e3c0ee347b045b0967c6306766cf0d1446566ebfb272054d05fac15 SHA512 c879a5c061f7bfdd1125628feff3e684ca8d28035790ddff2c0d7f4d723a9bc6160b5d1aa4951db0867ed26d8795122131758a88e9a0fffff0ccb6faac16abbf
-DIST Migu-2M-20110825.zip 4335267 BLAKE2B cc2c5f175589a99c662894601414cb039c42cbcaa427ff2ded50e08e093d249d08d7e783586843605c9bfef79e562d65a9b8c279364fcf1fa93b543cee1c961a SHA512 97015d8bda7191bf2fccc362a25fc2aecf93eb0dec99c4a13137ff48e986cfaf1c413e2e116a5dcb634de72ff547e8c440d04a9ec29de03fc28427485ce3e88c
-DIST migmix-1m-20111002.zip 4326677 BLAKE2B bd1847169c78f0c56c1e4bb2a8cd8f83d2e4768148b047c7e71b0306af22023d296f98afd0d9ed7dd4e68dc237533cfc972d56e0006fb626c81bcfd1f7771055 SHA512 d15cdc6192c7bb9b033bd69a79f12fdb1fdf3da022aacbc75f3e41b9958a1f70230bfe33d3bc076f5d34a0455006e1934da9cd4e2472541f013826e55d40c5da
-DIST migmix-1m-20120411-2.zip 4318638 BLAKE2B 089277e8197f4219f453b410359e5882747eecc29f1e54125259fbef8009eee7a83dcd3779d357cfc15c8fe016a00f9edbef0873b6abf5026916895a6cca1560 SHA512 f9cca47bee59c1ffb462b9563200fc0d5bab056ef65aa3000c415cebb04117664b6c44b179507a7c02e7fcd6edc6674ab751c834d609b137dfea347af58a2510
 DIST migmix-1m-20130617.zip 4259978 BLAKE2B 35a16d171862baccf82c33b0efcbc205af56b48d905780ab6f7916159a879674082f590790b17003b15aaea3c788c44166e231a72215538fa8fbcfdb575cf6b3 SHA512 cd1b39d5389a3e90d1732805aba1a79b030c75692009f3a9029f5b09ee00c21793b3c87ebcee8fd3687666c31d0208070b695a720a693f7c2061cfb4d503c054
-DIST migmix-1p-20111002.zip 4428269 BLAKE2B 020ba6c789a9f7a06f811f504550f388ec3faeafa7830f7e5ec777cb891e8959f82474af8baa12d8ef4d754691090ef45af97606ca84248d17d97b7aa5abd039 SHA512 efcb19e29ede4e47d0f0e47b311519f744a8375fd432b26846823c84e6ba1042e8d9709f0d242fb27d5a1b4c19ccc004e91cad18a56d97dce61bfbae4cf99031
-DIST migmix-1p-20120411-2.zip 4419548 BLAKE2B ba492fe1a6f58876b313d65fca38a468b9371a925fe34c5efd216e01f26229964e54b1e9177270002d1de51e7085a1eaa22773eb499e9bbeb00cd2099267ad28 SHA512 3c8e771551ff30ba798ac03079120a3356bcc2401eae6128515ad0a4b1ecf74d648f8c37de206505ed2873b968f6db85d74f29240f3f3aefa54fd440ebe3abae
 DIST migmix-1p-20130617.zip 4363373 BLAKE2B c33e0b9988c5c0f5e570b4d6e60bc2357a84a0cf8df6a603b68bff821cf89b6c6124f9eb34aa6dc9213a654313ec9685ee903696d41faf8afbd3832cbddb5ff0 SHA512 e71c2dce30e163252353c59d8e120d3d3f4c1885d84ba025446850596c071d263f44b9dd70973df2dc8d10a113180065e106f070a9e711928ea093174b7f6ec0
-DIST migmix-2m-20111002.zip 4324338 BLAKE2B 3d56702bb37284a67ac633f38833d7e9b48abbf84b195798850c35983a3ffecd518ce2160d563cb434a9ec6e15f96ed2f13893206b2b3c854c63d8aa3196aede SHA512 7a8714f0f6dc039183fd17c87255570b0d0254484259ef882582625828d61c8dc3494ca1e1a44aa28b97a5114de8163f74343686f3b717a953a54677cd60f84c
-DIST migmix-2m-20120411-2.zip 4316236 BLAKE2B 88a277e25fc8733994bd2eae4b2fc3d15a238b6749909922184d081b73a41facfe5cbfa36c48973dad29532533e7c02df986c518730ad61b8ab530ee22541841 SHA512 78d5a1fbee282f4410abb1e78fb1cd9509453c46d37456a0f427d215eb16e6c554b6d9156fedd1e3405446c813dc4cab3c9b65bc77f9691c240fa0cd713ffe6e
 DIST migmix-2m-20130617.zip 4258188 BLAKE2B ee313bffc639d6952b936cb98dad74f6f53f30a812b32693a203f2add6d0dafa634e75d6e5c6d842645896649bd832fa1f12700960f060f5b75ad04c561b4477 SHA512 e5a83f25287bcd6fcefa1de3c42631eb5bff347b7471f55f7489d4e60dbfc3378344de2f2034b8b5e8bc2aa439e02bf90f03728d8ad59458ee2d93e9468eca2f
-DIST migmix-2p-20111002.zip 4427314 BLAKE2B 11c7c4887bf92eda8d524f45d5707cef2041ebbcca2e7127f35ce38c32e5ea6e15339cb9fa7be59d8ffe61014650f3a5efbbb344b4f3f80a147b878315123efd SHA512 69c9d78f528f418919386136149a5c3580983ffdf201ad62a83afcfc1534987af48a46b66cddd463887cfb0a490e5518fa2d3202da7c0091411e9d264c24e08e
-DIST migmix-2p-20120411-2.zip 4419141 BLAKE2B a2ba3a2957f5df45fd495178f29aa73df51f080ad99e3996d5e63721e0933270fe58a3b98395ee42ce89f397a74bcf212d5f6c8db410fb25d5a94c6a88c5e2e9 SHA512 46224a5a8750208872ac8514c07b42c56a93a24ffb8b05920ce14d11be1c57825b99fdf9e0d24fb8e981b1df6ed812afc9b0f0963a6c53b91719fef55e26105d
 DIST migmix-2p-20130617.zip 4363986 BLAKE2B a5fb93354ceab48041770a10a9d251bfe1f03a7a577772ebddbe94f47a1093ac1c047765dd4fd517ea83ae696f6542a5b0ed07034b545ce5a8cf35a0170e1bd4 SHA512 aea1fa7193271c5de931ecf384237df6a3f175e07d89d1cd2b8d877e7ab408a32de383022a23c5c24777190afc417b7a835a65cec574d7b26cbfd4aebfa6ee54
-DIST migu-1c-20111002.zip 4436245 BLAKE2B 7e92dde7a1ae927f32d391a9c91b1aa54ca625e5b7e1d37397980642bf4088bf3ca41c83a02a3051749bb9886c6eed012ceaf1cba05c56e03d8a792c14056c21 SHA512 57a105c79c9195442db482fe5cb56dcd586ddfcc0eb66b35e76ea9994183ad386246ffadbbb341f19295d8d3378b45d10c2d82a96ea33e2bee3b9180e39f510b
-DIST migu-1c-20120411-2.zip 4428093 BLAKE2B 5c7ab2350e23668cfff3b3e3d230ff64ca8fa8c31c932cdaa348497c8fb8ff8f2f2722e347dc9a59684439c85376c5ad9c98b7ccf32531fac3f97768db0d93fa SHA512 ba02bbca934344361b03a339df73bb50a1ca1a41f7bb7bdc903f9cb2df9744ed97f560b42b3ba7089ffda0a61dc7a4db221903aa1af7359d3714d9f3619dd403
 DIST migu-1c-20130617.zip 4373842 BLAKE2B 00fd09bcfa67796d1d81b4724a247787c8852a6b00e87c99147d608e28ecdbf756b19cf068a99fed4abfa0ecb1c6083bac0486155593b8f861a77a5a724ddaeb SHA512 4b28445fe2990c69bc4dc01d97403cd5c75ad2bb8d7f2742cf3766a0b0a4cb035dc46f467c226349697e82975d9ca31c54c4df9d091c14c8eb4b2d6401b6fe78
-DIST migu-1m-20111002.zip 4334677 BLAKE2B a67511744c6510b65ffb34e2940dd77777144276104ab26921cd105c42032244f2ec24f059ffdb02415ec7d91ac9285467286c09cce7bd61193a933768a575d6 SHA512 b92352fb19b993aa093f7fb9de890ad10e85c61009c436baea83009b878778f160e42db5a447adf5f3f95e3c7852a9a700106ec712a61a3c7187dc9e811157c3
-DIST migu-1m-20120411-2.zip 4326597 BLAKE2B 74695cbb430fdad9e8b007929b655311febec2d09cc4ac84635e7b6fccfd3b5df10df690bdaa017dbead544c3a647fe2086940c09f18d431909142dd5ebf1bda SHA512 4dd30516848ba480aea904a62787ef6aa4c2fce7ef33fb6248100fe7a7597f325c52f7d9d0bab4eb7cc7188e8db333ed2ee35cfd3d9fdad2b4a61f6129b062c0
 DIST migu-1m-20130617.zip 4268071 BLAKE2B a5607fb7ef1d029bbb1f8a9b4149b75ea75a788e526aa82e876adaaa0e3e395f387a0a3c7b223163183685812da38914fce7c39b301eaa32e53aec38d204fdfc SHA512 6a0b33cdcadb57e856606c372740f1243b95c0dbd19b00873b9efa84056176ae7c3477258e90e6ef399b3f67e51a3a269792c30c7920d56d29ff3c5a3af2f8c4
-DIST migu-1p-20111002.zip 4428331 BLAKE2B d6ece5df94f3a0d2d9d91eff959c7c38126f4b1b79c611a3bdd1089235fb9bf4b1286c9ef34569b681a566634f455876a7d6d0faac62a5151a0c392dfbd1c4db SHA512 da3f30968fd120eba439d709d4025e98f29f7e8806cc021047618ad089076540f15f8511bdc37c859963224df986fd6f5a7b1240964f019ba4e536629026d27d
-DIST migu-1p-20120411-2.zip 4419857 BLAKE2B 807de7cf68f4f3c3d96e4a192522425d3cfd81a091767c36d2e8ed220d6392db460b9aba6b89b56274e8bdecdea29e4af7f4c28a7c2082e167339557d6301953 SHA512 0f7ecee522b56401a8358e9f21aac055deac8ecc8d52b966a5227e2e6824dab1642f850d53a41fd25a1a189d68ec38b73270eda33b3c75eca54d4c1b17188e6a
 DIST migu-1p-20130617.zip 4365146 BLAKE2B f083c90b90814c91f2619549ddc61e4f256eb4b646d4d3552414bffc40a01058759d6b35ee35cdcf3471de51e5209e6ac0004e7b2006522abeb433ed3d8f65d9 SHA512 d7e04680d7bfc463d2bd757950deea91843b4c0ca40a190ef75c46cdb5dbf52e8953be9a373e1b253d94dfe3dba8a4f3b76c928e107e3f666009af4a408fb6d2
-DIST migu-2m-20111002.zip 4332395 BLAKE2B 1f5ff996b5069f12d800246619f37cfec7fd420b4cc0d505831849fbcf46a19891cfc640e7b2565e76637358fd9aec408a9c0bec8c27c84f0660f506e6ebe01e SHA512 2b2e3f172308eafc6e6186b8ff66092b7cbfb81ca604f7d367d5d2bb6a7f6af7e5555e977a2b491f267ded571cd7c07702136a1d7bba1bf9cbf7f25ede805e79
-DIST migu-2m-20120411-2.zip 4324280 BLAKE2B 25b355dc8033a86c7cd9f1167e1eee5d37a934c76482ea3cf03d257637e5574742c4eeb440bdf902b5008c63b37393d46d492b8a2e65a8ce7042b75d80e3b952 SHA512 6a95a24053ad48d786997f02f82327e478a19de8a3ecc763f753ca85b630d1f6dd636b63bfdd2e4ca8a1f9c57fdd95f4bbde3c3a01a44bebe92e3950d1e8aabe
 DIST migu-2m-20130617.zip 4266805 BLAKE2B f71bd9785e1d4960f07242e8728c7dc2e52b189bb7d827e51fd30377ec94d196885b533319e07db6be3028ec5910c436712cd2a730f7d79805a9279826632d85 SHA512 926660fc18b113d0794c9a7bfccf1ebe5f08805de5d2d5bb4fbbbf9a17e86a748e09d75a693bbc8f5a4d5bbba7ac9b205ee47ab507069a22428740b89d855e83
diff --git a/media-fonts/mix-mplus-ipa/mix-mplus-ipa-20110825.ebuild b/media-fonts/mix-mplus-ipa/mix-mplus-ipa-20110825.ebuild
deleted file mode 100644
index 2b2a14903e36..000000000000
--- a/media-fonts/mix-mplus-ipa/mix-mplus-ipa-20110825.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-inherit font
-
-DESCRIPTION="Mixing mplus and IPA fonts"
-HOMEPAGE="http://mix-mplus-ipa.sourceforge.jp/"
-SRC_URI="mirror://sourceforge.jp/mix-mplus-ipa/53033/MigMix-1M-${PV}.zip
-	mirror://sourceforge.jp/mix-mplus-ipa/53033/MigMix-1P-${PV}.zip
-	mirror://sourceforge.jp/mix-mplus-ipa/53033/MigMix-2M-${PV}.zip
-	mirror://sourceforge.jp/mix-mplus-ipa/53033/MigMix-2P-${PV}.zip
-	mirror://sourceforge.jp/mix-mplus-ipa/53034/Migu-1C-${PV}.zip
-	mirror://sourceforge.jp/mix-mplus-ipa/53034/Migu-1M-${PV}.zip
-	mirror://sourceforge.jp/mix-mplus-ipa/53034/Migu-1VS-${PV}.zip
-	mirror://sourceforge.jp/mix-mplus-ipa/53034/Migu-2DS-${PV}.zip
-	mirror://sourceforge.jp/mix-mplus-ipa/53034/Migu-2M-${PV}.zip"
-
-LICENSE="mplus-fonts IPAfont"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE=""
-
-S="${WORKDIR}"
-
-FONT_SUFFIX="ttf"
-FONT_S="${S}"
-
-src_prepare() {
-	mv */*.${FONT_SUFFIX} "${FONT_S}" || die
-}
diff --git a/media-fonts/mix-mplus-ipa/mix-mplus-ipa-20111002.ebuild b/media-fonts/mix-mplus-ipa/mix-mplus-ipa-20111002.ebuild
deleted file mode 100644
index 91c6e1eef9f3..000000000000
--- a/media-fonts/mix-mplus-ipa/mix-mplus-ipa-20111002.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-inherit font
-
-DESCRIPTION="Mixing mplus and IPA fonts"
-HOMEPAGE="http://mix-mplus-ipa.sourceforge.jp/"
-SRC_URI="mirror://sourceforge.jp/mix-mplus-ipa/53388/migmix-1m-${PV}.zip
-	mirror://sourceforge.jp/mix-mplus-ipa/53388/migmix-1p-${PV}.zip
-	mirror://sourceforge.jp/mix-mplus-ipa/53388/migmix-2m-${PV}.zip
-	mirror://sourceforge.jp/mix-mplus-ipa/53388/migmix-2p-${PV}.zip
-	mirror://sourceforge.jp/mix-mplus-ipa/53389/migu-1p-${PV}.zip
-	mirror://sourceforge.jp/mix-mplus-ipa/53389/migu-1c-${PV}.zip
-	mirror://sourceforge.jp/mix-mplus-ipa/53389/migu-1m-${PV}.zip
-	mirror://sourceforge.jp/mix-mplus-ipa/53389/migu-2m-${PV}.zip"
-#	mirror://sourceforge.jp/mix-mplus-ipa/53389/migu-1vs-${PV}.zip
-#	mirror://sourceforge.jp/mix-mplus-ipa/53389/migu-2ds-${PV}.zip
-
-LICENSE="mplus-fonts IPAfont"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE=""
-
-S="${WORKDIR}"
-
-FONT_SUFFIX="ttf"
-FONT_S="${S}"
-
-DEPEND="app-arch/unzip"
-RDEPEND=""
-
-src_prepare() {
-	mv */*.${FONT_SUFFIX} "${FONT_S}" || die
-}
diff --git a/media-fonts/mix-mplus-ipa/mix-mplus-ipa-20120411_p2.ebuild b/media-fonts/mix-mplus-ipa/mix-mplus-ipa-20120411_p2.ebuild
deleted file mode 100644
index efcfc181aedf..000000000000
--- a/media-fonts/mix-mplus-ipa/mix-mplus-ipa-20120411_p2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-inherit font
-
-MY_PV="${PV/_p/-}"
-
-DESCRIPTION="Mixing mplus and IPA fonts"
-HOMEPAGE="http://mix-mplus-ipa.sourceforge.jp/"
-SRC_URI="mirror://sourceforge.jp/mix-mplus-ipa/56155/migmix-1m-${MY_PV}.zip
-	mirror://sourceforge.jp/mix-mplus-ipa/56155/migmix-1p-${MY_PV}.zip
-	mirror://sourceforge.jp/mix-mplus-ipa/56155/migmix-2m-${MY_PV}.zip
-	mirror://sourceforge.jp/mix-mplus-ipa/56155/migmix-2p-${MY_PV}.zip
-	mirror://sourceforge.jp/mix-mplus-ipa/56156/migu-1p-${MY_PV}.zip
-	mirror://sourceforge.jp/mix-mplus-ipa/56156/migu-1c-${MY_PV}.zip
-	mirror://sourceforge.jp/mix-mplus-ipa/56156/migu-1m-${MY_PV}.zip
-	mirror://sourceforge.jp/mix-mplus-ipa/56156/migu-2m-${MY_PV}.zip"
-
-LICENSE="mplus-fonts IPAfont"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE=""
-
-S="${WORKDIR}"
-
-FONT_SUFFIX="ttf"
-FONT_S="${S}"
-
-DEPEND="app-arch/unzip"
-RDEPEND=""
-
-src_prepare() {
-	mv */*.${FONT_SUFFIX} "${FONT_S}" || die
-}
diff --git a/media-fonts/mix-mplus-ipa/mix-mplus-ipa-20130617.ebuild b/media-fonts/mix-mplus-ipa/mix-mplus-ipa-20130617-r1.ebuild
index fe4cb6209122..a9b375acb29c 100644
--- a/media-fonts/mix-mplus-ipa/mix-mplus-ipa-20130617.ebuild
+++ b/media-fonts/mix-mplus-ipa/mix-mplus-ipa-20130617-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=6
 inherit font
 
 MY_PV="${PV/_p/-}"
@@ -31,5 +31,6 @@ DEPEND="app-arch/unzip"
 RDEPEND=""
 
 src_prepare() {
+	default
 	mv */*.${FONT_SUFFIX} "${FONT_S}" || die
 }
diff --git a/net-p2p/xmr-stak/Manifest b/net-p2p/xmr-stak/Manifest
index edd785e12777..86e0727ff71e 100644
--- a/net-p2p/xmr-stak/Manifest
+++ b/net-p2p/xmr-stak/Manifest
@@ -1,5 +1 @@
-DIST xmr-stak-2.2.0.tar.gz 316309 BLAKE2B 8a5042e91eff1d7a49dcf50d67430f21459509443117150f59f861edb0c145e0f336cb617ea4f2a7edfd923493efbc8f5ce9cd134a7f7af14b270c8cfdd3cc24 SHA512 1ec30b1f97043307461816e61cb7afaf9e77cfad895b13f5facf98f34da8d9b8751d9885930b0a38777017978fb4f25bb3a69a1c2a5db47b1a851bc88cd7d78d
-DIST xmr-stak-2.3.0.tar.gz 333364 BLAKE2B f8824f545ea08267eb9f670f2aaba7cb2e98693e5603dee5fbe54bb3f3ebc21509f26bb0d10239b79675e3ce32a2f4b32b591fb3af51b4c716fbb84beeb7326e SHA512 2828789ac63ab3cb13e36c6f86d9cf82f21f15f51df873a8a3e42757d16357653823d28103f2a076afa67ce7ca277ec92c5aee25fc823806e85c3a8c80b4ae5d
-DIST xmr-stak-2.4.1.tar.gz 333961 BLAKE2B 0c58a705d601b6ff47329fad175580edf6a1d36704fa7d8f9d7464da65b8a69173c39caaaf9dccb031a514a8bcc29642ae531ae4f03c5d1c83f1c0e0177fd1aa SHA512 83f2fad93367cf3bdcc7c127bdf5df2b0467c85049fefe25a3394e8a6d4ae3a2fdabde949106f29204d48e46fc367bbc9d1fed295ce4fb376d8c23007251f926
-DIST xmr-stak-2.4.2.tar.gz 334041 BLAKE2B 7d37ffd2e3d5f8a25692fe2ebdc8a75242fb02e614c3fa570722739cf279376882d4b84f6877ade4b62072d65a4fe7f726951c3cfa06d537986cd9a63386d391 SHA512 de1b9f8c3b839227a6a9ae08009c4bb50aa9714cd563721f2244b7a87af5ffe8a6691c29c247bba02223c8b8a8b8db25d14d104b97fdf908f0f2ad9a38f27653
 DIST xmr-stak-2.4.3.tar.gz 335672 BLAKE2B 570fbb86144ba1a283c9a1733476e90caf24dcf0048733007ec189342a0e375f65cca74afb88ca7b08370a7db9a9a7d146f0c9a4a2cd57c480ec5b26928e98fa SHA512 a1e38c25827af8f88c1fdeed0fb3e731e92ac632d846f63dfe6fcb634eec0496e1d64b2745e6dc040dabc55a90963f587442e912c5aa72c9208cebffcc06db7c
diff --git a/net-p2p/xmr-stak/files/xmr-stak-2.4.2-fix-paths.patch b/net-p2p/xmr-stak/files/xmr-stak-2.4.2-fix-paths.patch
deleted file mode 100644
index cd71554b3770..000000000000
--- a/net-p2p/xmr-stak/files/xmr-stak-2.4.2-fix-paths.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 3bbf91be9f510ef999c62ae2d42a094d271299b7 Mon Sep 17 00:00:00 2001
-From: Craig Andrews <candrews@integralblue.com>
-Date: Fri, 6 Apr 2018 14:56:44 -0400
-Subject: [PATCH 1/2] Use EXECUTABLE_OUTPUT_PATH and LIBRARY_OUTPUT_PATH
-
-Use EXECUTABLE_OUTPUT_PATH and LIBRARY_OUTPUT_PATH to control the path to which the executable and libraries are installed.
----
- CMakeLists.txt | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 15a2684c..66c2f6f8 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -535,23 +535,23 @@ target_link_libraries(xmr-stak ${LIBS} xmr-stak-c xmr-stak-backend)
- # do not install the binary if the project and install are equal
- if( NOT CMAKE_INSTALL_PREFIX STREQUAL PROJECT_BINARY_DIR )
-     install(TARGETS xmr-stak
--            RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin")
-+            RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/${EXECUTABLE_OUTPUT_PATH}")
-     if(CUDA_FOUND)
-         if(WIN32)
-             install(TARGETS xmrstak_cuda_backend
--                RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin")
-+                RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/${LIBRARY_OUTPUT_PATH}")
-         else()
-             install(TARGETS xmrstak_cuda_backend
--                LIBRARY DESTINATION "${CMAKE_INSTALL_PREFIX}/bin")
-+                LIBRARY DESTINATION "${CMAKE_INSTALL_PREFIX}/${LIBRARY_OUTPUT_PATH}")
-         endif()
-     endif()
-     if(OpenCL_FOUND)
-         if(WIN32)
-             install(TARGETS xmrstak_opencl_backend
--                RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin")
-+                RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/${LIBRARY_OUTPUT_PATH}")
-         else()
-             install(TARGETS xmrstak_opencl_backend
--                LIBRARY DESTINATION "${CMAKE_INSTALL_PREFIX}/bin")
-+                LIBRARY DESTINATION "${CMAKE_INSTALL_PREFIX}/${LIBRARY_OUTPUT_PATH}")
-         endif()
-     endif()
- else()
-
-From c1d907ee03795fdce80daba6395e2a7eb1333930 Mon Sep 17 00:00:00 2001
-From: Craig Andrews <candrews@integralblue.com>
-Date: Fri, 6 Apr 2018 15:11:07 -0400
-Subject: [PATCH 2/2] Allow EXECUTABLE and LIBRARY paths to be set
-
----
- CMakeLists.txt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 66c2f6f8..1ff7fbb4 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -522,8 +522,8 @@ else()
-     add_executable(xmr-stak ${SRCFILES_CPP})
- endif()
- 
--set(EXECUTABLE_OUTPUT_PATH "bin")
--set(LIBRARY_OUTPUT_PATH "bin")
-+set(EXECUTABLE_OUTPUT_PATH "bin" CACHE STRING "Path to place executables")
-+set(LIBRARY_OUTPUT_PATH "bin" CACHE STRING "Path to place libraries")
- 
- target_link_libraries(xmr-stak ${LIBS} xmr-stak-c xmr-stak-backend)
- 
diff --git a/net-p2p/xmr-stak/files/xmr-stak.service b/net-p2p/xmr-stak/files/xmr-stak.service
deleted file mode 100644
index 00f63c0dcd96..000000000000
--- a/net-p2p/xmr-stak/files/xmr-stak.service
+++ /dev/null
@@ -1,32 +0,0 @@
-[Unit]
-Description=Unified all-in-one Monero miner
-After=network-online.target
-AssertFileNotEmpty=/etc/xmr-stak/main.config
-
-[Service]
-Environment=GPU_FORCE_64BIT_PTR=1
-Environment=GPU_MAX_HEAP_SIZE=100
-Environment=GPU_USE_SYNC_OBJECTS=1
-Environment=GPU_MAX_ALLOC_PERCENT=100
-Environment=GPU_SINGLE_ALLOC_PERCENT=100
-ExecStart=/usr/bin/xmr-stak --cpu /etc/xmr-stak/cpu.config --amd /etc/xmr-stak/amd.config --nvidia /etc/xmr-stak/nvidia.config -c /etc/xmr-stak/main.config
-DynamicUser=true
-Group=video
-CPUSchedulingPolicy=idle
-PrivateTmp=true
-ProtectHome=true
-ProtectSystem=strict
-NoNewPrivileges=true
-CapabilityBoundingSet=
-MemoryDenyWriteExecute=true
-ProtectKernelModules=true
-ProtectKernelTunables=true
-ProtectControlGroups=true
-RestrictRealtime=true
-RestrictAddressFamilies=AF_INET AF_INET6 AF_UNIX
-RestrictNamespaces=true
-PrivateUsers=true
-ConfigurationDirectory=xmr-stak
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-p2p/xmr-stak/xmr-stak-2.2.0.ebuild b/net-p2p/xmr-stak/xmr-stak-2.2.0.ebuild
deleted file mode 100644
index a135ea9bfcd9..000000000000
--- a/net-p2p/xmr-stak/xmr-stak-2.2.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils systemd
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/fireice-uk/xmr-stak.git"
-	inherit git-r3
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/fireice-uk/xmr-stak/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Unified all-in-one Monero miner"
-HOMEPAGE="https://github.com/fireice-uk/xmr-stak"
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="cuda devfee hwloc opencl ssl webserver"
-
-DEPEND="cuda? ( dev-util/nvidia-cuda-toolkit )
-	hwloc? ( sys-apps/hwloc )
-	opencl? ( virtual/opencl )
-	ssl? ( dev-libs/openssl:0= )
-	webserver? ( net-libs/libmicrohttpd )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	cmake-utils_src_prepare
-	if ! use devfee; then
-		sed -i -e 's!fDevDonationLevel = .*;!fDevDonationLevel = 0.0;!' xmrstak/donate-level.hpp || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCUDA_ENABLE=$(usex cuda)
-		-DHWLOC_ENABLE=$(usex hwloc)
-		-DMICROHTTPD_ENABLE=$(usex webserver)
-		-DOpenCL_ENABLE=$(usex opencl)
-		-DOpenSSL_ENABLE=$(usex ssl)
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	dodir /etc/xmr-stak
-}
-
-pkg_postinst() {
-	if [ ! -e "${ROOT}etc/xmr-stak/main.config" ]; then
-		ewarn "To use xmr-stack:"
-		if use cuda || use opencl; then
-			ewarn "As root or as a user that is a member of the 'video' group,"
-		fi
-		ewarn "run:"
-		ewarn "/usr/bin/xmr-stak --cpu /etc/xmr-stak/cpu.config --amd /etc/xmr-stak/amd.config --nvidia /etc/xmr-stak/nvidia.config -c /etc/xmr-stak/main.config"
-		ewarn "If the systemd will be used, xmr-stak can now be terminated and 'systemctl start xmr-stak' can be used."
-	fi
-}
diff --git a/net-p2p/xmr-stak/xmr-stak-2.3.0.ebuild b/net-p2p/xmr-stak/xmr-stak-2.3.0.ebuild
deleted file mode 100644
index 4be0f9f7cace..000000000000
--- a/net-p2p/xmr-stak/xmr-stak-2.3.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils systemd
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/fireice-uk/xmr-stak.git"
-	EGIT_BRANCH="dev"
-	inherit git-r3
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/fireice-uk/xmr-stak/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Unified all-in-one Monero miner"
-HOMEPAGE="https://github.com/fireice-uk/xmr-stak"
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="cuda devfee hwloc opencl ssl webserver"
-
-DEPEND="cuda? ( dev-util/nvidia-cuda-toolkit )
-	hwloc? ( sys-apps/hwloc )
-	opencl? ( virtual/opencl )
-	ssl? ( dev-libs/openssl:0= )
-	webserver? ( net-libs/libmicrohttpd )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	cmake-utils_src_prepare
-	if ! use devfee; then
-		sed -i -e 's!fDevDonationLevel = .*;!fDevDonationLevel = 0.0;!' xmrstak/donate-level.hpp || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCUDA_ENABLE=$(usex cuda)
-		-DHWLOC_ENABLE=$(usex hwloc)
-		-DMICROHTTPD_ENABLE=$(usex webserver)
-		-DOpenCL_ENABLE=$(usex opencl)
-		-DOpenSSL_ENABLE=$(usex ssl)
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	systemd_newunit "${FILESDIR}"/${PN}-2.3.0.service ${PN}.service
-	dodir /etc/xmr-stak
-}
-
-pkg_postinst() {
-	if [ ! -e "${ROOT}etc/xmr-stak/main.config" ]; then
-		ewarn "To use xmr-stack:"
-		if use cuda || use opencl; then
-			ewarn "As root or as a user that is a member of the 'video' group,"
-		fi
-		ewarn "run:"
-		ewarn "/usr/bin/xmr-stak --cpu /etc/xmr-stak/cpu.config --amd /etc/xmr-stak/amd.config --nvidia /etc/xmr-stak/nvidia.config -c /etc/xmr-stak/main.config"
-		ewarn "If the systemd will be used, xmr-stak can now be terminated and 'systemctl start xmr-stak' can be used."
-	fi
-}
diff --git a/net-p2p/xmr-stak/xmr-stak-2.4.2-r1.ebuild b/net-p2p/xmr-stak/xmr-stak-2.4.2-r1.ebuild
deleted file mode 100644
index 046820ffa943..000000000000
--- a/net-p2p/xmr-stak/xmr-stak-2.4.2-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils systemd
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/fireice-uk/xmr-stak.git"
-	EGIT_BRANCH="dev"
-	inherit git-r3
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/fireice-uk/xmr-stak/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Unified all-in-one Monero miner"
-HOMEPAGE="https://github.com/fireice-uk/xmr-stak"
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="cuda devfee hwloc opencl ssl webserver"
-
-DEPEND="cuda? ( dev-util/nvidia-cuda-toolkit )
-	hwloc? ( sys-apps/hwloc )
-	opencl? ( virtual/opencl )
-	ssl? ( dev-libs/openssl:0= )
-	webserver? ( net-libs/libmicrohttpd )"
-RDEPEND="${DEPEND}"
-PATCHES=(
-	"${FILESDIR}/${PN}-2.4.2-fix-paths.patch"
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-	if ! use devfee; then
-		sed -i -e 's!fDevDonationLevel = .*;!fDevDonationLevel = 0.0;!' xmrstak/donate-level.hpp || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCUDA_ENABLE=$(usex cuda)
-		-DHWLOC_ENABLE=$(usex hwloc)
-		-DMICROHTTPD_ENABLE=$(usex webserver)
-		-DOpenCL_ENABLE=$(usex opencl)
-		-DOpenSSL_ENABLE=$(usex ssl)
-		-DLIBRARY_OUTPUT_PATH=$(get_libdir)
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	systemd_newunit "${FILESDIR}"/${PN}-2.3.0.service ${PN}.service
-	dodir /etc/xmr-stak
-}
-
-pkg_postinst() {
-	if [ ! -e "${ROOT}etc/xmr-stak/main.config" ]; then
-		ewarn "To use xmr-stack:"
-		if use cuda || use opencl; then
-			ewarn "As root or as a user that is a member of the 'video' group,"
-		fi
-		ewarn "run:"
-		ewarn "/usr/bin/xmr-stak --cpu /etc/xmr-stak/cpu.config --amd /etc/xmr-stak/amd.config --nvidia /etc/xmr-stak/nvidia.config -c /etc/xmr-stak/main.config"
-		ewarn "If the systemd will be used, xmr-stak can now be terminated and 'systemctl start xmr-stak' can be used."
-	fi
-}
diff --git a/net-p2p/xmr-stak/xmr-stak-2.4.2.ebuild b/net-p2p/xmr-stak/xmr-stak-2.4.2.ebuild
deleted file mode 100644
index 4be0f9f7cace..000000000000
--- a/net-p2p/xmr-stak/xmr-stak-2.4.2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils systemd
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/fireice-uk/xmr-stak.git"
-	EGIT_BRANCH="dev"
-	inherit git-r3
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/fireice-uk/xmr-stak/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Unified all-in-one Monero miner"
-HOMEPAGE="https://github.com/fireice-uk/xmr-stak"
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="cuda devfee hwloc opencl ssl webserver"
-
-DEPEND="cuda? ( dev-util/nvidia-cuda-toolkit )
-	hwloc? ( sys-apps/hwloc )
-	opencl? ( virtual/opencl )
-	ssl? ( dev-libs/openssl:0= )
-	webserver? ( net-libs/libmicrohttpd )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	cmake-utils_src_prepare
-	if ! use devfee; then
-		sed -i -e 's!fDevDonationLevel = .*;!fDevDonationLevel = 0.0;!' xmrstak/donate-level.hpp || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCUDA_ENABLE=$(usex cuda)
-		-DHWLOC_ENABLE=$(usex hwloc)
-		-DMICROHTTPD_ENABLE=$(usex webserver)
-		-DOpenCL_ENABLE=$(usex opencl)
-		-DOpenSSL_ENABLE=$(usex ssl)
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	systemd_newunit "${FILESDIR}"/${PN}-2.3.0.service ${PN}.service
-	dodir /etc/xmr-stak
-}
-
-pkg_postinst() {
-	if [ ! -e "${ROOT}etc/xmr-stak/main.config" ]; then
-		ewarn "To use xmr-stack:"
-		if use cuda || use opencl; then
-			ewarn "As root or as a user that is a member of the 'video' group,"
-		fi
-		ewarn "run:"
-		ewarn "/usr/bin/xmr-stak --cpu /etc/xmr-stak/cpu.config --amd /etc/xmr-stak/amd.config --nvidia /etc/xmr-stak/nvidia.config -c /etc/xmr-stak/main.config"
-		ewarn "If the systemd will be used, xmr-stak can now be terminated and 'systemctl start xmr-stak' can be used."
-	fi
-}
diff --git a/net-p2p/xmr-stak/xmr-stak-2.4.1.ebuild b/net-p2p/xmr-stak/xmr-stak-2.4.3-r1.ebuild
index 4be0f9f7cace..0b8976d77f85 100644
--- a/net-p2p/xmr-stak/xmr-stak-2.4.1.ebuild
+++ b/net-p2p/xmr-stak/xmr-stak-2.4.3-r1.ebuild
@@ -42,6 +42,7 @@ src_configure() {
 		-DMICROHTTPD_ENABLE=$(usex webserver)
 		-DOpenCL_ENABLE=$(usex opencl)
 		-DOpenSSL_ENABLE=$(usex ssl)
+		-DLIBRARY_OUTPUT_PATH=$(get_libdir)
 	)
 	cmake-utils_src_configure
 }
diff --git a/net-p2p/xmr-stak/xmr-stak-2.4.3.ebuild b/net-p2p/xmr-stak/xmr-stak-2.4.3.ebuild
deleted file mode 100644
index 4be0f9f7cace..000000000000
--- a/net-p2p/xmr-stak/xmr-stak-2.4.3.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils systemd
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/fireice-uk/xmr-stak.git"
-	EGIT_BRANCH="dev"
-	inherit git-r3
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/fireice-uk/xmr-stak/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Unified all-in-one Monero miner"
-HOMEPAGE="https://github.com/fireice-uk/xmr-stak"
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="cuda devfee hwloc opencl ssl webserver"
-
-DEPEND="cuda? ( dev-util/nvidia-cuda-toolkit )
-	hwloc? ( sys-apps/hwloc )
-	opencl? ( virtual/opencl )
-	ssl? ( dev-libs/openssl:0= )
-	webserver? ( net-libs/libmicrohttpd )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	cmake-utils_src_prepare
-	if ! use devfee; then
-		sed -i -e 's!fDevDonationLevel = .*;!fDevDonationLevel = 0.0;!' xmrstak/donate-level.hpp || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCUDA_ENABLE=$(usex cuda)
-		-DHWLOC_ENABLE=$(usex hwloc)
-		-DMICROHTTPD_ENABLE=$(usex webserver)
-		-DOpenCL_ENABLE=$(usex opencl)
-		-DOpenSSL_ENABLE=$(usex ssl)
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	systemd_newunit "${FILESDIR}"/${PN}-2.3.0.service ${PN}.service
-	dodir /etc/xmr-stak
-}
-
-pkg_postinst() {
-	if [ ! -e "${ROOT}etc/xmr-stak/main.config" ]; then
-		ewarn "To use xmr-stack:"
-		if use cuda || use opencl; then
-			ewarn "As root or as a user that is a member of the 'video' group,"
-		fi
-		ewarn "run:"
-		ewarn "/usr/bin/xmr-stak --cpu /etc/xmr-stak/cpu.config --amd /etc/xmr-stak/amd.config --nvidia /etc/xmr-stak/nvidia.config -c /etc/xmr-stak/main.config"
-		ewarn "If the systemd will be used, xmr-stak can now be terminated and 'systemctl start xmr-stak' can be used."
-	fi
-}
diff --git a/sys-boot/efibootmgr/efibootmgr-16.ebuild b/sys-boot/efibootmgr/efibootmgr-16.ebuild
index fc0c1a239f84..1c2545879ecb 100644
--- a/sys-boot/efibootmgr/efibootmgr-16.ebuild
+++ b/sys-boot/efibootmgr/efibootmgr-16.ebuild
@@ -27,3 +27,7 @@ src_configure() {
 	tc-export CC
 	export EFIDIR="Gentoo"
 }
+
+src_compile() {
+	emake PKG_CONFIG="$(tc-getPKG_CONFIG)"
+}