gentoo resync : 02.08.2019

5 files changed, 59 insertions, 57 deletions

diff --git a/app-vim/vimoutliner/Manifest b/app-vim/vimoutliner/Manifest
index 4dc3012f27d7..79f56ab2d7e3 100644
--- a/app-vim/vimoutliner/Manifest
+++ b/app-vim/vimoutliner/Manifest
@@ -1,7 +1,7 @@
 AUX vimoutliner-0.3.6-fix-shebangs.patch 972 BLAKE2B 2b747133ecc49f4654131bbb963ac23ae291d186cfed97e944fd5e757cbe3288e5dafc243f4caea2acbeb56c27e92d257565a84fbcc8a4900a6287056e8e38bf SHA512 44bb6760c11a21ab817141cae5817cc4d5b88a5c94ca4e30238d9e009f080d5ae98522dcde910d5352090e7bf998ad47fa658a56bb16bb50ca905b14e5d2df2b
 DIST vimoutliner-0.3.6.zip 249053 BLAKE2B 329fbf73423291598a104881299200153c6d98cf75f3884c690879dc3460c4190c09eefec55415589f16a426ee76911a8ee7761a158d76b9e84360f5fadb83eb SHA512 20d348ff1b1b9572956fdc56b75e742b25b7deac2637fa6972a1e451edc1f679d8255847a291b84c80866a9ad8a37421524b8eb33565a1bb32ff2b75d0b68dde
 DIST vimoutliner-0.4.0_p20180301.tar.gz 367361 BLAKE2B a97df5c154e6ed9b3209bd90bd57b4166877f02b9513351fda0e841de84334a1e592e1ed56b46cc59bc6bb64f3c763cdca81df3f8696f3c348a8ef4744124c02 SHA512 f9f369e7e7f09dac04b58a27a86dc2121b3aacd0002537db348517e779fd1b7c9e88ae905b4b42aace10f79cb8f91acada1ad58e26f2257e46d1af98347eab62
-EBUILD vimoutliner-0.3.6-r1.ebuild 1264 BLAKE2B a48fc8a75d18829d1d9e35c800ead9fa1075819e55a28078b2fbe4149ac7f1a9d532ded7929a72f177c7f22d912825f55a89c571eb8b493c4479027746da5421 SHA512 20984869fcfa1947334619f9dee9feede43e60c883d853778c4afbf6024c213734b0f5cbe86df453388a3f40e863a71c9f665150749e37fed1476d6d0a4ae037
-EBUILD vimoutliner-0.3.6.ebuild 694 BLAKE2B 7e0c7ddda16ac846fe5794192e6d24eafa25b8910b5fe259568c8ff7dc92117d8711fa61364abf0be8008e7c0a42e2726eb70a26e5d38eff8e09bff6de35cd90 SHA512 61b12471b3bdf1ff68ea13260c73d12df79e4a2d704758f40ebc276bb3e051c4681bf66af07b636452d28a52f0bb4168f5360e4d2deed19aaf025924ae2aacc4
-EBUILD vimoutliner-0.4.0_p20180301.ebuild 1056 BLAKE2B fe31bb24b29306a003e36030daeab78f0c1ae4501145f5a00a70b9d12bfc63601638dbc293ed2380aadbd40836244dfb2202e7738fc3512cb1bacfe532860934 SHA512 b753d9c8b73d9a1ffe21780b9d80bd76a222b1baa4c3a795f7e5ae97efa2e0a114faece37981c41ad2a842b0ec73b6fe6f55f1d015068467d6421e467be982ce
+EBUILD vimoutliner-0.3.6-r1.ebuild 694 BLAKE2B 7e0c7ddda16ac846fe5794192e6d24eafa25b8910b5fe259568c8ff7dc92117d8711fa61364abf0be8008e7c0a42e2726eb70a26e5d38eff8e09bff6de35cd90 SHA512 61b12471b3bdf1ff68ea13260c73d12df79e4a2d704758f40ebc276bb3e051c4681bf66af07b636452d28a52f0bb4168f5360e4d2deed19aaf025924ae2aacc4
+EBUILD vimoutliner-0.3.6-r2.ebuild 1298 BLAKE2B f1e86d39b5de8608b2094f43a5ab1cb07186203e1ca2e53614ec80472397b868ecc528088cab6f8a9dee8f10f317a4212980dde1d0c1a81a2d99c681f976971c SHA512 9f3bfe6dba7bbcadf8e0dfcd86a49042f8afe7548afd2b0fe33b14fccb0ded4fb65fa25868434ba62bde9bf3f7f295755f9ed53518901c7705157b02f9bd96d7
+EBUILD vimoutliner-0.4.0_p20180301-r1.ebuild 1094 BLAKE2B 06f2432288653826cb839fb0043701444355c2dd1161a5baa0d7f99eae6d4a987ca99c09858c810af284472dcf9a80971d6681cbdc940137d19410ef022515b7 SHA512 56413d64eda82ed2cc01813b6dab78769e28498f9013e483948461c5e7da111fba1e3b10374f188db8712d5009cb5861942b0db3450d9f553c0d9006df713520
 MISC metadata.xml 337 BLAKE2B c4ae899109190b6ad14fcc71ff0dbea76f7ab6b731992174b4623847291d63bb8cbdc7e73cd92343beafdba086e0b54c4cda686593ef8b836f8add578b0459d0 SHA512 782f682a6837436ee5db28f818b2168035fbae243aa466077053e17842fec96672d702b818ad28a9f1d0b8fa1a1e2fb79b056d2e31bc09d5bf522d5f18ea1c7b
