gentoo resync : 30.09.2018

8 files changed, 73 insertions, 91 deletions

diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index bedbe72b5c96..e9de99c7e95f 100644
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
diff --git a/app-shells/bash-completion/Manifest b/app-shells/bash-completion/Manifest
index ea20b3ee5dc0..1b572fa00928 100644
--- a/app-shells/bash-completion/Manifest
+++ b/app-shells/bash-completion/Manifest
@@ -4,5 +4,5 @@ DIST bash-completion-2.8.tar.xz 286128 BLAKE2B a99faeb3c9ee2ea6d1cc9988e61951f4e
 DIST bashcomp-2.0.2.tar.gz 3625 BLAKE2B ebd835e23634e8a7491467ad66c53941763cea43bad75fe24982d3885be2d2ba132e5273a655fec34705224315d7a3f0248c030fb7685fc613ac4f489cde5bf5 SHA512 46bc1bcc32263135f44be68569459a409250dd2c81c18190735f11e13a26508e9d3cb91d24a8fe7b21bdea678347873b7ac1b67d5e8c78c8444011f85dfdcdce
 EBUILD bash-completion-2.7-r3.ebuild 4109 BLAKE2B b19159a733eb34738622add375c11d71dad1b5bee4c16b3d7bf2b2d588757e0b412807601a3e9ab9a2bb9e1a796354d59f3fbe796f91577d7eb5368c499896f5 SHA512 2e91fc722b51b39cef6ba2892645cac41321d840e14d3774732084f6a091859d5ff01282e10a7ce1cc5ed89ed8e1473fe7afee551f0df4c1104b4d44dd7c770a
 EBUILD bash-completion-2.8.ebuild 4068 BLAKE2B 45ddc9957d0a244be75adf3e9e2654987b64394f8a30e80fd28fe7621abfe46b7b9f79b8dcf067118ddc2f5bbf1ae238708d04d132cbadbc2be6879e9f39aa10 SHA512 6d1ab2d0ec5ff94310645780428e606b476610f2e40d55ebbfd0e56c6f8fd441f5cf2df737221b0bbecab28863a5aa6eeec0028c7643fdbdf0f01835bcefc70e
-EBUILD bash-completion-9999.ebuild 3957 BLAKE2B 904e828e4d3445cdd8709e255af384e5dece5e84fc7e0871b5d8492637803a7453c93d736fbed8373adbcff3b932ecf580eff5d60958275fd8b226f34ca8a178 SHA512 90384a3dcb94da824f31b023b57019bfad9807eed8fe875b27b37debb32db177d23642b21807e38e25fa77a9dd7f7ebc8f17fe41ecd58ac9ce530c193dbecb75
+EBUILD bash-completion-9999.ebuild 4273 BLAKE2B 8719ac5d05789b937b58f4f8a74b18a1bf148b95e7494274725a24baa82bfcbe05b892824e2caa4640ff72bb2b337aa233c44a009d40bdb9f7bcef5cdbba2bd0 SHA512 dcbd4bc4b8d11b841ac0d0d2d2f1ffc11b2ebe4b212a8922db5e1c96c229c57f07fd6cd2b09abcea39a8bc9d7392309769509e09fdfa723c128557183e8880ba
 MISC metadata.xml 1309 BLAKE2B db08060cd74841bd7220e688e251225ddaf59e4da737c08785e7c6ce83c2d40600fbe38e9b9449fb559ccb2d03b8c2368295b647ec2a52191429fe1d3d1c7470 SHA512 3ee23fb6cbee1e80a0c8fab13f7bb67bdad3292fa8ec187e306b00804a7bf709358c8c08eda4101a5f5baa408e0892aa94c07ae466b5beae4edc18055b1192ee
diff --git a/app-shells/bash-completion/bash-completion-9999.ebuild b/app-shells/bash-completion/bash-completion-9999.ebuild
index 79ee3e0ac0af..766299412c53 100644
--- a/app-shells/bash-completion/bash-completion-9999.ebuild
+++ b/app-shells/bash-completion/bash-completion-9999.ebuild
@@ -4,20 +4,22 @@
 EAPI=6
 
 BASHCOMP_P=bashcomp-2.0.2
