[-- Attachment #1: Type: text/plain, Size: 400 bytes --] There is a new pull request by paper42 against master on the void-packages repository https://github.com/paper42/void-packages unicorn-python https://github.com/void-linux/void-packages/pull/35365 MoinMoin: remove package @Piraty #### Testing the changes - I tested the changes in this PR: **briefly** A patch file from https://github.com/void-linux/void-packages/pull/35365.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-unicorn-python-35365.patch --] [-- Type: text/x-diff, Size: 2861 bytes --] From b228e5e3874bb3664cb25bef929b13f2d28da1e8 Mon Sep 17 00:00:00 2001 From: Michal Vasilek <michal@vasilek.cz> Date: Thu, 3 Feb 2022 00:10:47 +0100 Subject: [PATCH] unicorn-python: remove package * python2 bindings, unused --- srcpkgs/removed-packages/template | 2 ++ srcpkgs/unicorn-python | 1 - srcpkgs/unicorn/template | 22 +++------------------- 3 files changed, 5 insertions(+), 20 deletions(-) delete mode 120000 srcpkgs/unicorn-python diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index 551d4d6db41a..549f9e360a95 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -280,6 +280,7 @@ replaces=" python-pytest-relaxed<=1.1.2_2 python-requests<=2.26.0_2 python-sqlite<=2.8.3_1 + python-unicorn>=0 python-urllib3<=1.26.6_2 python-xlib<0.29_1 python3-Django<=3.0.7_2 @@ -340,6 +341,7 @@ replaces=" traverso<=0.49.6_2 ttyload-git<=20141117_4 tuxc<=1.1_3 + unicorn<=1.0.2_2 urlmatch-git<=20141116_2 uwsgi-python<=2.0.18_3 v8<=3.24.35.33_4 diff --git a/srcpkgs/unicorn-python b/srcpkgs/unicorn-python deleted file mode 120000 index 20c8576391e6..000000000000 --- a/srcpkgs/unicorn-python +++ /dev/null @@ -1 +0,0 @@ -unicorn \ No newline at end of file diff --git a/srcpkgs/unicorn/template b/srcpkgs/unicorn/template index 2389b1ca9869..c0e7bf419b9e 100644 --- a/srcpkgs/unicorn/template +++ b/srcpkgs/unicorn/template @@ -2,7 +2,7 @@ pkgname=unicorn version=1.0.2 revision=2 -hostmakedepends="python-devel python3-devel python-setuptools python3-setuptools" +hostmakedepends="python3-devel python3-setuptools" short_desc="Lightweight multi-platform, multi-architecture CPU emulator framework" maintainer="Piraty <piraty1@inbox.ru>" license="GPL-2.0-only" @@ -19,18 +19,13 @@ do_build() { make $makejobs make $makejobs -C bindings cd bindings/python - for pyver in $py2_ver $py3_ver; do - python${pyver} setup.py build --build-base=build-${pyver} - done + python3 setup.py build } do_install() { make DESTDIR=${DESTDIR} install cd bindings/python - for pyver in $py2_ver $py3_ver; do - python${pyver} setup.py build --build-base=build-${pyver} \ - install --prefix=/usr --root=${DESTDIR} - done + python3 setup.py build install --prefix=/usr --root=${DESTDIR} } unicorn-devel_package() { @@ -44,20 +39,9 @@ unicorn-devel_package() { } } -unicorn-python_package() { - replaces="python-unicorn>=0" - depends="${sourcepkg}-devel>=${version}_${revision} python-setuptools" - short_desc+=" - Python2 bindings" - pycompile_module="unicorn" - pkg_install() { - vmove ${py2_sitelib} - } -} - unicorn-python3_package() { depends="${sourcepkg}-devel>=${version}_${revision} python3-setuptools" short_desc+=" - Python3 bindings" - pycompile_module="unicorn" pkg_install() { vmove ${py3_sitelib} }
[-- Attachment #1: Type: text/plain, Size: 180 bytes --] New review comment by abenson on void-packages repository https://github.com/void-linux/void-packages/pull/35365#discussion_r798150611 Comment: Why are you replacing `unicorn`?
[-- Attachment #1: Type: text/plain, Size: 173 bytes --] New review comment by abenson on void-packages repository https://github.com/void-linux/void-packages/pull/35365#discussion_r798150836 Comment: This would need a revbump.
[-- Attachment #1: Type: text/plain, Size: 411 bytes --] There is an updated pull request by paper42 against master on the void-packages repository https://github.com/paper42/void-packages unicorn-python https://github.com/void-linux/void-packages/pull/35365 unicorn-python: remove package @Piraty #### Testing the changes - I tested the changes in this PR: **briefly** A patch file from https://github.com/void-linux/void-packages/pull/35365.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-unicorn-python-35365.patch --] [-- Type: text/x-diff, Size: 2868 bytes --] From 72bf8c5d40295c00eaa758cb95ed3c10c72c2a97 Mon Sep 17 00:00:00 2001 From: Michal Vasilek <michal@vasilek.cz> Date: Thu, 3 Feb 2022 00:10:47 +0100 Subject: [PATCH] unicorn-python: remove package * python2 bindings, unused --- srcpkgs/removed-packages/template | 2 ++ srcpkgs/unicorn-python | 1 - srcpkgs/unicorn/template | 22 +++------------------- 3 files changed, 5 insertions(+), 20 deletions(-) delete mode 120000 srcpkgs/unicorn-python diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index 50a0a2c34756..6f7a3314ed44 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -280,6 +280,7 @@ replaces=" python-pytest-relaxed<=1.1.2_2 python-requests<=2.26.0_2 python-sqlite<=2.8.3_1 + python-unicorn>=0 python-urllib3<=1.26.6_2 python-xlib<0.29_1 python3-Django<=3.0.7_2 @@ -341,6 +342,7 @@ replaces=" traverso<=0.49.6_2 ttyload-git<=20141117_4 tuxc<=1.1_3 + unicorn-python<=1.0.2_2 urlmatch-git<=20141116_2 uwsgi-python<=2.0.18_3 v8<=3.24.35.33_4 diff --git a/srcpkgs/unicorn-python b/srcpkgs/unicorn-python deleted file mode 120000 index 20c8576391e6..000000000000 --- a/srcpkgs/unicorn-python +++ /dev/null @@ -1 +0,0 @@ -unicorn \ No newline at end of file diff --git a/srcpkgs/unicorn/template b/srcpkgs/unicorn/template index 2389b1ca9869..c0e7bf419b9e 100644 --- a/srcpkgs/unicorn/template +++ b/srcpkgs/unicorn/template @@ -2,7 +2,7 @@ pkgname=unicorn version=1.0.2 revision=2 -hostmakedepends="python-devel python3-devel python-setuptools python3-setuptools" +hostmakedepends="python3-devel python3-setuptools" short_desc="Lightweight multi-platform, multi-architecture CPU emulator framework" maintainer="Piraty <piraty1@inbox.ru>" license="GPL-2.0-only" @@ -19,18 +19,13 @@ do_build() { make $makejobs make $makejobs -C bindings cd bindings/python - for pyver in $py2_ver $py3_ver; do - python${pyver} setup.py build --build-base=build-${pyver} - done + python3 setup.py build } do_install() { make DESTDIR=${DESTDIR} install cd bindings/python - for pyver in $py2_ver $py3_ver; do - python${pyver} setup.py build --build-base=build-${pyver} \ - install --prefix=/usr --root=${DESTDIR} - done + python3 setup.py build install --prefix=/usr --root=${DESTDIR} } unicorn-devel_package() { @@ -44,20 +39,9 @@ unicorn-devel_package() { } } -unicorn-python_package() { - replaces="python-unicorn>=0" - depends="${sourcepkg}-devel>=${version}_${revision} python-setuptools" - short_desc+=" - Python2 bindings" - pycompile_module="unicorn" - pkg_install() { - vmove ${py2_sitelib} - } -} - unicorn-python3_package() { depends="${sourcepkg}-devel>=${version}_${revision} python3-setuptools" short_desc+=" - Python3 bindings" - pycompile_module="unicorn" pkg_install() { vmove ${py3_sitelib} }
[-- Attachment #1: Type: text/plain, Size: 179 bytes --] New review comment by paper42 on void-packages repository https://github.com/void-linux/void-packages/pull/35365#discussion_r799827778 Comment: oh, thank you for catching this!
[-- Attachment #1: Type: text/plain, Size: 265 bytes --] New review comment by paper42 on void-packages repository https://github.com/void-linux/void-packages/pull/35365#discussion_r799828459 Comment: As we discussed on IRC, it shouldn't be necessary because all remaining subpackages will still install the same files.
[-- Attachment #1: Type: text/plain, Size: 248 bytes --] There's a merged pull request on the void-packages repository unicorn-python: remove package https://github.com/void-linux/void-packages/pull/35365 Description: @Piraty #### Testing the changes - I tested the changes in this PR: **briefly**
[-- Attachment #1: Type: text/plain, Size: 145 bytes --] New comment by Piraty on void-packages repository https://github.com/void-linux/void-packages/pull/35365#issuecomment-1030851423 Comment: fine