gentoo resync : 23.03.2018

7 files changed, 16 insertions, 105 deletions

diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index 143c6cae32d0..06ab468c7d9e 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
diff --git a/x11-terms/kitty/Manifest b/x11-terms/kitty/Manifest
index df97510ec874..7e2b55e35db2 100644
--- a/x11-terms/kitty/Manifest
+++ b/x11-terms/kitty/Manifest
@@ -1,8 +1,6 @@
 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
-DIST kitty-0.7.1.tar.gz 2535007 BLAKE2B 13c5506b30e54b190d1cec2c2bb5b3b8c76ba3492a065fccae84c84606842b717dc33f74a7b3abf4c0ffec8564c5dd9be4b6ed3972c24cf95662aec594359bc9 SHA512 595e64e49ac940b37ff88d6152006ebfe2722682a8ff6c8bc2514c150a5b51934b9de5b8c99130910e5638f9c1db566abf4adb65f3fdce893708787d1ded59c1
-DIST kitty-0.8.0.tar.gz 3265837 BLAKE2B 2bd623a1f7024e3d6fe11132516a5c165d890faaa80cf2bc23f0a35852c331eede1fbeb0ab0e3588da6d41e7700d8643cd82bbb45bee4c8f359ff4b9f00fb081 SHA512 909faf13bd27c03eed463400d157f453363142fd31b4aaf49be37ed85bcd417077667fc02a8c78c6dccf4c1d326cfe3cff4996f591e16eda8335cf165abb42fd
-EBUILD kitty-0.7.1-r3.ebuild 1694 BLAKE2B 0cdae2a8466b8c1c18dec4674f8ae8a233ee37110fdc21923583367597325ac58474200a55de1dc2209ae531e8b74363de6dd2bfd69919ad9c316cbaf3dae1a2 SHA512 3dac472aad8f578544324261d430f7289eb477ef97526b8d443ede91412335a800bc12ab3377d8882ef738d84116aaedccbed76bb9d1b225cad2e7d9a2c983cb
-EBUILD kitty-0.8.0.ebuild 1824 BLAKE2B db4103d37bb5e8f8e6dfe74e7bed14b93fa4c06cef692be626f2b4733511c879d1a87b2030d62700186fa4270619bb47a11b9d45c085a79ff5e0d2ee4beee79f SHA512 78c2ae64bc97e52dcef020723c14158a4791b3a337d518c94384616737dad303024c6ef92b6ebe5e0df96d058c38e9c5b54358897a8d684888ce454d4b8c32eb
-EBUILD kitty-9999.ebuild 1824 BLAKE2B db4103d37bb5e8f8e6dfe74e7bed14b93fa4c06cef692be626f2b4733511c879d1a87b2030d62700186fa4270619bb47a11b9d45c085a79ff5e0d2ee4beee79f SHA512 78c2ae64bc97e52dcef020723c14158a4791b3a337d518c94384616737dad303024c6ef92b6ebe5e0df96d058c38e9c5b54358897a8d684888ce454d4b8c32eb
+DIST kitty-0.8.2.tar.gz 3281308 BLAKE2B 6219dddc02e8b98b913356708fd2e398ad17aea97b0c539132b2333a736324d76136a6b6599b925424a8e7c578e9ef92b38ef5aa8ea5b42788731ecf19ad5e27 SHA512 4dabbce40a5fe0e54ac64b429baf3491ab492846f0f31b4b763c06c7aeba80a482bfd083419d3ddcd1bc267553458b719df82a2a179d90a88be3ce41a47d9897
+EBUILD kitty-0.8.2-r1.ebuild 1713 BLAKE2B 34e80783bef14a24b48d843eb232aa8bb4b4db089789453973433cc5d702c12ba410c419e1d4f24f607c3fea483cbd42b1559cceffb227449dc4e1950e42fc52 SHA512 7290d0ccd2a5e72747a5a06f989bf58fb5489b85bf35c68b1572545a3edbdf6a17e7358107ef0eeb394f59546186998e8091eedae129d95eb6b4eee5c2cd3995
+EBUILD kitty-9999.ebuild 1713 BLAKE2B 34e80783bef14a24b48d843eb232aa8bb4b4db089789453973433cc5d702c12ba410c419e1d4f24f607c3fea483cbd42b1559cceffb227449dc4e1950e42fc52 SHA512 7290d0ccd2a5e72747a5a06f989bf58fb5489b85bf35c68b1572545a3edbdf6a17e7358107ef0eeb394f59546186998e8091eedae129d95eb6b4eee5c2cd3995
 MISC metadata.xml 428 BLAKE2B 961cd7fc3036c8f5a641cb97de57765c423f157430bf1fd68ce7febf24713ab1b15080e03f568d20f6360da467044ea4ed1d3ee7bfb132250951b4239df58980 SHA512 49ffa8dee6be29ab8adacbc0717dc574ad15f690fa1e0726b2a9de439f90867d3770e3628734d9a7457aa45896334d96f15a51e217ad248c766271aa62d85061