-EGIT_REPO_URI="https://github.com/scop/bash-completion"
-inherit autotools eapi7-ver git-r3
+PYTHON_COMPAT=( python3_{5,6} )
+inherit autotools eapi7-ver git-r3 python-any-r1
 
 DESCRIPTION="Programmable Completion for bash"
 HOMEPAGE="https://github.com/scop/bash-completion"
+EGIT_REPO_URI="https://github.com/scop/bash-completion"
 SRC_URI="https://bitbucket.org/mgorny/bashcomp2/downloads/${BASHCOMP_P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS=""
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 # completion collision with net-fs/mc
-RDEPEND=">=app-shells/bash-4.3_p30-r1
+RDEPEND=">=app-shells/bash-4.3_p30-r1:0
 	sys-apps/miscfiles
 	!app-eselect/eselect-bashcomp
 	!!net-fs/mc"
@@ -27,6 +29,10 @@ DEPEND="app-arch/xz-utils
 		app-misc/dtach
 		dev-util/dejagnu
 		dev-tcltk/tcllib
+		$(python_gen_any_dep '
+			dev-python/pexpect[${PYTHON_USEDEP}]
+			dev-python/pytest[${PYTHON_USEDEP}]
+		')
 	)"
 PDEPEND=">=app-shells/gentoo-bashcomp-20140911"
 
@@ -52,6 +58,11 @@ STRIP_COMPLETIONS=(
 	_rfkill
 )
 
