gentoo resync : 09.06.2018

12 files changed, 17 insertions, 333 deletions

diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index 3d6e00179924..0aa9d673e5d8 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
diff --git a/x11-terms/kitty/Manifest b/x11-terms/kitty/Manifest
index f1fc0e92a295..bfc37440d01f 100644
--- a/x11-terms/kitty/Manifest
+++ b/x11-terms/kitty/Manifest
@@ -1,13 +1,8 @@
-AUX kitty-0.7.1-flags.patch 1514 BLAKE2B 1df4313bd4436200e114f9d9abadd6e160c34f20f6acbfcf77976fe9d8cb34b7340faf399c3aed2878f725336cb23bfad8789932804a76ec01bd1b6976450785 SHA512 e6611277df94ee51981b8b111281683c58f06271fc1252f1bcb50a3441d531aaee52e54b09cecb781a8173af83d9c6a63f68526b0deb4d1818e5f8e6b349b4f5
 AUX kitty-0.7.1-svg-icon.patch 710 BLAKE2B 6377fe8ed9e344ba61881041d9eea72304f605ad633ac2d4ee68aebe363368c9a2b93c48297aca2e4edca14b7535c1a40c81f2dce4189bbeee563d7e6c23d6b7 SHA512 9f449cbc26cc8446425be0f5945e69cef49b4602f7578559d8ddc7456e4adb3afe1edf2c580eb009d1f2e3daa3f3b087c49b3e35a35e8a0a8fb7be584d5256af
 AUX kitty-0.9.1-flags.patch 1583 BLAKE2B 0981fe541241e2265104cc8bf531abe0fb01ecc7959d11178eeeb71c39f9b88489dc8c5d721748c7af330136c276791907f38341cc0a914c662d30d5618c05c0 SHA512 90751db5b8a5ab36d02af76bc9361e73b6409804626c4a8090f9ca620600dc79c3043ac192dd2c0578552825d4fd3e73aa87716f3cd4ec67128eefff1a6c6452
-DIST kitty-0.8.2.tar.gz 3281308 BLAKE2B 6219dddc02e8b98b913356708fd2e398ad17aea97b0c539132b2333a736324d76136a6b6599b925424a8e7c578e9ef92b38ef5aa8ea5b42788731ecf19ad5e27 SHA512 4dabbce40a5fe0e54ac64b429baf3491ab492846f0f31b4b763c06c7aeba80a482bfd083419d3ddcd1bc267553458b719df82a2a179d90a88be3ce41a47d9897
-DIST kitty-0.8.3.tar.gz 3285120 BLAKE2B dcf47345f26beaaae5a63f122a3592c29a8ef2243406377ebb46fd44b9d8036f2f5493d7b1048195e12a7fb9874fce920ac52a0bb18e071e5e3db869691174d9 SHA512 b758a178b976d7dc133dd48bfafff5db8a373419a67206a8724695392c0654a9d5ba07867cbd6824afe1a5c013724d8472ab4087eae52c8bdb27843688b18968
-DIST kitty-0.8.4.tar.gz 3285125 BLAKE2B ad0e1b94caab2b572baabf8340dad703cf6e572494b938fd6941d053deaee9d628d652af9c542efee6ecc2fe71fd7c534595449cb25e50438276d4d0361a61d9 SHA512 1ed5b909f66abd113d643420fadf4034fe0af5b649c957590f0698c541e26d0d061a5d703b8e6220f4be826b2b9914ecb3559fc644eb41cb7cd4b9465030cd93
+DIST kitty-0.10.1.tar.gz 3844251 BLAKE2B f2b1e523ae48415c410080ae0b419c96e394bfc145da4c3f73fe865e2b1fbd6f7c8ffd18d4e14ea09c0397b8fceb35ebfce72a49d731886588acea5135d4615a SHA512 5341ebdec5356665db5ed0b9f910dac66860b0b39334c0878a3af637bd3da983c11ab8425794e8ea7b3c90f6d64855d8acda4531f25726c01ab355293f033a08
 DIST kitty-0.9.1.tar.gz 3698447 BLAKE2B f7e5c4d365f4fa3f74a348b219ea2433fc1ad05cca68a5ba920b692a4dd5de63fb27cd28159de3af3f11e9a87911bc8600c342ee2bc733317f91e9a7b6226e15 SHA512 3690dd7308f37de3282148c80e2afffde08e4dc2c459f78668d461461ff5dad2b39127635cf22f0f160f40823d2fa1a43a7e83d4bcc0b64e4cbc6e5be1988329