diff --git a/x11-terms/kitty/kitty-0.7.1-r3.ebuild b/x11-terms/kitty/kitty-0.7.1-r3.ebuild
deleted file mode 100644
index 218ebd982fec..000000000000
--- a/x11-terms/kitty/kitty-0.7.1-r3.ebuild
+++ /dev/null
@@ -1,83 +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
-
-DESCRIPTION="A modern, hackable, featureful, OpenGL-based terminal emulator"
-HOMEPAGE="https://github.com/kovidgoyal/kitty"
-SRC_URI="https://github.com/kovidgoyal/kitty/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-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/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}"/${P}-flags.patch
-	"${FILESDIR}"/${P}-svg-icon.patch
-)
-
-src_prepare() {
-	default
-
-	# respect libdir
-	sed -i "/libdir =/s/'lib'/'$(get_libdir)'/" setup.py || die
-	sed -i "s#/../lib/kitty#/../$(get_libdir)/kitty#" linux-launcher.c || die
-
-	# 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 "") 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.0.ebuild b/x11-terms/kitty/kitty-0.8.2-r1.ebuild
index e92bab9de3b4..b51c9110b0ed 100644
--- a/x11-terms/kitty/kitty-0.8.0.ebuild
+++ b/x11-terms/kitty/kitty-0.8.2-r1.ebuild
@@ -31,6 +31,7 @@ COMMON_DEPS="
 	media-libs/fontconfig
 	x11-libs/libXcursor
 	x11-libs/libXrandr
+	x11-libs/libXi
 	x11-libs/libXinerama
 	x11-libs/libxkbcommon[X]
 	wayland? (
@@ -54,10 +55,6 @@ PATCHES=(
 src_prepare() {
 	default
 
-	# respect libdir
-	sed -i "/libdir =/s/'lib'/'$(get_libdir)'/" setup.py || die
-	sed -i "s#/../lib/kitty#/../$(get_libdir)/kitty#" linux-launcher.c || die
-
 	# disable wayland as required
 	if ! use wayland; then
 		sed -i "/'x11 wayland'/s/ wayland//" setup.py || die
@@ -72,7 +69,7 @@ doecho() {
 }
 
 src_compile() {
-	doecho "${EPYTHON}" setup.py --verbose $(usex debug --debug "") linux-package
+	doecho "${EPYTHON}" setup.py --verbose $(usex debug --debug "") --libdir-name $(get_libdir) linux-package
 }
 
 src_test() {
diff --git a/x11-terms/kitty/kitty-9999.ebuild b/x11-terms/kitty/kitty-9999.ebuild
index e92bab9de3b4..b51c9110b0ed 100644
--- a/x11-terms/kitty/kitty-9999.ebuild
+++ b/x11-terms/kitty/kitty-9999.ebuild
@@ -31,6 +31,7 @@ COMMON_DEPS="
 	media-libs/fontconfig
 	x11-libs/libXcursor
 	x11-libs/libXrandr
+	x11-libs/libXi
 	x11-libs/libXinerama
 	x11-libs/libxkbcommon[X]
 	wayland? (
@@ -54,10 +55,6 @@ PATCHES=(
 src_prepare() {
 	default
 
-	# respect libdir
-	sed -i "/libdir =/s/'lib'/'$(get_libdir)'/" setup.py || die
-	sed -i "s#/../lib/kitty#/../$(get_libdir)/kitty#" linux-launcher.c || die
-
 	# disable wayland as required
 	if ! use wayland; then
 		sed -i "/'x11 wayland'/s/ wayland//" setup.py || die
@@ -72,7 +69,7 @@ doecho() {
 }
 
 src_compile() {
-	doecho "${EPYTHON}" setup.py --verbose $(usex debug --debug "") linux-package
+	doecho "${EPYTHON}" setup.py --verbose $(usex debug --debug "") --libdir-name $(get_libdir) linux-package
 }
 
 src_test() {
diff --git a/x11-terms/mlterm/Manifest b/x11-terms/mlterm/Manifest
index 6744d8041034..3fef835b2dbd 100644
--- a/x11-terms/mlterm/Manifest
+++ b/x11-terms/mlterm/Manifest
@@ -1,8 +1,8 @@
 AUX mlterm-font.patch 606 BLAKE2B 5d9989a2656a0375e79c189db88167f443c3f7ee6f7f8b83972b65cc59b455fcb2c2ee6c4a25c82bb48cb2610d7453a5552b0eb5a17bd80eed947418a038b252 SHA512 60e625e554341feda77a926f3a59c4858ab19a810eeba39810701c429a504666643e1a614586b88379fe2d42606865f0afa8da6c14c1499a52aa1200e8bd5c4a
 DIST mlterm-3.8.0.tar.gz 3756779 BLAKE2B 401695dceb90357f0822346e3d4e00360faded3729fb091b217ed232909f1e2e60bfb554e50d162f38115e77b425041f711f136756fbb2a349512c98dc538be4 SHA512 86d163aaf24668dea77e54ff775cb448c6c699bcc82e1d84fe9a9fbed90d9c834ee3e61348de77713b2dbd229b37b76d2be817d788710f224cd5c53e7f93049f
-DIST mlterm-3.8.2.tar.gz 3836220 BLAKE2B 090b5ce89e1f86f20e1e2cc9e982c93258334176b1e6ae748ddc10e3aed560e5cc12fa6eb37a93b55ac977578b684df6fa4056c01e31236ef76943d3dee3a69f SHA512 f0dafdc60cec8d221681669f7d53bc46615b22b05fe5d3de21946c7b62ec1631acedda4e80530e84df3be6234d198cd35a1595a73626884f2b21d03a09ecdace
 DIST mlterm-3.8.4.tar.gz 3881872 BLAKE2B 647810585b0143d0f680c99032cf478e02047acc80086b4c9cbadc59df49e09ba1626ee2ff2c8a1842c68047632c61001d31f7282d9eb8619f0260de7f0bb976 SHA512 6afe0a60001f180df18f2d2ad5e2954a1d9423313d7784eb0cf6a9736c6a62545f461d8e3d079aa1f43eb5f27f4b0c060a7da54e08bf758b283005b16aa1e5cd
+DIST mlterm-3.8.5.tar.gz 3928532 BLAKE2B e5d13ea0e67d4bce1470f585b419cb073552d68115f08b5051f66a90a9887ffba2794829be52d852ef2ed36502a3ef8ea8235b2b668804599efb74f65392b4e6 SHA512 c43a121ed6572bdd4501a6b27f54df65ff2c09682485c7902c5cbd6b4be64f35efcf8cce3923d77afc412d681a390edc240a6a2503478ea97e0c4953e0b807a7
 EBUILD mlterm-3.8.0.ebuild 2660 BLAKE2B 845ab4707ebb7bb94a0db3021447296c2f0e746c9971fb53f5c274bf979315cee00e5e633128a66825b46caa45d43b55545ccba19d8a17bbcd03fc3f0f5c538b SHA512 b7e16960a4808a682eeba79693b812116078a274dd956fc4a38b3f7622ce1b88549ab94480264f751f0f6b6b5aea0cfc529a086656c833cdd086283bbdc27977
-EBUILD mlterm-3.8.2.ebuild 2779 BLAKE2B fe23280fe561eafaa69705abfbbf6b83b6af8d3e89bdd003d7ac2fdea6b99b21e01a0f0638efca34ad4e4ca271c13feaef8314e7dc307ae5dfa0cbfe9287018f SHA512 de0ce6cd5743fcd2f39bf02762c8352141aa8065efaeb53dcba08473cd604cbd749577c1deb82051a21ac83824d39ecbb2ad37e933b17694301f9402272f32d3
 EBUILD mlterm-3.8.4.ebuild 2773 BLAKE2B 64356c8b2c0338c3980ed6196a7cd966cb38be1dea8ae055d0018a3b76dca22e7a0b53616cdf4b77527961d3b9c32ce278a7961ee8334e5914e9ca8a5dfcc706 SHA512 0ce9223cdb92319b1f6b3afe2138279fb323556197c03afdea960b86bae50bc2746c93117eae9715d00662f96e69659782a53f31a508b3ce0219e461fb010901
+EBUILD mlterm-3.8.5.ebuild 2866 BLAKE2B 9a00f9be967a56cd37c1b623cab1fd8ece845ccf12ba0ba6025a1ab8858c374fb0346d7478db4a49f405c6c19fb78eb3d854aa053590e4511b1be2f56473b90d SHA512 bb73cb7ed62204ccc00c4c72d08eae54e4860135b2af951645cc9e74736ef40472587b26d3cf97cdbf9147a4e8e611f18ab8fd3c9c322e6998f65b8d5b31c950
 MISC metadata.xml 1178 BLAKE2B ab3f2d3d8940de1bf6d1444095230d7dbfd9567d4349dea99fe3c73dec68d077c9c360876210cb17c62a0c41d8b50a24569449ede58554dc300396c2bb68d3a4 SHA512 358608208d6ce16bfa3e9e792ca85921b4368d6a6c5c0934aaeb5819f985e276cd4de8a35a54ea5699d1e988cd1c08aab669eab1939ff78753b29c3668425a6f
diff --git a/x11-terms/mlterm/mlterm-3.8.2.ebuild b/x11-terms/mlterm/mlterm-3.8.5.ebuild
index 2babacfcbd35..b196e452cc99 100644
--- a/x11-terms/mlterm/mlterm-3.8.2.ebuild
+++ b/x11-terms/mlterm/mlterm-3.8.5.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"
@@ -57,9 +57,11 @@ PATCHES=( "${FILESDIR}"/${PN}-font.patch )
 DOCS=( doc/{en,ja} )
 
 src_prepare() {
+	# workaround for USE=fb
+	sed -i "/^[[:space:]]*main /s/\(main man\)/libvterm \1/" configure
 	# default config
 	sed -i \
-		-e "/ icon_path =/aicon_path = ${EPREFIX}/usr/share/pixmaps/mlterm-icon.svg" \
+		-e "/ icon_path =/aicon_path = ${EPREFIX}/usr/share/pixmaps/${PN}-icon.svg" \
 		-e "/ scrollbar_view_name =/ascrollbar_view_name = sample" \
 		etc/main
 
@@ -90,7 +92,7 @@ src_configure() {
 	)
 
 	local scrollbars="sample,extra"
-	local tools="mlclient,mlcc,mlfc,mlmenu,mlterm-zoom"
+	local tools="mlclient,mlcc,mlfc,mlmenu,${PN}-zoom"
 	if use gtk; then
 		myconf+=(
 			$(use_with gtk gtk $(usex gtk2 2.0 3.0))
@@ -120,6 +122,6 @@ src_install () {
 	docinto contrib/icon
 	dodoc contrib/icon/README
 
-	doicon contrib/icon/mlterm*
-	make_desktop_entry mlterm mlterm mlterm-icon "System;TerminalEmulator"
+	doicon contrib/icon/${PN}*
+	make_desktop_entry ${PN} ${PN} ${PN}-icon "System;TerminalEmulator"
 }