From 910282b6c1a1d0c170678fd848a7d7d534ff9ccc Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Thu, 23 Jul 2020 21:25:17 -0400 Subject: [PATCH] python-prompt_toolkit1: update to 1.0.18; remove python3 subpackage --- .../python3-prompt_toolkit1.INSTALL.msg | 2 + srcpkgs/python-prompt_toolkit1/template | 40 ++++++------------- srcpkgs/python-prompt_toolkit1/update | 2 + srcpkgs/python3-prompt_toolkit | 1 - 4 files changed, 16 insertions(+), 29 deletions(-) create mode 100644 srcpkgs/python-prompt_toolkit1/python3-prompt_toolkit1.INSTALL.msg create mode 100644 srcpkgs/python-prompt_toolkit1/update delete mode 120000 srcpkgs/python3-prompt_toolkit diff --git a/srcpkgs/python-prompt_toolkit1/python3-prompt_toolkit1.INSTALL.msg b/srcpkgs/python-prompt_toolkit1/python3-prompt_toolkit1.INSTALL.msg new file mode 100644 index 00000000000..83ded3f3da3 --- /dev/null +++ b/srcpkgs/python-prompt_toolkit1/python3-prompt_toolkit1.INSTALL.msg @@ -0,0 +1,2 @@ +python3-prompt_toolkit1 is no longer provided by Void Linux, and will be fully +removed from the repos on 2021/01/23 diff --git a/srcpkgs/python-prompt_toolkit1/template b/srcpkgs/python-prompt_toolkit1/template index 7afe6179f33..70516738c27 100644 --- a/srcpkgs/python-prompt_toolkit1/template +++ b/srcpkgs/python-prompt_toolkit1/template @@ -1,50 +1,34 @@ # Template file for 'python-prompt_toolkit1' pkgname=python-prompt_toolkit1 reverts="2.0.9_1" -version=1.0.15 -revision=4 +version=1.0.18 +revision=1 archs=noarch wrksrc="prompt_toolkit-${version}" -build_style=python-module -pycompile_module="prompt_toolkit" -hostmakedepends="python-setuptools python3-setuptools" +build_style=python2-module +hostmakedepends="python-setuptools" depends="python-six python-wcwidth" short_desc="Python2 library for building powerful interactive command lines" maintainer="xaltsc " license="BSD-3-Clause" -homepage="https://github.com/jonathanslenders/python-prompt-toolkit" +homepage="https://github.com/prompt-toolkit/python-prompt-toolkit" distfiles="${PYPI_SITE}/p/prompt_toolkit/prompt_toolkit-${version}.tar.gz" -checksum=858588f1983ca497f1cf4ffde01d978a3ea02b01c8a26a8bbc5cd2e66d816917 -conflicts="python-prompt_toolkit2" +checksum=dd4fca02c8069497ad931a2d09914c6b0d1b50151ce876bc15bde4c747090126 +conflicts="python-prompt_toolkit2<=2.0.9_4" post_install() { vlicense LICENSE } python3-prompt_toolkit1_package() { - archs=noarch - pycompile_module="prompt_toolkit" - depends="python3-six python3-wcwidth" - short_desc="${short_desc/Python2/Python3}" - conflicts="python3-prompt_toolkit2" - pkg_install() { - vmove usr/lib/python3* - vlicense LICENSE - } + build_style=meta + short_desc="Python3 library for building command lines (removed package)" + license="metapackage" } python-prompt_toolkit_package() { - archs=noarch reverts="2.0.9_1" build_style=meta - depends="python-prompt_toolkit1-${version}_${revision}" - short_desc="${short_desc} (transition package)" -} - -python3-prompt_toolkit_package() { - archs=noarch - reverts="2.0.9_1" - build_style=meta - depends="python3-prompt_toolkit1-${version}_${revision}" - short_desc="${short_desc/Python2/Python3} (transition package)" + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" (transitional dummy package)" } diff --git a/srcpkgs/python-prompt_toolkit1/update b/srcpkgs/python-prompt_toolkit1/update new file mode 100644 index 00000000000..9b10459879a --- /dev/null +++ b/srcpkgs/python-prompt_toolkit1/update @@ -0,0 +1,2 @@ +site="https://pypi.org/simple/prompt_toolkit/" +pattern='prompt_toolkit-\K1\.[0-9.]+(?=.tar.gz)' diff --git a/srcpkgs/python3-prompt_toolkit b/srcpkgs/python3-prompt_toolkit deleted file mode 120000 index 1e14e8845b4..00000000000 --- a/srcpkgs/python3-prompt_toolkit +++ /dev/null @@ -1 +0,0 @@ -python-prompt_toolkit1 \ No newline at end of file