diff --git a/app-vim/vimoutliner/vimoutliner-0.3.6-r1.ebuild b/app-vim/vimoutliner/vimoutliner-0.3.6-r1.ebuild
index d7c15479021b..36ebfb95a0a7 100644
--- a/app-vim/vimoutliner/vimoutliner-0.3.6-r1.ebuild
+++ b/app-vim/vimoutliner/vimoutliner-0.3.6-r1.ebuild
@@ -1,31 +1,19 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit vim-plugin python-single-r1
+inherit vim-plugin
 
 DESCRIPTION="vim plugin: easy and fast outlining"
 HOMEPAGE="https://github.com/vimoutliner/vimoutliner"
 SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.zip -> ${P}.zip"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
 
 VIM_PLUGIN_HELPFILES="vimoutliner"
 VIM_PLUGIN_MESSAGES="filetype"
 
-PATCHES=( "${FILESDIR}/${P}-fix-shebangs.patch" )
-
-RDEPEND="dev-python/autopep8"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
 src_prepare() {
 	default
 	sed -i -e '/^if exists/,/endif/d' ftdetect/vo_base.vim || die
@@ -33,16 +21,3 @@ src_prepare() {
 	rm -v install.sh || die
 	find "${S}" -type f -exec chmod a+r {} \; || die
 }
-
-src_compile() {
-	local pyscript _pyscript
-	for pyscript in $(find "${S}" -type f -name \*.py); do
-		_pyscript=$(basename "${pyscript}")
-		einfo "Processing ${_pyscript}"
-		sed -i -e 's#[ \t]*$##g;' "${pyscript}" || die
-		2to3 --no-diffs -w -n "${pyscript}" 2> /dev/null || die
-		autopep8 -i "${pyscript}" || die
-		python_fix_shebang -q "${pyscript}" || die
-		eend $?
-	done
-}
diff --git a/app-vim/vimoutliner/vimoutliner-0.3.6-r2.ebuild b/app-vim/vimoutliner/vimoutliner-0.3.6-r2.ebuild
new file mode 100644
index 000000000000..b9d58e98e883
--- /dev/null
+++ b/app-vim/vimoutliner/vimoutliner-0.3.6-r2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+
+inherit vim-plugin python-single-r1
+
+DESCRIPTION="vim plugin: easy and fast outlining"
+HOMEPAGE="https://github.com/vimoutliner/vimoutliner"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.zip -> ${P}.zip"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+VIM_PLUGIN_HELPFILES="vimoutliner"
+VIM_PLUGIN_MESSAGES="filetype"
+
+PATCHES=( "${FILESDIR}/${P}-fix-shebangs.patch" )
+
+RDEPEND="${PYTHON_DEPS}
+	dev-python/autopep8[${PYTHON_USEDEP}]"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	sed -i -e '/^if exists/,/endif/d' ftdetect/vo_base.vim || die
+	sed -i -e 's/g:vo_modules2load/g:vo_modules_load/' vimoutliner/vimoutlinerrc || die
+	rm -v install.sh || die
+	find "${S}" -type f -exec chmod a+r {} \; || die
+}
+
+src_compile() {
+	local pyscript _pyscript
+	for pyscript in $(find "${S}" -type f -name \*.py); do
+		_pyscript=$(basename "${pyscript}")
+		einfo "Processing ${_pyscript}"
+		sed -i -e 's#[ \t]*$##g;' "${pyscript}" || die
+		2to3 --no-diffs -w -n "${pyscript}" 2> /dev/null || die
+		autopep8 -i "${pyscript}" || die
+		python_fix_shebang -q "${pyscript}" || die
+		eend $?
+	done
+}
diff --git a/app-vim/vimoutliner/vimoutliner-0.3.6.ebuild b/app-vim/vimoutliner/vimoutliner-0.3.6.ebuild
deleted file mode 100644
index 36ebfb95a0a7..000000000000
--- a/app-vim/vimoutliner/vimoutliner-0.3.6.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit vim-plugin
-
-DESCRIPTION="vim plugin: easy and fast outlining"
-HOMEPAGE="https://github.com/vimoutliner/vimoutliner"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.zip -> ${P}.zip"
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
-
-VIM_PLUGIN_HELPFILES="vimoutliner"
-VIM_PLUGIN_MESSAGES="filetype"
-
-src_prepare() {
-	default
-	sed -i -e '/^if exists/,/endif/d' ftdetect/vo_base.vim || die
-	sed -i -e 's/g:vo_modules2load/g:vo_modules_load/' vimoutliner/vimoutlinerrc || die
-	rm -v install.sh || die
-	find "${S}" -type f -exec chmod a+r {} \; || die
-}
diff --git a/app-vim/vimoutliner/vimoutliner-0.4.0_p20180301.ebuild b/app-vim/vimoutliner/vimoutliner-0.4.0_p20180301-r1.ebuild
index 693542279762..91f8bce967ca 100644
--- a/app-vim/vimoutliner/vimoutliner-0.4.0_p20180301.ebuild
+++ b/app-vim/vimoutliner/vimoutliner-0.4.0_p20180301-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -22,13 +22,14 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 VIM_PLUGIN_HELPFILES="vimoutliner"
 VIM_PLUGIN_MESSAGES="filetype"
 
-RDEPEND="dev-python/autopep8"
+RDEPEND="${PYTHON_DEPS}
+	dev-python/autopep8[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}"
 
 src_prepare() {
 	default
 
-	sed -i -e '1s:^:#!/usr/bin/python\n:' vimoutliner/scripts/otl2latex/otl2latex.py
+	sed -i -e '1s:^:#!/usr/bin/python\n:' vimoutliner/scripts/otl2latex/otl2latex.py || die
 	find "${S}" -type f -exec chmod a+r {} \; || die
 }