-EBUILD kitty-0.8.2-r1.ebuild 1713 BLAKE2B 34e80783bef14a24b48d843eb232aa8bb4b4db089789453973433cc5d702c12ba410c419e1d4f24f607c3fea483cbd42b1559cceffb227449dc4e1950e42fc52 SHA512 7290d0ccd2a5e72747a5a06f989bf58fb5489b85bf35c68b1572545a3edbdf6a17e7358107ef0eeb394f59546186998e8091eedae129d95eb6b4eee5c2cd3995
-EBUILD kitty-0.8.3.ebuild 1713 BLAKE2B 34e80783bef14a24b48d843eb232aa8bb4b4db089789453973433cc5d702c12ba410c419e1d4f24f607c3fea483cbd42b1559cceffb227449dc4e1950e42fc52 SHA512 7290d0ccd2a5e72747a5a06f989bf58fb5489b85bf35c68b1572545a3edbdf6a17e7358107ef0eeb394f59546186998e8091eedae129d95eb6b4eee5c2cd3995
-EBUILD kitty-0.8.4.ebuild 1713 BLAKE2B 34e80783bef14a24b48d843eb232aa8bb4b4db089789453973433cc5d702c12ba410c419e1d4f24f607c3fea483cbd42b1559cceffb227449dc4e1950e42fc52 SHA512 7290d0ccd2a5e72747a5a06f989bf58fb5489b85bf35c68b1572545a3edbdf6a17e7358107ef0eeb394f59546186998e8091eedae129d95eb6b4eee5c2cd3995
+EBUILD kitty-0.10.1.ebuild 1816 BLAKE2B 1c74b62c6fd71587d1bb9fe681615a64595e5ce109e54d2c8a11274dfa0847b6a959ba9f8271e9e9f33fe7d84c41d2012ef52aeecec21a9d9d14dc1f0d846453 SHA512 2391a2bd786bdb9bb719c3ce911261b6fd3e49380a79ae0d808c98d6b99b10824d38235d247e3b1e534a7d37e651cf3b7226b1cff711775479e7b77cfa3de1df
 EBUILD kitty-0.9.1.ebuild 1816 BLAKE2B 1c74b62c6fd71587d1bb9fe681615a64595e5ce109e54d2c8a11274dfa0847b6a959ba9f8271e9e9f33fe7d84c41d2012ef52aeecec21a9d9d14dc1f0d846453 SHA512 2391a2bd786bdb9bb719c3ce911261b6fd3e49380a79ae0d808c98d6b99b10824d38235d247e3b1e534a7d37e651cf3b7226b1cff711775479e7b77cfa3de1df
 EBUILD kitty-9999.ebuild 1816 BLAKE2B 1c74b62c6fd71587d1bb9fe681615a64595e5ce109e54d2c8a11274dfa0847b6a959ba9f8271e9e9f33fe7d84c41d2012ef52aeecec21a9d9d14dc1f0d846453 SHA512 2391a2bd786bdb9bb719c3ce911261b6fd3e49380a79ae0d808c98d6b99b10824d38235d247e3b1e534a7d37e651cf3b7226b1cff711775479e7b77cfa3de1df
 MISC metadata.xml 428 BLAKE2B 961cd7fc3036c8f5a641cb97de57765c423f157430bf1fd68ce7febf24713ab1b15080e03f568d20f6360da467044ea4ed1d3ee7bfb132250951b4239df58980 SHA512 49ffa8dee6be29ab8adacbc0717dc574ad15f690fa1e0726b2a9de439f90867d3770e3628734d9a7457aa45896334d96f15a51e217ad248c766271aa62d85061