+python_check_deps() {
+	has_version "dev-python/pexpect[${PYTHON_USEDEP}]" &&
+	has_version "dev-python/pytest[${PYTHON_USEDEP}]"
+}
+
 src_unpack() {
 	git-r3_src_unpack
 	default
diff --git a/app-shells/fzy/Manifest b/app-shells/fzy/Manifest
index a0b9bf68cf47..8d98d2e6de22 100644
--- a/app-shells/fzy/Manifest
+++ b/app-shells/fzy/Manifest
@@ -1,8 +1,6 @@
 AUX fzy-0.9-cflags.patch 299 BLAKE2B 61685e7180741ec77449b5de6fa711b4939faedd94dfcfd84ec86be0ef963b13d5a5308e294f4f22e83682982671a528b64446979fe41e112aeb8c5d143e865e SHA512 f3ea9b90a75f0a013466ef00190dbca451b22015e0a3c3f7e823f61dc2e4ef7d64f90a9685fec311675fb6c5bc788bb7436da2fd89f4f6baade4dfbee8318635
 AUX fzy-add-utf-8-support.patch 2642 BLAKE2B bdece2ab5d9122c9c2f306271b1c795c1130c145e3a434d4b831dd680bbdc09e5241763391fc2efa16a6af50cfbaf49b3fe98364f5f56a25b2d78af8fcba8a1b SHA512 203c0e8e7a9583661cd7d85cc094016eed2149a82fb55a578075e5d2fe513cbe2f7241ea76660e5990efd6b5f573f584ab3345ae832439fbea80950c64f7803b
-DIST fzy-0.9.tar.gz 42992 BLAKE2B ebc7e73e0387101da65896a4108705048bb72b01261ea86a0abeaee22fe4517ac54351d508bb79419b05a15aa9c93c5d815c34d15353d01c02381e5d342e75b7 SHA512 71a44bc3bbef3a2d82476a69b5c9e28753e760bbb8d453a9e44b57f34a79dd8ebcd510a869dfeae95f522ba6ccb4b8f10f79c081ce6bc6cfae9a41f4071fefc0
-DIST fzy-2697c02618d908e5bdcae93ab4815b04c49bd25e.tar.gz 45814 BLAKE2B bb4dbc668dd93c71d16c3affdaf148212e3fbdef27110314b8145fd4a20991bb368f7aef1d1f7bd147afa23900800c468b4d9b2999de2226ce9a312a02d344b4 SHA512 34520dc3b4bcbad3479cce1fbeb014b1851edc1b1f4460c21a645297bf9ec01a1483f108a562f6ac6d3c0def97427740b74e9a3b83c85223d14ac3e1586e3d8e
-EBUILD fzy-0.10_pre20180618.ebuild 910 BLAKE2B f85ecd8009fa3cb57e4ffa4a301bae52e66c1ff2b3e63b054c17f0d1c508975751ab5ae1f0f2f8486544e7db10925ca4366a96f546ae6259bee48d43d9a1b41c SHA512 06d1f7ed9ace6efe8edaa696be83c748fab4ef175861c8dc34273a1aa343123ea52de378e798abb7d788373ebacbe7a42df98f2a3e26288d2101c4ec2b0fec5e
-EBUILD fzy-0.9-r1.ebuild 748 BLAKE2B d79ee7668ea80c307dd08ade2ec1f9b37755bc1864c315212cd5c06b69efdb29f1afea6d6426ef76a362e1f815307e80f676ecce675ddff7cd67b8c1baa189d7 SHA512 7280d7d67a97663649cc7efc188e17ba551513c55892dc3e50c130bf35501e15a34e06739a95b25664a900518b686763de795c4e410fdb1b56ad6efd5f1bc11e
-EBUILD fzy-9999.ebuild 858 BLAKE2B f47be140cd154dac3f589da519228c7d14ed66a13cf5b31510e5a07c7aa04119c5f1a384478c3227f86aab596a56ba4cb966093a334b54631c52f67429879cd8 SHA512 cd1a846ccfbbb38b499a3ed77ce96fcec263d0c75c2478aa237803cb474a81524c1be4ae6395cdb3d2c27854d074d031729209aede9d69118dd116f128303c97
+DIST fzy-1.0.tar.gz 47432 BLAKE2B 5fef7061c797e63dabc3f77daf3dbc8a58671c257430dc8ba4680363a9ace5722562fc7e0aba618d53820e703b261dbe0182638f16223d1202080450a6c21ec2 SHA512 de5ed1af035260f4ae550c53b08c4ff302c978350784cbfd2981d1691f55d9c0f26b9333c74adea939b3f4578dd47e66ee99112e10afc5497c64011827d19dbc
+EBUILD fzy-1.0.ebuild 1101 BLAKE2B 68c394ee66018550518409ba2c4251ca671ce6a69e3e2ce489fa57dd0cf58651248488cbdf3595ab8bdd0e996c058322a302f4aa6aca85a7eb956ca1b0cd214e SHA512 caef8f3c97cdf32f43ca18262c7506f123c92bb477634438773cd8b70aff71a28deb30aff303ca0be5ce28a05480c4e278378eec11d2444cf98220dcdccce8ed
+EBUILD fzy-9999.ebuild 1101 BLAKE2B 68c394ee66018550518409ba2c4251ca671ce6a69e3e2ce489fa57dd0cf58651248488cbdf3595ab8bdd0e996c058322a302f4aa6aca85a7eb956ca1b0cd214e SHA512 caef8f3c97cdf32f43ca18262c7506f123c92bb477634438773cd8b70aff71a28deb30aff303ca0be5ce28a05480c4e278378eec11d2444cf98220dcdccce8ed
 MISC metadata.xml 892 BLAKE2B 3182bda5d04463762d724265d2ff3644eef1615dfbd2db92ad7ab5e1bf3b9e5f0f727dc55939e0c0902ed16ac78d4a39ae331d22902ec7f7f10d53a7e65a59ba SHA512 202ff3dc44543bf072b32addfc5e1ad627ec6fa16585d9ff9ddbe68bfaa784aa0319ed152621215cd60f1c2a688bb0e3ca227b78fc6b62f5dca4f39b2ad8a55b
diff --git a/app-shells/fzy/fzy-0.10_pre20180618.ebuild b/app-shells/fzy/fzy-0.10_pre20180618.ebuild
deleted file mode 100644
index 1e4cb47604e9..000000000000
--- a/app-shells/fzy/fzy-0.10_pre20180618.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit savedconfig toolchain-funcs
-
-EGIT_COMMIT="2697c02618d908e5bdcae93ab4815b04c49bd25e"
-
-DESCRIPTION="Fuzzy text selector (interactive grep) for console"
-HOMEPAGE="https://github.com/jhawthorn/fzy"
-SRC_URI="https://github.com/jhawthorn/fzy/archive/${EGIT_COMMIT}.tar.gz -> ${PN}-${EGIT_COMMIT}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-PATCHES=(
-	"${FILESDIR}"/fzy-0.9-cflags.patch
-	"${FILESDIR}"/fzy-add-utf-8-support.patch
-)
-
-S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
-
-src_prepare() {
-	default
-	restore_config config.h
-	tc-export CC
-}
-
-src_install() {
-	local DOCS=( ALGORITHM.md CHANGELOG.md README.md )
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install
-	exeinto /usr/share/fzy
-	doexe contrib/fzy-tmux
-	doexe contrib/fzy-dvtm
-	einstalldocs
-	save_config config.h
-}
diff --git a/app-shells/fzy/fzy-0.9-r1.ebuild b/app-shells/fzy/fzy-0.9-r1.ebuild
deleted file mode 100644
index 3db8979e1bd9..000000000000
--- a/app-shells/fzy/fzy-0.9-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit savedconfig toolchain-funcs
-
-DESCRIPTION="Fuzzy text selector (interactive grep) for console"
-HOMEPAGE="https://github.com/jhawthorn/fzy"
-SRC_URI="https://github.com/jhawthorn/fzy/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="test"
-
-KEYWORDS="~amd64 ~x86"
-
-PATCHES=( "${FILESDIR}"/${P}-cflags.patch )
-
-src_prepare() {
-	default
-	restore_config config.h
-
-	tc-export CC
-}
-
-src_install() {
-	local DOCS=( ALGORITHM.md CHANGELOG.md README.md )
-
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install
-	exeinto /usr/share/fzy
-	doexe contrib/fzy-tmux
-	doexe contrib/fzy-dvtm
-	einstalldocs
-	save_config config.h
-}
diff --git a/app-shells/fzy/fzy-1.0.ebuild b/app-shells/fzy/fzy-1.0.ebuild
new file mode 100644
index 000000000000..ba77064dac01
--- /dev/null
+++ b/app-shells/fzy/fzy-1.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils savedconfig toolchain-funcs
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/jhawthorn/fzy.git"
+else
+	SRC_URI="https://github.com/jhawthorn/${PN}/releases/download/${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Fuzzy text selector (interactive grep) for console"
+HOMEPAGE="https://github.com/jhawthorn/fzy"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="test"
+
+PATCHES=( "${FILESDIR}"/fzy-0.9-cflags.patch )
+
+src_prepare() {
+	default
+	restore_config config.h
+	tc-export CC
+}
+
+src_install() {
+	local DOCS=( ALGORITHM.md CHANGELOG.md README.md )
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install
+	dobin contrib/fzy-tmux
+	dobin contrib/fzy-dvtm
+	einstalldocs
+	save_config config.h
+}
+
+pkg_postinst() {
+	savedconfig_pkg_postinst
+	optfeature "opening search results in dvtm pane with provided ${EPREFIX}/usr/bin/fzy-dvtm" app-misc/dvtm
+	optfeature "opening search results in tmux pane with provided ${EPREFIX}/usr/bin/fzy-tmux" app-misc/tmux
+}
diff --git a/app-shells/fzy/fzy-9999.ebuild b/app-shells/fzy/fzy-9999.ebuild
index bbf7b6adbe55..ba77064dac01 100644
--- a/app-shells/fzy/fzy-9999.ebuild
+++ b/app-shells/fzy/fzy-9999.ebuild
@@ -3,13 +3,13 @@
 
 EAPI=6
 
-inherit savedconfig toolchain-funcs
+inherit eutils savedconfig toolchain-funcs
 
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/jhawthorn/fzy.git"
 else
-	SRC_URI="https://github.com/jhawthorn/fzy/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/jhawthorn/${PN}/releases/download/${PV}/${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi
 
@@ -31,9 +31,14 @@ src_prepare() {
 src_install() {
 	local DOCS=( ALGORITHM.md CHANGELOG.md README.md )
 	emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install
-	exeinto /usr/share/fzy
-	doexe contrib/fzy-tmux
-	doexe contrib/fzy-dvtm
+	dobin contrib/fzy-tmux
+	dobin contrib/fzy-dvtm
 	einstalldocs
 	save_config config.h
 }
+
+pkg_postinst() {
+	savedconfig_pkg_postinst
+	optfeature "opening search results in dvtm pane with provided ${EPREFIX}/usr/bin/fzy-dvtm" app-misc/dvtm
+	optfeature "opening search results in tmux pane with provided ${EPREFIX}/usr/bin/fzy-tmux" app-misc/tmux
+}