gentoo resync : 17.05.2018

7 files changed, 31 insertions, 9 deletions

diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index bcb9400ae928..1cb931bf3a78 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/clockywock/Manifest b/app-misc/clockywock/Manifest
index 874c2b267481..7438aa48d111 100644
--- a/app-misc/clockywock/Manifest
+++ b/app-misc/clockywock/Manifest
@@ -1,4 +1,4 @@
 AUX clockywock-0.3.1a-makefile.patch 260 BLAKE2B 958187b4a03a006edea2ce207abb1aab20a55cd64fe346797c4e0663bc094fca7c9dac8ef173cf459fddaa2079d5543a9db9bc97305af438c20293cb1012d0f5 SHA512 64993df817a54437c4c09f8f69612318c0f1a769d14790a9880984bea6634d08ebef389f10db70fd88ef8525e1d523589d50c5fe5c704f2f8a84eec0484f3798
 DIST clockywock-0.3.1a.tar.gz 15004 BLAKE2B 8b2838a1aab735243c8fd663bfb96a668f5efdba59b4e18ab10e5d365b539b26d915d384433441d0d37e4a9291920267a0a091b4b7d1e5002e72ab6b37e2b495 SHA512 1d4f6e0a2e9cd8f459346aa4778ed4da0f1ce8e2b0b8bfed97a90c286d79199cefa609976c6d6139f1acdaccfc07f5f84e46d2f54e397ff8e9b2b450d06399a9
-EBUILD clockywock-0.3.1a.ebuild 580 BLAKE2B c9924b58fbbd54e931431d7ca8ccd486c2b6a0471d1c28ad2b3a65eebd139705e1cb00d065944b8b2c0fa27da0aa5e86c509d8e86c76a6ea856478b595260a7f SHA512 4e57bcb0866f88a78f4df4725dbe09f25146954f55450ed7893e5bd5b761492ca60713715732931d2f777fe33cba7d057ead0eee2b96459f9bb97880099491f3
+EBUILD clockywock-0.3.1a.ebuild 578 BLAKE2B f4ea4911e47c85033f2cbfc61b3c111167c0a716ca1bf3f18342420f239c232e7e8910bc93573094a9c67b8824a2cf0a1898c672afe8d274725f1e691ca870c2 SHA512 13f7c180cca8aa6cd052a52324b29ecfc441be786e5fdb8c3d27f94f187793e6a4827932bc6620f94700d10339356da1c4a16117be856ad5d54d529c37a94b60
 MISC metadata.xml 247 BLAKE2B 61049845c1ffb66aea9959f984983735ad8d7d9d37aab6da3a19951bbf8d67af657cacde1701da8a3dd93b0704c10430d511bea11d56bf98702950f0707436ec SHA512 96c55c2979dd6a4c4761fce9b5a0be387b11fcf197ef903d8680ae82f01a2caea93b1238bed1ac96d3eb250744e2149a507e0424ac017b4324f0806a54e72c4a
diff --git a/app-misc/clockywock/clockywock-0.3.1a.ebuild b/app-misc/clockywock/clockywock-0.3.1a.ebuild
index 13ea8812d469..26f1be9445c7 100644
--- a/app-misc/clockywock/clockywock-0.3.1a.ebuild
+++ b/app-misc/clockywock/clockywock-0.3.1a.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=6
 
-inherit base toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="ncurses based analog clock"
-HOMEPAGE="http://soomka.com/clockywock"
-SRC_URI="http://soomka.com/${P}.tar.gz"
+HOMEPAGE="https://soomka.com/clockywock"
+SRC_URI="https://soomka.com/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -22,7 +22,7 @@ src_prepare() {
 	# Respect compiler
 	tc-export CXX
 