diff --git a/x11-terms/kitty/files/kitty-0.7.1-flags.patch b/x11-terms/kitty/files/kitty-0.7.1-flags.patch
deleted file mode 100644
index 6352ae93f63c..000000000000
--- a/x11-terms/kitty/files/kitty-0.7.1-flags.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- kitty-0.7.1/setup.py
-+++ kitty-0.7.1/setup.py
-@@ -163,12 +163,12 @@
-     df = '-g3'
-     if ccver >= (5, 0):
-         df += ' -Og'
--    optimize = df if debug or sanitize else '-O3'
-+    optimize = ''
-     sanitize_args = get_sanitize_args(cc, ccver) if sanitize else set()
-     cflags = os.environ.get(
-         'OVERRIDE_CFLAGS', (
-             '-Wextra -Wno-missing-field-initializers -Wall -std=c99 -D_XOPEN_SOURCE=700'
--            ' -pedantic-errors -Werror {} {} -D{}DEBUG -fwrapv {} {} -pipe {} -fvisibility=hidden'
-+            ' -pedantic {} {} -D{}DEBUG -fwrapv {} {} {} -fvisibility=hidden'
-         ).format(
-             optimize,
-             ' '.join(sanitize_args),
-@@ -183,7 +183,7 @@
-     )
-     ldflags = os.environ.get(
-         'OVERRIDE_LDFLAGS',
--        '-Wall ' + ' '.join(sanitize_args) + ('' if debug else ' -O3')
-+        '-Wall ' + ' '.join(sanitize_args)
-     )
-     ldflags = shlex.split(ldflags)
-     ldflags.append('-shared')
-@@ -455,13 +455,13 @@
- 
- 
- def build_linux_launcher(args, launcher_dir='.', for_bundle=False, sh_launcher=False):
--    cflags = '-Wall -Werror -fpie'.split()
-+    cflags = '-Wall -fpie'.split()
-     libs = []
-     if args.profile:
-         cflags.append('-DWITH_PROFILER'), cflags.append('-g')
-         libs.append('-lprofiler')
--    else:
--        cflags.append('-O3')
-+    #else:
-+    #    cflags.append('-O3')
-     if for_bundle:
-         cflags.append('-DFOR_BUNDLE')
-         cflags.append('-DPYVER="{}"'.format(sysconfig.get_python_version()))
diff --git a/x11-terms/kitty/kitty-0.8.2-r1.ebuild b/x11-terms/kitty/kitty-0.10.1.ebuild
index b51c9110b0ed..a458d0c67387 100644
--- a/x11-terms/kitty/kitty-0.8.2-r1.ebuild
+++ b/x11-terms/kitty/kitty-0.10.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 PYTHON_COMPAT=( python3_{5,6} )
 
-inherit python-single-r1 toolchain-funcs
+inherit python-single-r1 toolchain-funcs gnome2-utils
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/kovidgoyal/kitty.git"
@@ -48,7 +48,7 @@ DEPEND="${RDEPEND}
 "
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-0.7.1-flags.patch
+	"${FILESDIR}"/${PN}-0.9.1-flags.patch
 	"${FILESDIR}"/${PN}-0.7.1-svg-icon.patch
 )
 
