From e9d3656cb904d30e450797560f7c61455afbb6d8 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Fri, 30 Sep 2022 21:26:29 -0400 Subject: [PATCH 1/2] GCP-Guest-Environment: move to python3 supports both python 2 and 3, but was using 2 still --- srcpkgs/GCP-Guest-Environment/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/GCP-Guest-Environment/template b/srcpkgs/GCP-Guest-Environment/template index c2733015eb0b..5ec2b9a65273 100644 --- a/srcpkgs/GCP-Guest-Environment/template +++ b/srcpkgs/GCP-Guest-Environment/template @@ -1,12 +1,12 @@ # Template file for 'GCP-Guest-Environment' pkgname=GCP-Guest-Environment version=20191210 -revision=2 +revision=3 wrksrc="compute-image-packages-${version}" build_wrksrc="packages/python-google-compute-engine" -build_style=python2-module -hostmakedepends="python-setuptools" -depends="${hostmakedepends} python-boto socklog-void" +build_style=python3-module +hostmakedepends="python3-setuptools" +depends="${hostmakedepends} python3-distro socklog-void" short_desc="Packages for Google Compute Engine Linux images" maintainer="Michael Aldridge " license="Apache-2.0" From 472ba1a3c05bd42e9eca96ac5320d49a8ac2e0b0 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Fri, 30 Sep 2022 21:34:05 -0400 Subject: [PATCH 2/2] python3-boto: remove python2 package with the update of GCP-Guest-Environment to python3, no longer needed. --- srcpkgs/python-boto/template | 71 ------------------------------- srcpkgs/python3-boto | 1 - srcpkgs/python3-boto/template | 39 +++++++++++++++++ srcpkgs/removed-packages/template | 1 + 4 files changed, 40 insertions(+), 72 deletions(-) delete mode 100644 srcpkgs/python-boto/template delete mode 120000 srcpkgs/python3-boto create mode 100644 srcpkgs/python3-boto/template diff --git a/srcpkgs/python-boto/template b/srcpkgs/python-boto/template deleted file mode 100644 index 354b4d3af547..000000000000 --- a/srcpkgs/python-boto/template +++ /dev/null @@ -1,71 +0,0 @@ -# Template file for 'python-boto' -pkgname=python-boto -version=2.49.0 -revision=5 -wrksrc="boto-${version}" -build_style=python-module -pycompile_module="boto" -hostmakedepends="python-setuptools python3-setuptools" -depends="python" -short_desc="Python interface to Amazon Web Services (Python2)" -maintainer="Michael Aldridge " -license="MIT" -homepage="http://docs.pythonboto.org/" -changelog="https://raw.githubusercontent.com/boto/boto/develop/docs/source/releasenotes/v${version}.rst" -distfiles="https://github.com/boto/boto/archive/${version}.tar.gz" -checksum=3dbefd4f4542f85a323d4f54601f31ed4d362fc87945245f32e4a85029513314 -alternatives=" - boto:asadmin:/usr/bin/asadmin2 - boto:bundle_image:/usr/bin/bundle_image2 - boto:cfadmin:/usr/bin/cfadmin2 - boto:cq:/usr/bin/cq2 - boto:cwutil:/usr/bin/cwutil2 - boto:dynamodb_dump:/usr/bin/dynamodb_dump2 - boto:dynamodb_load:/usr/bin/dynamodb_load2 - boto:elbadmin:/usr/bin/elbadmin2 - boto:fetch_file:/usr/bin/fetch_file2 - boto:glacier:/usr/bin/glacier2 - boto:instance_events:/usr/bin/instance_events2 - boto:kill_instance:/usr/bin/kill_instance2 - boto:launch_instance:/usr/bin/launch_instance2 - boto:list_instances:/usr/bin/list_instances2 - boto:mturk:/usr/bin/mturk2 - boto:pyami_sendmail:/usr/bin/pyami_sendmail2 - boto:s3put:/usr/bin/s3put2 - boto:sdbadmin:/usr/bin/sdbadmin2 - boto:taskadmin:/usr/bin/taskadmin2" - -post_install() { - vlicense LICENSE -} - -python3-boto_package() { - depends="python3" - pycompile_module="boto" - short_desc="${short_desc/Python2/Python3}" - alternatives=" - boto:asadmin:/usr/bin/asadmin3 - boto:bundle_image:/usr/bin/bundle_image3 - boto:cfadmin:/usr/bin/cfadmin3 - boto:cq:/usr/bin/cq3 - boto:cwutil:/usr/bin/cwutil3 - boto:dynamodb_dump:/usr/bin/dynamodb_dump3 - boto:dynamodb_load:/usr/bin/dynamodb_load3 - boto:elbadmin:/usr/bin/elbadmin3 - boto:fetch_file:/usr/bin/fetch_file3 - boto:glacier:/usr/bin/glacier3 - boto:instance_events:/usr/bin/instance_events3 - boto:kill_instance:/usr/bin/kill_instance3 - boto:launch_instance:/usr/bin/launch_instance3 - boto:list_instances:/usr/bin/list_instances3 - boto:mturk:/usr/bin/mturk3 - boto:pyami_sendmail:/usr/bin/pyami_sendmail3 - boto:s3put:/usr/bin/s3put3 - boto:sdbadmin:/usr/bin/sdbadmin3 - boto:taskadmin:/usr/bin/taskadmin3" - pkg_install() { - vmove usr/bin/*3 - vmove usr/lib/python3* - vlicense LICENSE - } -} diff --git a/srcpkgs/python3-boto b/srcpkgs/python3-boto deleted file mode 120000 index 43ba1796b6d4..000000000000 --- a/srcpkgs/python3-boto +++ /dev/null @@ -1 +0,0 @@ -python-boto \ No newline at end of file diff --git a/srcpkgs/python3-boto/template b/srcpkgs/python3-boto/template new file mode 100644 index 000000000000..5cb0092c2443 --- /dev/null +++ b/srcpkgs/python3-boto/template @@ -0,0 +1,39 @@ +# Template file for 'python3-boto' +pkgname=python3-boto +version=2.49.0 +revision=6 +wrksrc="boto-${version}" +build_style=python3-module +hostmakedepends="python3-setuptools" +depends="python3" +short_desc="Python interface to Amazon Web Services (Python3)" +maintainer="Michael Aldridge " +license="MIT" +homepage="http://docs.pythonboto.org/" +changelog="https://raw.githubusercontent.com/boto/boto/develop/docs/source/releasenotes/v${version}.rst" +distfiles="https://github.com/boto/boto/archive/${version}.tar.gz" +checksum=3dbefd4f4542f85a323d4f54601f31ed4d362fc87945245f32e4a85029513314 + +post_install() { + vlicense LICENSE + # for compatilibity with former alternatives group + ln -s asadmin "${DESTDIR}/usr/bin/asadmin3" + ln -s bundle_image "${DESTDIR}/usr/bin/bundle_image3" + ln -s cfadmin "${DESTDIR}/usr/bin/cfadmin3" + ln -s cq "${DESTDIR}/usr/bin/cq3" + ln -s cwutil "${DESTDIR}/usr/bin/cwutil3" + ln -s dynamodb_dump "${DESTDIR}/usr/bin/dynamodb_dump3" + ln -s dynamodb_load "${DESTDIR}/usr/bin/dynamodb_load3" + ln -s elbadmin "${DESTDIR}/usr/bin/elbadmin3" + ln -s fetch_file "${DESTDIR}/usr/bin/fetch_file3" + ln -s glacier "${DESTDIR}/usr/bin/glacier3" + ln -s instance_events "${DESTDIR}/usr/bin/instance_events3" + ln -s kill_instance "${DESTDIR}/usr/bin/kill_instance3" + ln -s launch_instance "${DESTDIR}/usr/bin/launch_instance3" + ln -s list_instances "${DESTDIR}/usr/bin/list_instances3" + ln -s mturk "${DESTDIR}/usr/bin/mturk3" + ln -s pyami_sendmail "${DESTDIR}/usr/bin/pyami_sendmail3" + ln -s s3put "${DESTDIR}/usr/bin/s3put3" + ln -s sdbadmin "${DESTDIR}/usr/bin/sdbadmin3" + ln -s taskadmin "${DESTDIR}/usr/bin/taskadmin3" +} diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index 9c9b0611a47e..f86ec05474ba 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -331,6 +331,7 @@ replaces=" python-Pygments<=2.5.2_4 python-SecretStorage<=2.3.1_4 python-audit<=2.8.5_2 + python-boto<=2.49.0_5 python-chardet<=4.0.0_3 python-configobj<=5.0.6_9 python-crypto<=3.9.7_3