-	base_src_prepare
+	default_src_prepare
 }
 
 src_install() {
diff --git a/app-misc/screen/Manifest b/app-misc/screen/Manifest
index c6d0f67da9c6..45823f1a9268 100644
--- a/app-misc/screen/Manifest
+++ b/app-misc/screen/Manifest
@@ -11,7 +11,7 @@ DIST screen-4.6.2.tar.gz 845210 BLAKE2B feea244e2e0c8f638442a524cd7cac93c6c5e576
 EBUILD screen-4.4.0.ebuild 3980 BLAKE2B 3077899f647e40c745c435215768819a8bb11a21d3f91ac86c45bc107e96f8d8cbb9d86328f5b7bd8295f1d80afa73fa67405bf37c1b8319466ce57aaa33af42 SHA512 95379c53082d4bd334550dce454c087fc9591cf96a625018e1856eb7073ce267f5885a382b54fd46e73a319b64304ecb92f779b1aeb80898262b8daff763bc13
 EBUILD screen-4.5.1.ebuild 4127 BLAKE2B d224ced4b2a18f213fb6d2d8c31fb466d6a4fb19c4fe1a8f24823b40a58abee084d4f6f7e8870bba4c016b198182e88f61beb7b86a9ec8bcacabbc4dda5bf9f2 SHA512 6db1227a0d8f4580a1603b85bc0ff8cdfe868ba58c735848e0dd37b6b989406bfbc9c3a8803c11f185f5f78802633bbaf90284356c66d364ea566768be2a07fe
 EBUILD screen-4.6.0.ebuild 4075 BLAKE2B 88b85d6cb3413354b8411c2f71fb3b17a7b8fe9b7989e06e823faad8d3328612b74c6e0846184ebd60aeaf2d94e6bdbb8e631170d3f339459a9a589e4362228e SHA512 ba1626a43f9cbb92e5abe099ed8f17524d9fcef21381fbdaf645830873bc06dbdf4e04326ae5af6f662e709393b1e3b48c4859f4136e90f02f57bd07c4eba431
-EBUILD screen-4.6.1.ebuild 4066 BLAKE2B 38a405eb3815be6223377a53ee1a8c785a20a843d1e53225affe6a79e0fb84d80fae732de1d3557494cfb040707252d0efa5fe6e608f7cb8f94cef75b4834382 SHA512 2e597f24f2974262eb80bcc7f25ef418aaafaf161fc60a0b5e23aed22da97af66946af6c066ca1eefe427f713418e3edbcd30b9cc501ea2e3529d82fcc0551c9
+EBUILD screen-4.6.1.ebuild 4065 BLAKE2B 2a6716a96066552b470789cb06999dab29232fddd7de3c1eb773a0983e12b1d29e101deddc208377df593049de4d4b3ceab6711a954d2440c4490939e3d50d2f SHA512 469e386b23958f7a4d2cb2676940e78d1833001b0cce51ed1a2e198a2164373f11e13ad95223f203c3aa58bf56be8dda079ba95fa2ef8211f63baa41b09150bd
 EBUILD screen-4.6.2.ebuild 4111 BLAKE2B cc6b4b3eeb615f3e313f6ed779aba160058e5d31c1b05342945bba687d3ea6f73d8f71f08fefb5d7d0e2130c6f4370b5f798e1b4529318defb67fc72172fdd67 SHA512 bf1ab9c61d9d1c8087c08315aa732fcd1922913b446bfa3729219d52f7628f9aa8fb7c1001743bd4a77eae4936117fc4f108b8aacbd29e33d4efaf4e8adf4ce1
 EBUILD screen-9999.ebuild 3746 BLAKE2B c8bbcdc221e6e4e310aa161e4faad0a517579a1ee9d639957356eeac1cda6f437b33b7780877d87a2f25881a52b76f9e4e71d8760c55a92b2ef790c2af12aeb7 SHA512 07fee252dc398dc18edd4aceebc3ca9d0a86e4523593bb58983ff401fcb7cfffbb969d60563ec8e657e944b14952d462e1d9dc61e274ffff869421673a90f1ed
 MISC metadata.xml 1836 BLAKE2B c91b439cb8e6301a8e7ac000f58616a6a383180671dc721b3ab74d74c826a85ec9f3e5d0d70a450a3a46430b47eb6dfff329a0d2489f4dee861ea1575f08e9c5 SHA512 39618ae8527cf9744132eb2a0aefe5f0b4a400784288661e74b670b149bf729001c950408b765a6cec0330c0517063732c7e4b15270a2a2a5d971d2e0475f21d
diff --git a/app-misc/screen/screen-4.6.1.ebuild b/app-misc/screen/screen-4.6.1.ebuild
index 928e94fa16a4..a6a1ccd05e62 100644
--- a/app-misc/screen/screen-4.6.1.ebuild
+++ b/app-misc/screen/screen-4.6.1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://www.gnu.org/software/screen/"
 
 if [[ "${PV}" != 9999 ]] ; then
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-	KEYWORDS="alpha amd64 ~arm arm64 hppa ~ia64 m68k ~mips ~ppc ~ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 else
 	EGIT_REPO_URI="git://git.savannah.gnu.org/screen.git"
 	EGIT_CHECKOUT_DIR="${WORKDIR}/${P}" # needed for setting S later on
diff --git a/app-misc/supercat/Manifest b/app-misc/supercat/Manifest
index c1eebfcb056d..591ffb8d6a21 100644
--- a/app-misc/supercat/Manifest
+++ b/app-misc/supercat/Manifest
@@ -1,3 +1,5 @@
 DIST supercat-0.5.5.tar.gz 103545 BLAKE2B dfe8b823307fe39762d050e8676ff3f296b0ba206a618695fd3c699bc51d1c52cc552764ba52c45cc2eb0af2e8565a5dc4f86871489f082f15ba579aa80a51f5 SHA512 24989935ea7b863638165f7102ae511b9be00ff4399f433fc9ec2fc33543eea907b8bd46e819d815344c8c8467bc702b9a5b32aa55bd21be2670237fa1d711de
+DIST supercat-0.5.6.tar.gz 150193 BLAKE2B a289beceabee0bff8c25b3430803032c1192c470bd9b3ff188cd117dd60b58102ea070c7baa65bd3d5b05dc9ed9e7460fe92812c35de33ae7bed0bee1cf2cf28 SHA512 028c5935290a1e11520928b71024c29b0db437a6737c5f63d0a58dab3d855834b0ce2895fd86f6b5166cc25fe5a87845136fe3d6cf05df333cfbe5713cbd5f50
 EBUILD supercat-0.5.5-r2.ebuild 478 BLAKE2B 5944b293ea0da4be37e53f01cb352573a6026a03bef2558b8a14d8e3c85e59298b4b2f2c4dcf39b9d2d849d4c885b3d94a462f7fe8a293179d5bc5763dc1cbde SHA512 a5c8abbc831998d555379a71cf79d4bc1f7d799905daaacf64a6646c636ec37936a704b0875181ecf0683352585bb125f6179e70561d3327ac06cef9a0555973
+EBUILD supercat-0.5.6.ebuild 482 BLAKE2B 58d2c3fabba32a82499f12243daca474011cd1939dbbb78176d333f27cf23f708305cc78e96a3b5f8dc92e90eaa44c5203b50781ff6a3cb7af956d4ec2b83e2a SHA512 7835d5ccb1faf3705051f16772bb602f1b2716496ad2574cdf5e6fec00988b33c473925fb0380495e308113cf88578140a15c425fa9b13b73f4fcd3f27dabb81
 MISC metadata.xml 265 BLAKE2B 75452ad720a31a08fc0dcd02eec704c18b11bc0660686f9a320b85fc879f55a564ce9c3b6a8c710781b74c5e8eb3d0544c02a042fb35a0b62a5e1491f675296a SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25
diff --git a/app-misc/supercat/supercat-0.5.6.ebuild b/app-misc/supercat/supercat-0.5.6.ebuild
new file mode 100644
index 000000000000..1b91c5494e3d
--- /dev/null
+++ b/app-misc/supercat/supercat-0.5.6.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A text file colorizer using powerful regular expressions"
+HOMEPAGE="http://supercat.nosredna.net"
+SRC_URI="http://supercat.nosredna.net/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+
+src_configure() {
+	econf --with-system-directory="${EPREFIX}/etc/supercat"
+}
+
+src_install() {
+	default
+}