@@ -84,3 +84,11 @@ src_install() {
 
 	dodoc CHANGELOG.rst *.asciidoc
 }
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/x11-terms/kitty/kitty-0.8.3.ebuild b/x11-terms/kitty/kitty-0.8.3.ebuild
deleted file mode 100644
index b51c9110b0ed..000000000000
--- a/x11-terms/kitty/kitty-0.8.3.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
-
-inherit python-single-r1 toolchain-funcs
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/kovidgoyal/kitty.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/kovidgoyal/kitty/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="A modern, hackable, featureful, OpenGL-based terminal emulator"
-HOMEPAGE="https://github.com/kovidgoyal/kitty"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="debug imagemagick wayland"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPS="
-	${PYTHON_DEPS}
-	>=media-libs/harfbuzz-1.5.0:=
-	sys-libs/zlib
-	media-libs/libpng:0=
-	media-libs/freetype:2
-	media-libs/fontconfig
-	x11-libs/libXcursor
-	x11-libs/libXrandr
-	x11-libs/libXi
-	x11-libs/libXinerama
-	x11-libs/libxkbcommon[X]
-	wayland? (
-		dev-libs/wayland
-		>=dev-libs/wayland-protocols-1.12
-	)
-"
-RDEPEND="
-	${COMMON_DEPS}
-	imagemagick? ( virtual/imagemagick-tools )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.7.1-flags.patch
-	"${FILESDIR}"/${PN}-0.7.1-svg-icon.patch
-)
-
-src_prepare() {
-	default
-
-	# disable wayland as required
-	if ! use wayland; then
-		sed -i "/'x11 wayland'/s/ wayland//" setup.py || die
-	fi
-
-	tc-export CC
-}
-
-doecho() {
-	echo "$@"
-	"$@" || die
-}
-
-src_compile() {
-	doecho "${EPYTHON}" setup.py --verbose $(usex debug --debug "") --libdir-name $(get_libdir) linux-package
-}
-
-src_test() {
-	export KITTY_CONFIG_DIRECTORY=${T}
-	"${EPYTHON}" test.py || die
-}
-
-src_install() {
-	mkdir -p "${ED}"usr || die
-	cp -r linux-package/* "${ED}usr" || die
-	python_fix_shebang "${ED}"
-
-	dodoc CHANGELOG.rst *.asciidoc
-}
diff --git a/x11-terms/kitty/kitty-0.8.4.ebuild b/x11-terms/kitty/kitty-0.8.4.ebuild
deleted file mode 100644
index b51c9110b0ed..000000000000
--- a/x11-terms/kitty/kitty-0.8.4.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
-
-inherit python-single-r1 toolchain-funcs
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/kovidgoyal/kitty.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/kovidgoyal/kitty/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="A modern, hackable, featureful, OpenGL-based terminal emulator"
-HOMEPAGE="https://github.com/kovidgoyal/kitty"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="debug imagemagick wayland"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPS="
-	${PYTHON_DEPS}
-	>=media-libs/harfbuzz-1.5.0:=
-	sys-libs/zlib
-	media-libs/libpng:0=
-	media-libs/freetype:2
-	media-libs/fontconfig
-	x11-libs/libXcursor
-	x11-libs/libXrandr
-	x11-libs/libXi
-	x11-libs/libXinerama
-	x11-libs/libxkbcommon[X]
-	wayland? (
-		dev-libs/wayland
-		>=dev-libs/wayland-protocols-1.12
-	)
-"
-RDEPEND="
-	${COMMON_DEPS}
-	imagemagick? ( virtual/imagemagick-tools )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.7.1-flags.patch
-	"${FILESDIR}"/${PN}-0.7.1-svg-icon.patch
-)
-
-src_prepare() {
-	default
-
-	# disable wayland as required
-	if ! use wayland; then
-		sed -i "/'x11 wayland'/s/ wayland//" setup.py || die
-	fi
-
-	tc-export CC
-}
-
-doecho() {
-	echo "$@"
-	"$@" || die
-}
-
-src_compile() {
-	doecho "${EPYTHON}" setup.py --verbose $(usex debug --debug "") --libdir-name $(get_libdir) linux-package
-}
-
-src_test() {
-	export KITTY_CONFIG_DIRECTORY=${T}
-	"${EPYTHON}" test.py || die
-}
-
-src_install() {
-	mkdir -p "${ED}"usr || die
-	cp -r linux-package/* "${ED}usr" || die
-	python_fix_shebang "${ED}"
-
-	dodoc CHANGELOG.rst *.asciidoc
-}
diff --git a/x11-terms/sakura/Manifest b/x11-terms/sakura/Manifest
index 40916695941d..aae1c5b93d04 100644
--- a/x11-terms/sakura/Manifest
+++ b/x11-terms/sakura/Manifest
@@ -1,8 +1,4 @@
 AUX sakura-3.1.3-flags.patch 626 BLAKE2B 5d0d19c134e0dca10d564049e8b988616e5d84d8bf88c8ab6469bdf3e504b9d528a7754cb02d171fd71497eac2363bfd41f1b26551a9e2dc5a39f262ff3e92d6 SHA512 007a2f2ab722bd991cee0da708efba301b3c69bb86eff25a14519008ad485e8e6ed1c8e2ded6fcd88ff7066528ff539eced4d105a84d6774aa952150beddc57f
-DIST sakura-3.3.4.tar.bz2 52839 BLAKE2B 8fbab050b6983625dd77a6ef52a56cbcd854d40c1f22a10e845171bab78b49263d5dc6a7e2e2a00d0ffc0140995b453755009fdc85e1f6d950336201873bc155 SHA512 a84849e2fa7b45da513ff05a1e1636eb8d331b7c632f18605d6aa01463e44d877c057f2f628bfdc27e9f6ff29b0441ba248885d92341ed3a9b5eb281d02e34d7
-DIST sakura-3.4.0.tar.bz2 54907 BLAKE2B c31d757e9467240d8455cbc7189f2104b0620f208ffbf7815fd834da08beeb59218931621656e4c920cadadca41bf682f321fe935151887cf99c1afe0800c980 SHA512 5d8f62638bd826a294b240960f2bd696583f8cad4799ab5862796b6210320f94ee11e64847c36ca6765f9281fb8fabb7a699db6fcf1de41c5e7f82bb281e9512
 DIST sakura-3.5.0.tar.bz2 55432 BLAKE2B 9accd09eac359b64637ff5c318e50e32f5bfa27cf7fb5d4a99c91391e14f145020bd19077e20585b78149e5ac5f281abaf1098dbbaf111e54fd5ad5fbb2f4887 SHA512 20c691342c68a2a6f7397da754c83b19c7622e25984ae9fe9fef47492e19cd7589dd9d1bd2ccb82bd9c6ab82f92c97c1b742795434a101a0e169c6f901f40d9e
-EBUILD sakura-3.3.4.ebuild 906 BLAKE2B 86511b6ae84ca633739ceaccdb7c2e623c15f2e6f60d5975578c67400cb9a791b3acf2cf41af84ba6b33ae78bc9355a3d38dbdce19981ed0c417f240c56fb5c0 SHA512 5461559e63d9eaf5ae4d3bd9da90228fb96cc1dea8a588f9297ed071222de6d799e6712671c41f15420b1b5851448bbbe22dd39457d77c236d8bea8a3964f2d1
-EBUILD sakura-3.4.0.ebuild 1216 BLAKE2B 34a478cb128992ec67e938f60360144a0c6693fc9f9190ff13db90f8aa95034de0ccf30df4026cd73d507082382813b0cee0565975339bcbb8b639e9e9b6d324 SHA512 0bcedeb6b85b5499bcbc1ea73508af9ad12cdcb87f6807076368873f2880f6b945e8300327c7aa25d9808ce753438a269267dd6c1d81c40f8d4ac797dad6d5f2
-EBUILD sakura-3.5.0.ebuild 1387 BLAKE2B 39f1c4ea60cb52052388a2b6701a552796912b2098de398fa9bd2d1f8af2ebed6e473776406664e819ece3072b0216a1716269737d5b2538def617ad54e07eed SHA512 c9842e1c0e4103071573cb8541609ab9ee9646e8847ae38decc980cdff44e7823d897ab4e63ee17e0dcf2d5b48014997c65902e8d67befe1806e03a083b85209
+EBUILD sakura-3.5.0.ebuild 1385 BLAKE2B c1e944d9d370676d704b61746af06132f537fed3b3a05ea9235d1b736e830b26df75c0dc03f46809faf367779c50c9cf2b176dae2d59291383012c7792f70450 SHA512 9365ba8e924643daa84b8769fbb2f20eee6ec470fbae656d4655dd48aee6dc325209155c3011de155fb2057ac6de50516e6002bbe53a7cecddd304d735e3b6c2
 MISC metadata.xml 928 BLAKE2B 91926b81400896fef6be017fe1d0dacc25bb2331e84b7604223464c2f0862b0935aadf944dcd272a989ae9de5b180f3576725f30fa2a161ba24f27c5ba1884e0 SHA512 95be972f218e92365f8084f3a796199c3f7a182bc42c098761096f2146323afcdb2fc45e6c4ec975f03decdac05b9c01083c768162bf97c88c61dab892419ffb
diff --git a/x11-terms/sakura/sakura-3.3.4.ebuild b/x11-terms/sakura/sakura-3.3.4.ebuild
deleted file mode 100644
index f55472bc7960..000000000000
--- a/x11-terms/sakura/sakura-3.3.4.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit cmake-utils eutils
-
-DESCRIPTION="sakura is a terminal emulator based on GTK and VTE"
-HOMEPAGE="http://www.pleyades.net/david/projects/sakura/"
-SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~arm-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-libs/glib-2.20:2
-	x11-libs/gtk+:3[X]
-	x11-libs/vte:2.91
-"
-DEPEND="
-	${RDEPEND}
-	>=dev-lang/perl-5.10.1
-	virtual/pkgconfig
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-3.1.3-flags.patch )
-
-DOCS=( AUTHORS )
-
-src_prepare() {
-	sed -i "/FILES INSTALL/d" CMakeLists.txt || die
-
-	strip-linguas -i po/
-	local lingua
-	for lingua in po/*.po; do
-		lingua="${lingua/po\/}"
-		lingua="${lingua/.po}"
-		if ! has ${lingua} ${LINGUAS}; then
-			rm po/${lingua}.po || die
-		fi
-	done
-
-	cmake-utils_src_prepare
-}
diff --git a/x11-terms/sakura/sakura-3.4.0.ebuild b/x11-terms/sakura/sakura-3.4.0.ebuild
deleted file mode 100644
index 315f2a8ec16e..000000000000
--- a/x11-terms/sakura/sakura-3.4.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils eutils flag-o-matic
-
-DESCRIPTION="sakura is a terminal emulator based on GTK and VTE"
-HOMEPAGE="http://www.pleyades.net/david/projects/sakura/"
-SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~arm-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-libs/glib-2.20:2
-	x11-libs/gtk+:3[X]
-	x11-libs/libX11
-	x11-libs/vte:2.91
-"
-DEPEND="
-	${RDEPEND}
-	>=dev-lang/perl-5.10.1
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.1.3-flags.patch
-)
-
-DOCS=(
-	AUTHORS
-)
-
-src_prepare() {
-	sed -i "/FILES INSTALL/d" CMakeLists.txt || die
-
-	strip-linguas -i po/
-	local lingua
-	for lingua in po/*.po; do
-		lingua="${lingua/po\/}"
-		lingua="${lingua/.po}"
-		if ! has ${lingua} ${LINGUAS}; then
-			rm po/${lingua}.po || die
-		fi
-	done
-
-	cmake-utils_src_prepare
-	# sakura.c:1740:3: warning: implicit declaration of function ‘readlink’
-	# [-Wimplicit-function-declaration]
-	append-cppflags -D_DEFAULT_SOURCE
-
-	# sakura.c:1348:9: error: ‘for’ loop initial declarations are only allowed
-	# in C99 or C11 mode
-	append-cflags -std=c99
-}
diff --git a/x11-terms/sakura/sakura-3.5.0.ebuild b/x11-terms/sakura/sakura-3.5.0.ebuild
index ea31dcb86d1b..00b1ee1846b3 100644
--- a/x11-terms/sakura/sakura-3.5.0.ebuild
+++ b/x11-terms/sakura/sakura-3.5.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
@@ -10,7 +10,7 @@ SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~arm-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~arm-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-libs/glib-2.20:2
diff --git a/x11-terms/st/Manifest b/x11-terms/st/Manifest
index 829925893b68..f6883362fd24 100644
--- a/x11-terms/st/Manifest
+++ b/x11-terms/st/Manifest
@@ -2,7 +2,7 @@ DIST st-0.7.tar.gz 42418 BLAKE2B 2f0eccaec964106b03c3daa75486d8f373582b2275c00a8
 DIST st-0.8.1.tar.gz 45423 BLAKE2B e7f5d731ba86f37db4cda1f612a8f191f955d7ea8fd57c3fb142c695c41fda4d3b82a483bb3c1fff2d4ff66d9277ed22339c026bca4f4af740fc80cbbc7f3620 SHA512 787d35b0cc8b1435dad7809e9995bed3c7f781e012a4a43dd5ae3d670ebc0e4bc03a56ba3872ff8a3bdba316a41ba771c626adc8de0559296457a59170756c6b
 DIST st-0.8.tar.gz 45401 BLAKE2B 83a8ca385b6e94ded925b274983830664d84f3d746b4173fae9918f00464679f9e3b695a5a96554ca545c1f132a846a77d0627961ee1149b673133fd461e67a1 SHA512 47af80560f3bd803719b83e95affcb5425fed419fa4703dbd66ee2080f6671597aaba8110f3f7959190e8c3e2b02c62edf062fab950b2649f1d8c532c183de84
 EBUILD st-0.7.ebuild 1111 BLAKE2B e24b1a3fbd6f4bd397769643331a10bfa4e647f3848e93da210ab2251c9f2f92f9ac9be2a5a8d079114e4c7dfb20e10b5236a218591d8c41bfae22152040d93a SHA512 24b5c1ff578db7b32d12037eff589b6e5e34e28e17ae384a27ddd5e47558e814b330058bc482adc63beb6b7b413ba01650ba0451824e52e46f2b8255c05f20c1
-EBUILD st-0.8.1.ebuild 1386 BLAKE2B 242bbb98b01ce09c633afb600ac0a36b21afeb822ba35a9af57dfd12ae9e8791267697316530285e3692917473bc153cf961c95a4159430909333c2af228e8b6 SHA512 c2b3d27213c0fb8270e5fb3689bd07d3ef8493bb2799a16c713216286d25c616726e0047ae78d7b8c6e23793e69c8ce563a4d3289f1db06bae3005058ac9a2ea
+EBUILD st-0.8.1.ebuild 1393 BLAKE2B b6282c5ea60d600935c3f428941da6c2d89944e6d8e0ee2d24040f08fe9450e156f2ac6fac71a10092a3cd26e598c5e345a621ccaa86a0478dfea6cb08da22c6 SHA512 7849fea6b5407c7220ad2973d66df8b6faed5e63fab5873b2e9b1687da96b21d916b9dc5e843c8b0f3c1b8a889e8e3e0d245f9c686c75ce4a5e436a10c11ea03
 EBUILD st-0.8.ebuild 1386 BLAKE2B 242bbb98b01ce09c633afb600ac0a36b21afeb822ba35a9af57dfd12ae9e8791267697316530285e3692917473bc153cf961c95a4159430909333c2af228e8b6 SHA512 c2b3d27213c0fb8270e5fb3689bd07d3ef8493bb2799a16c713216286d25c616726e0047ae78d7b8c6e23793e69c8ce563a4d3289f1db06bae3005058ac9a2ea
 EBUILD st-9999.ebuild 1354 BLAKE2B 34d87affb824b194f43186063a2a9666c011e5c513f14ffc71b973357abfc7b317c47e6360ca6d251a24caf33f3540e21462739859250fa88db5ca70e45d799f SHA512 70f645d48ded672f8231ccf7cea587a350122f80b3bec5f0f7707ebb8f9cb2cc650b55418383512665beafd842f2cca01b3c6d4517efb658123d2c22db50d0ae
 MISC metadata.xml 308 BLAKE2B 0b5b8fb79473744926b25e2bffcc047e5bc3a41cf4a8708e64bdcefcbd61bd6a3414e79d1c8a07498eda8b5203d5c786f36aa70a9530f82b88c540dcd4808556 SHA512 18e3f4a2e5cd9c0fc70a8069cb948383ff4ee7ebd4e02e6e5bb26d2b0650d42562602284d985484842a870c33693439614ba40b47d2d567a2fe1bc09e62d9fcb
diff --git a/x11-terms/st/st-0.8.1.ebuild b/x11-terms/st/st-0.8.1.ebuild
index 46e232587d9a..aaa8318a7aa6 100644
--- a/x11-terms/st/st-0.8.1.ebuild
+++ b/x11-terms/st/st-0.8.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dl.suckless.org/st/${P}.tar.gz"
 
 LICENSE="MIT-with-advertising"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
 IUSE="savedconfig"
 
 RDEPEND="