From b93aae3296e3358894ac829ef87ef40538bd49d0 Mon Sep 17 00:00:00 2001 From: saltedcoffii <55339220+saltedcoffii@users.noreply.github.com> Date: Sun, 2 May 2021 09:03:24 -0400 Subject: [PATCH] delete old packages and change dependencies --- packages/ansible.rb | 2 +- packages/asciinema.rb | 2 +- packages/atk.rb | 2 +- packages/avocado.rb | 2 +- packages/aws.rb | 2 +- packages/aws2.rb | 2 +- packages/aws_shell.rb | 2 +- packages/choose.rb | 2 +- packages/csvkit.rb | 2 +- packages/dia.rb | 2 +- packages/dr.rb | 2 +- packages/flatpak.rb | 2 +- packages/gdb.rb | 2 +- packages/gdk_pixbuf.rb | 2 +- packages/glib.rb | 4 ++-- packages/gnome_calculator.rb | 2 +- packages/gtk2.rb | 2 +- packages/gtk3.rb | 2 +- packages/gtk4.rb | 4 ++-- packages/gtk_doc.rb | 2 +- packages/harfbuzz.rb | 2 +- packages/json2xml.rb | 2 +- packages/kcov.rb | 2 +- packages/libcroco.rb | 2 +- packages/libewf.rb | 2 +- packages/libnewt.rb | 2 +- packages/libprelude.rb | 2 +- packages/librsvg.rb | 2 +- packages/llvm.rb | 2 +- packages/llvm_stage1.rb | 2 +- packages/mate_desktop.rb | 2 +- packages/meson.rb | 28 +++++++++---------------- packages/nuitka.rb | 28 ------------------------- packages/pango.rb | 2 +- packages/pax_utils.rb | 2 +- packages/php73.rb | 2 +- packages/php74.rb | 2 +- packages/php80.rb | 2 +- packages/psutil.rb | 28 ------------------------- packages/pycairo.rb | 40 ------------------------------------ packages/pyelftools.rb | 29 -------------------------- packages/pygments.rb | 33 ----------------------------- packages/pyparsing.rb | 28 ------------------------- packages/setuptools.rb | 16 --------------- packages/six.rb | 37 --------------------------------- packages/speedometer.rb | 4 ++-- packages/speedtest.rb | 2 +- packages/sphinx.rb | 2 +- packages/spice_gtk.rb | 4 ++-- packages/textract.rb | 2 +- packages/tox.rb | 38 ---------------------------------- packages/umockdev.rb | 2 +- packages/youtube_dl.rb | 20 ++++++++++++++++++ packages/youtubedl.rb | 28 ------------------------- 54 files changed, 76 insertions(+), 369 deletions(-) delete mode 100644 packages/nuitka.rb delete mode 100644 packages/psutil.rb delete mode 100644 packages/pycairo.rb delete mode 100644 packages/pyelftools.rb delete mode 100644 packages/pygments.rb delete mode 100644 packages/pyparsing.rb delete mode 100644 packages/setuptools.rb delete mode 100644 packages/six.rb delete mode 100644 packages/tox.rb create mode 100644 packages/youtube_dl.rb delete mode 100644 packages/youtubedl.rb diff --git a/packages/ansible.rb b/packages/ansible.rb index 48041be1b..6a9b82b05 100644 --- a/packages/ansible.rb +++ b/packages/ansible.rb @@ -22,7 +22,7 @@ class Ansible < Package x86_64: '03858df7d32282cbc04bcf33ec923e3ea03963898be7d0d6fdb51e589e43f11f', }) - depends_on 'setuptools' + depends_on 'py3_setuptools' => :build def self.install system "pip install --prefix #{CREW_PREFIX} \ diff --git a/packages/asciinema.rb b/packages/asciinema.rb index f42c187fb..a555af3fd 100644 --- a/packages/asciinema.rb +++ b/packages/asciinema.rb @@ -23,7 +23,7 @@ class Asciinema < Package }) depends_on 'xdg_base' - depends_on 'setuptools' + depends_on 'py3_setuptools' => :build def self.build system "echo '[api] diff --git a/packages/atk.rb b/packages/atk.rb index 138afba44..8fcc8211b 100644 --- a/packages/atk.rb +++ b/packages/atk.rb @@ -23,7 +23,7 @@ class Atk < Package }) depends_on 'gobject_introspection' - depends_on 'six' => :build + depends_on 'py3_six' => :build def self.build system "meson #{CREW_MESON_FNO_LTO_OPTIONS} build" diff --git a/packages/avocado.rb b/packages/avocado.rb index 94ad4750d..3b55155e1 100644 --- a/packages/avocado.rb +++ b/packages/avocado.rb @@ -24,7 +24,7 @@ class Avocado < Package depends_on 'xdg_base' depends_on 'xzutils' - depends_on 'setuptools' + depends_on 'py3_setuptools' => :build def self.install system "pip install avocado-framework --root #{CREW_DEST_DIR} --prefix #{CREW_PREFIX}" diff --git a/packages/aws.rb b/packages/aws.rb index 032289bbb..cfd19fb6a 100644 --- a/packages/aws.rb +++ b/packages/aws.rb @@ -23,7 +23,7 @@ class Aws < Package }) depends_on 'groff' - depends_on 'setuptools' => :build + depends_on 'py3_setuptools' => :build def self.install system "pip install --prefix #{CREW_PREFIX} --root #{CREW_DEST_DIR} \ diff --git a/packages/aws2.rb b/packages/aws2.rb index bca4f235a..f6ac0ba38 100644 --- a/packages/aws2.rb +++ b/packages/aws2.rb @@ -16,7 +16,7 @@ class Aws2 < Package }) depends_on 'rust' => :build - depends_on 'setuptools' => :build + depends_on 'py3_setuptools' => :build def self.install system "pip install --prefix #{CREW_PREFIX} --root #{CREW_DEST_DIR} -I aws2==#{@_ver} --no-warn-script-location" diff --git a/packages/aws_shell.rb b/packages/aws_shell.rb index 54d4d527c..ba6132551 100644 --- a/packages/aws_shell.rb +++ b/packages/aws_shell.rb @@ -22,7 +22,7 @@ class Aws_shell < Package x86_64: '41ad9b4fbe0104c4e7d48fb7b5c2469f89562f46c1184b985114da37bf0ed479', }) - depends_on 'setuptools' + depends_on 'py3_setuptools' => :build def self.install system "python setup.py install --prefix #{CREW_PREFIX} --root #{CREW_DEST_DIR}" diff --git a/packages/choose.rb b/packages/choose.rb index b74db6aa2..326ace2b5 100644 --- a/packages/choose.rb +++ b/packages/choose.rb @@ -22,7 +22,7 @@ class Choose < Package x86_64: '138d368f47682787e47e01a59090014d993e8f63ba6678a9b315640a5075cd88', }) - depends_on 'setuptools' + depends_on 'py3_setuptools' => :build def self.install system "pip install urwid --prefix #{CREW_PREFIX} --root #{CREW_DEST_DIR}" diff --git a/packages/csvkit.rb b/packages/csvkit.rb index d3f85dbd7..9dd59ed84 100644 --- a/packages/csvkit.rb +++ b/packages/csvkit.rb @@ -22,7 +22,7 @@ class Csvkit < Package x86_64: '01d05a5337a2aeb7488ad7129cc19ac342e6dac19fe07f7487a4ec3cd0751d78', }) - depends_on 'setuptools' + depends_on 'py3_setuptools' => :build def self.install system "pip install --prefix #{CREW_PREFIX} \ diff --git a/packages/dia.rb b/packages/dia.rb index c63bc4331..29e4caeb6 100644 --- a/packages/dia.rb +++ b/packages/dia.rb @@ -26,7 +26,7 @@ class Dia < Package depends_on 'libart' depends_on 'libpng' depends_on 'libwmf' - depends_on 'six' + depends_on 'py3_six' depends_on 'swig1' depends_on 'sommelier' diff --git a/packages/dr.rb b/packages/dr.rb index 444392182..493fcddec 100644 --- a/packages/dr.rb +++ b/packages/dr.rb @@ -11,7 +11,7 @@ class Dr < Package source_url 'https://github.com/Ewpratten/dr/archive/2.0-cros.tar.gz' source_sha256 '0ab9003c23d74d1ca8b0cfaf33e7db5e5b908d3448c87c4c0a83c9bf77a8ac23' - depends_on 'setuptools' + depends_on 'py3_setuptools' => :build def self.install system 'curl -#Lo dr/dr https://github.com/Ewpratten/dr/releases/download/2.0-cros/dr' diff --git a/packages/flatpak.rb b/packages/flatpak.rb index b5b269182..27be0580d 100644 --- a/packages/flatpak.rb +++ b/packages/flatpak.rb @@ -38,7 +38,7 @@ class Flatpak < Package depends_on 'libxau' depends_on 'polkit' depends_on 'pulseaudio' - depends_on 'pyparsing' + depends_on 'py3_pyparsing' depends_on 'xdg_base' depends_on 'xdg_dbus_proxy' depends_on 'xmlto' => :build diff --git a/packages/gdb.rb b/packages/gdb.rb index 60c46b826..195968557 100644 --- a/packages/gdb.rb +++ b/packages/gdb.rb @@ -23,7 +23,7 @@ class Gdb < Package }) depends_on 'libx11' - depends_on 'six' + depends_on 'py3_six' def self.build system './configure', diff --git a/packages/gdk_pixbuf.rb b/packages/gdk_pixbuf.rb index 8a4f2381f..6a4b1437c 100644 --- a/packages/gdk_pixbuf.rb +++ b/packages/gdk_pixbuf.rb @@ -31,7 +31,7 @@ class Gdk_pixbuf < Package depends_on 'libtiff' depends_on 'libwebp' => :build depends_on 'pango' => :build - depends_on 'six' => :build + depends_on 'py3_six' => :build @python_deps = %w[Markdown typogrify] diff --git a/packages/glib.rb b/packages/glib.rb index 76ad02089..1f0781cd3 100644 --- a/packages/glib.rb +++ b/packages/glib.rb @@ -27,8 +27,8 @@ class Glib < Package depends_on 'pcre' depends_on 'shared_mime_info' depends_on 'util_linux' - depends_on 'six' - depends_on 'pygments' + depends_on 'py3_six' + depends_on 'py3_pygments' def self.build system "meson #{CREW_MESON_OPTIONS} \ diff --git a/packages/gnome_calculator.rb b/packages/gnome_calculator.rb index 931770fd1..a802ac3a0 100644 --- a/packages/gnome_calculator.rb +++ b/packages/gnome_calculator.rb @@ -10,7 +10,7 @@ class Gnome_calculator < Package source_url "https://download.gnome.org/sources/gnome-calculator/#{@_ver.rpartition('.')[0]}/gnome-calculator-#{@_ver}.tar.xz" source_sha256 '8c83cc6433e015d15aa2a0cf3d0b187f7adb92830d39dd2e66076c73192a316b' - depends_on 'setuptools' => :build + depends_on 'py3_setuptools' => :build depends_on 'gtk3' depends_on 'gtksourceview' depends_on 'itstool' diff --git a/packages/gtk2.rb b/packages/gtk2.rb index 1f87fe787..6063e1330 100644 --- a/packages/gtk2.rb +++ b/packages/gtk2.rb @@ -43,7 +43,7 @@ class Gtk2 < Package depends_on 'libxrender' depends_on 'pango' depends_on 'shared_mime_info' - depends_on 'six' => :build + depends_on 'py3_six' => :build def self.build system "env CFLAGS='-pipe -flto=auto' \ diff --git a/packages/gtk3.rb b/packages/gtk3.rb index 983c47276..07f4d22fb 100644 --- a/packages/gtk3.rb +++ b/packages/gtk3.rb @@ -33,7 +33,7 @@ class Gtk3 < Package depends_on 'graphite' => :build # Do we need this? depends_on 'libdeflate' => :build # Do we need this? depends_on 'libjpeg' => :build # Do we need this? - depends_on 'six' => :build # Do we need this? + depends_on 'py3_six' => :build # Do we need this? depends_on 'adwaita_icon_theme' # L depends_on 'cantarell_fonts' # L depends_on 'gnome_icon_theme' # L diff --git a/packages/gtk4.rb b/packages/gtk4.rb index def740446..a5647d9d1 100644 --- a/packages/gtk4.rb +++ b/packages/gtk4.rb @@ -30,8 +30,8 @@ class Gtk4 < Package depends_on 'intel_media_sdk' => :build if ARCH.eql?('x86_64') depends_on 'iso_codes' => :build depends_on 'mesa' => :build - depends_on 'pygments' => :build # Is this needed? - depends_on 'six' => :build # Is this needed? + depends_on 'py3_pygments' => :build # Is this needed? + depends_on 'py3_six' => :build # Is this needed? depends_on 'vulkan_headers' => :build depends_on 'adwaita_icon_theme' # L depends_on 'cantarell_fonts' # L diff --git a/packages/gtk_doc.rb b/packages/gtk_doc.rb index b1a7cca8b..79d4da057 100644 --- a/packages/gtk_doc.rb +++ b/packages/gtk_doc.rb @@ -26,7 +26,7 @@ class Gtk_doc < Package depends_on 'fop' depends_on 'itstool' depends_on 'libxslt' - depends_on 'pygments' => :build + depends_on 'py3_pygments' => :build #def self.patch # There are a lot of patches to grab here ~ They've all come from Void-Packages (xbps-src) diff --git a/packages/harfbuzz.rb b/packages/harfbuzz.rb index 1487cad08..44a1e24ec 100644 --- a/packages/harfbuzz.rb +++ b/packages/harfbuzz.rb @@ -28,7 +28,7 @@ class Harfbuzz < Package depends_on 'gobject_introspection' depends_on 'ragel' => :build depends_on 'freetype_sub' - depends_on 'six' => :build + depends_on 'py3_six' => :build depends_on 'graphite' => :build def self.build diff --git a/packages/json2xml.rb b/packages/json2xml.rb index 04aba761f..6e1745956 100644 --- a/packages/json2xml.rb +++ b/packages/json2xml.rb @@ -23,7 +23,7 @@ class Json2xml < Package }) depends_on 'libxslt' - depends_on 'setuptools' + depends_on 'py3_setuptools' => :build def self.install FileUtils.mkdir_p "#{CREW_DEST_PREFIX}/bin" diff --git a/packages/kcov.rb b/packages/kcov.rb index ee28b813d..9762a32a2 100644 --- a/packages/kcov.rb +++ b/packages/kcov.rb @@ -24,7 +24,7 @@ class Kcov < Package depends_on 'curl' depends_on 'elfutils' - depends_on 'six' + depends_on 'py3_six' def self.build Dir.mkdir 'build' diff --git a/packages/libcroco.rb b/packages/libcroco.rb index 62d672bef..bed2c9f41 100644 --- a/packages/libcroco.rb +++ b/packages/libcroco.rb @@ -25,7 +25,7 @@ class Libcroco < Package }) depends_on 'gtk_doc' - depends_on 'six' => :build + depends_on 'py3_six' => :build def self.build system 'sh autogen.sh' diff --git a/packages/libewf.rb b/packages/libewf.rb index dddbdf4d9..75c9b11c9 100644 --- a/packages/libewf.rb +++ b/packages/libewf.rb @@ -23,7 +23,7 @@ class Libewf < Package }) depends_on 'bz2' - depends_on 'six' + depends_on 'py3_six' depends_on 'util_linux' def self.build diff --git a/packages/libnewt.rb b/packages/libnewt.rb index 28b277707..d8a0b9c85 100644 --- a/packages/libnewt.rb +++ b/packages/libnewt.rb @@ -27,7 +27,7 @@ class Libnewt < Package depends_on 'libxcrypt' depends_on 'popt' depends_on 'tcl' => :build - depends_on 'pygments' => :build + depends_on 'py3_pygments' => :build def self.patch patch_url = 'http://deb.debian.org/debian/pool/main/n/newt/newt_0.52.21-4.debian.tar.xz' diff --git a/packages/libprelude.rb b/packages/libprelude.rb index 3dc6b5917..7f94dbccb 100644 --- a/packages/libprelude.rb +++ b/packages/libprelude.rb @@ -22,7 +22,7 @@ class Libprelude < Package x86_64: 'f7642b1ffb9a0b5ee5c22a3f1345fbc0ff8b7e334a9839c7d24b7108fd069806', }) - depends_on 'six' => :build + depends_on 'py3_six' => :build def self.build system "./configure \ diff --git a/packages/librsvg.rb b/packages/librsvg.rb index e46630da8..0ff79a824 100644 --- a/packages/librsvg.rb +++ b/packages/librsvg.rb @@ -36,7 +36,7 @@ class Librsvg < Package depends_on 'libpng' depends_on 'pango' depends_on 'rust' => :build - depends_on 'six' => :build + depends_on 'py3_six' => :build depends_on 'vala' => :build def self.build diff --git a/packages/llvm.rb b/packages/llvm.rb index f44c813a0..61817cb91 100644 --- a/packages/llvm.rb +++ b/packages/llvm.rb @@ -24,7 +24,7 @@ class Llvm < Package }) depends_on 'ocaml' => :build - depends_on 'pygments' => :build + depends_on 'py3_pygments' => :build depends_on 'ccache' => :build # depends_on 'llvm_stage1' => :build # Not needed with a functional # prior llvm 11 build. diff --git a/packages/llvm_stage1.rb b/packages/llvm_stage1.rb index 2c28ecbcc..7d693e839 100644 --- a/packages/llvm_stage1.rb +++ b/packages/llvm_stage1.rb @@ -31,7 +31,7 @@ class Llvm_stage1 < Package depends_on 'libedit' depends_on 'libtirpc' depends_on 'swig' - depends_on 'pygments' => :build + depends_on 'py3_pygments' => :build depends_on 'ccache' => :build case ARCH diff --git a/packages/mate_desktop.rb b/packages/mate_desktop.rb index b5f4b38c0..410fa7843 100644 --- a/packages/mate_desktop.rb +++ b/packages/mate_desktop.rb @@ -24,7 +24,7 @@ class Mate_desktop < Package depends_on 'mate_common' depends_on 'dconf' - depends_on 'six' => :build + depends_on 'py3_six' => :build def self.build system "./autogen.sh" diff --git a/packages/meson.rb b/packages/meson.rb index 39184b37f..f61d686bc 100644 --- a/packages/meson.rb +++ b/packages/meson.rb @@ -1,32 +1,24 @@ require 'package' class Meson < Package - description 'The Meson Build System' - homepage 'http://mesonbuild.com/' + description 'Meson is an open source build system meant to be both extremely fast and user friendly.' + homepage 'https://mesonbuild.com/' @_ver = '0.57.2' version @_ver license 'Apache-2.0' compatibility 'all' - source_url "https://github.com/mesonbuild/meson/archive/#{@_ver}.tar.gz" - source_sha256 'cd3773625253df4fd1c380faf03ffae3d02198d6301e7c8bc7bba6c66af66096' - - binary_url({ - aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/meson/0.57.2_armv7l/meson-0.57.2-chromeos-armv7l.tar.xz', - armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/meson/0.57.2_armv7l/meson-0.57.2-chromeos-armv7l.tar.xz', - i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/meson/0.57.2_i686/meson-0.57.2-chromeos-i686.tar.xz', - x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/meson/0.57.2_x86_64/meson-0.57.2-chromeos-x86_64.tar.xz' - }) - binary_sha256({ - aarch64: '159a2101c1ca6a798baeeee0b95cd10950d7b62e088fa0229270b11983c27ec0', - armv7l: '159a2101c1ca6a798baeeee0b95cd10950d7b62e088fa0229270b11983c27ec0', - i686: 'f8a173fefc3b188208fbd6da61f3f9b0e94db62b8bbdb18573b8d740547ade82', - x86_64: '4f6668f8cf6463fbe20e9d7de20d818548ab53ec69c7dae1e5700f57e6d6b816' - }) + source_url "https://github.com/mesonbuild/meson.git" + git_hashtag @_ver depends_on 'ninja' depends_on 'samurai' + depends_on 'py3_setuptools' => :build + + def self.build + system "python3 setup.py build #{PY3_SETUP_BUILD_OPTIONS}" + end def self.install - system "python3 setup.py install --prefix #{CREW_PREFIX} --root #{CREW_DEST_DIR}" + system "python3 setup.py install #{PY_SETUP_INSTALL_OPTIONS}" end end diff --git a/packages/nuitka.rb b/packages/nuitka.rb deleted file mode 100644 index 1d474b5b3..000000000 --- a/packages/nuitka.rb +++ /dev/null @@ -1,28 +0,0 @@ -require 'package' - -class Nuitka < Package - description 'nuitka is a Python to binary compiler written in Python. You feed it your Python app, it does a lot of clever things, and spits out an executable or extension module.' - homepage 'https://nuitka.net/' - version '0.6.13.2' - license 'Apache-2.0' - compatibility 'all' - source_url 'https://github.com/Nuitka/Nuitka/archive/refs/tags/0.6.13.2.tar.gz' - source_sha256 'a594d054255688dbef8f8ba5b6cbb0207ad467384f2a6214522781ffbd5d43e5' - - binary_url ({ - aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/nuitka/0.6.13.2_armv7l/nuitka-0.6.13.2-chromeos-armv7l.tar.xz', - armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/nuitka/0.6.13.2_armv7l/nuitka-0.6.13.2-chromeos-armv7l.tar.xz', - i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/nuitka/0.6.13.2_i686/nuitka-0.6.13.2-chromeos-i686.tar.xz', - x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/nuitka/0.6.13.2_x86_64/nuitka-0.6.13.2-chromeos-x86_64.tar.xz', - }) - binary_sha256 ({ - aarch64: '30d982517d09101767cfb71f7e579b0dd8b0636ce2e922ccd7d2a3eec93f0e26', - armv7l: '30d982517d09101767cfb71f7e579b0dd8b0636ce2e922ccd7d2a3eec93f0e26', - i686: '31d41f49b3caea88732e590ef269a17233f8cbc8298e50d9e89e7e8daae44889', - x86_64: '19333abe43c61a1fb3907ab6d4e63532dc9ddc7917b2cfa0c790a21bb89117e1', - }) - - def self.install - system "python3 -m pip install --prefix #{CREW_PREFIX} --root #{CREW_DEST_DIR} -I nuitka==#{version} --no-warn-script-location" - end -end diff --git a/packages/pango.rb b/packages/pango.rb index 4c60f3504..7b2621e01 100644 --- a/packages/pango.rb +++ b/packages/pango.rb @@ -32,7 +32,7 @@ class Pango < Package depends_on 'libx11' depends_on 'libxft' depends_on 'libxrender' - depends_on 'six' + depends_on 'py3_six' def self.build system "meson #{CREW_MESON_OPTIONS} \ diff --git a/packages/pax_utils.rb b/packages/pax_utils.rb index 4cde91927..3036d82b4 100644 --- a/packages/pax_utils.rb +++ b/packages/pax_utils.rb @@ -22,7 +22,7 @@ class Pax_utils < Package x86_64: '836d8627d96ed61608cb7bee423db753fc00c67600c62386e1df98d4529c35c9', }) - depends_on 'pyelftools' + depends_on 'py3_pyelftools' depends_on 'libcap' => :build depends_on 'libseccomp' => :build diff --git a/packages/php73.rb b/packages/php73.rb index 7cf41e122..b4d9f736e 100644 --- a/packages/php73.rb +++ b/packages/php73.rb @@ -32,7 +32,7 @@ class Php73 < Package depends_on 're2c' depends_on 'tidy' depends_on 'unixodbc' - depends_on 'pygments' + depends_on 'py3_pygments' def self.preflight phpver = `php -v 2> /dev/null | head -1 | cut -d' ' -f2`.chomp diff --git a/packages/php74.rb b/packages/php74.rb index f4a6b0207..19d0b49d7 100644 --- a/packages/php74.rb +++ b/packages/php74.rb @@ -37,7 +37,7 @@ class Php74 < Package depends_on 'tidy' depends_on 'unixodbc' depends_on 'oniguruma' - depends_on 'pygments' + depends_on 'py3_pygments' def self.preflight phpver = `php -v 2> /dev/null | head -1 | cut -d' ' -f2`.chomp diff --git a/packages/php80.rb b/packages/php80.rb index e9ae769f7..bf33c2999 100644 --- a/packages/php80.rb +++ b/packages/php80.rb @@ -37,7 +37,7 @@ class Php80 < Package depends_on 'tidy' depends_on 'unixodbc' depends_on 'oniguruma' - depends_on 'pygments' + depends_on 'py3_pygments' def self.preflight phpver = `php -v 2> /dev/null | head -1 | cut -d' ' -f2`.chomp diff --git a/packages/psutil.rb b/packages/psutil.rb deleted file mode 100644 index d0bb7cdca..000000000 --- a/packages/psutil.rb +++ /dev/null @@ -1,28 +0,0 @@ -require 'package' - -class Psutil < Package - description 'psutil (process and system utilities) is a cross-platform library for retrieving information on running processes and system utilization in Python.' - homepage 'https://github.com/giampaolo/psutil' - version '5.8.0' - license 'BSD-3' - compatibility 'all' - source_url 'https://github.com/giampaolo/psutil/archive/refs/tags/release-5.8.0.tar.gz' - source_sha256 'c015248da36109ffaa15f46fce8c0003f678cfaa408090f466c80318885e7abf' - - binary_url ({ - aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/psutil/5.8.0_armv7l/psutil-5.8.0-chromeos-armv7l.tar.xz', - armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/psutil/5.8.0_armv7l/psutil-5.8.0-chromeos-armv7l.tar.xz', - i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/psutil/5.8.0_i686/psutil-5.8.0-chromeos-i686.tar.xz', - x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/psutil/5.8.0_x86_64/psutil-5.8.0-chromeos-x86_64.tar.xz', - }) - binary_sha256 ({ - aarch64: '35a8643fdc7141f35a0a91d217a5dedf377bb79790c18dc02f089362dfc8e104', - armv7l: '35a8643fdc7141f35a0a91d217a5dedf377bb79790c18dc02f089362dfc8e104', - i686: 'e38537dffaf71ca7e8d9a83c83c63cf4ccbf7929c24d163b7b43dff7e0235450', - x86_64: '8d99419f62b714a7bc241305db99d5f337b86ba78f0da5be2805bc3a90c90b5d', - }) - - def self.install - system "pip install --prefix #{CREW_PREFIX} --root #{CREW_DEST_DIR} -I psutil==#{version} --no-warn-script-location" - end -end diff --git a/packages/pycairo.rb b/packages/pycairo.rb deleted file mode 100644 index 06bbffd19..000000000 --- a/packages/pycairo.rb +++ /dev/null @@ -1,40 +0,0 @@ -require 'package' - -class Pycairo < Package - description 'Pycairo is a Python module providing bindings for the cairo graphics library.' - homepage 'https://cairographics.org/pycairo/' - version '1.17.1' - license 'LGPL-2.1 or MPL-1.1' - compatibility 'all' - source_url 'https://files.pythonhosted.org/packages/68/76/340ff847897296b2c8174dfa5a5ec3406e3ed783a2abac918cf326abad86/pycairo-1.17.1.tar.gz' - source_sha256 '0f0a35ec923d87bc495f6753b1e540fd046d95db56a35250c44089fbce03b698' - - binary_url ({ - aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/pycairo/1.17.1_armv7l/pycairo-1.17.1-chromeos-armv7l.tar.xz', - armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/pycairo/1.17.1_armv7l/pycairo-1.17.1-chromeos-armv7l.tar.xz', - i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/pycairo/1.17.1_i686/pycairo-1.17.1-chromeos-i686.tar.xz', - x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/pycairo/1.17.1_x86_64/pycairo-1.17.1-chromeos-x86_64.tar.xz', - }) - binary_sha256 ({ - aarch64: '401ca3457234b15a392c6506480211a83c6d3d03b191e0dc1033cf8daacc341b', - armv7l: '401ca3457234b15a392c6506480211a83c6d3d03b191e0dc1033cf8daacc341b', - i686: '2921ce60149fdaef82bfde2e0eb4f661a40ce7a31ff8cd6b9bec3551c060611e', - x86_64: '7805d36fa3e6377411f2c29cbbba4ca7148102d84cf31a1287ce5e6ca9ab7fb0', - }) - - depends_on 'cairo' - depends_on 'python3' - depends_on 'python2' - depends_on 'libxxf86vm' - depends_on 'libxrender' - - def self.build - system "python2.7 setup.py build" - system "python3 setup.py build" - end - - def self.install - system "python2.7 setup.py install --prefix #{CREW_PREFIX} --root #{CREW_DEST_DIR}" - system "python3 setup.py install --prefix #{CREW_PREFIX} --root #{CREW_DEST_DIR}" - end -end diff --git a/packages/pyelftools.rb b/packages/pyelftools.rb deleted file mode 100644 index a779b5931..000000000 --- a/packages/pyelftools.rb +++ /dev/null @@ -1,29 +0,0 @@ -require 'package' - -class Pyelftools < Package - description 'Pure-Python library for parsing and analyzing ELF files and DWARF debugging information.' - homepage 'https://github.com/eliben/pyelftools' - version '0.27' - license 'public-domain' - compatibility 'all' - source_url 'file:///dev/null' - source_sha256 'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855' - - binary_url ({ - aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/pyelftools/0.27_armv7l/pyelftools-0.27-chromeos-armv7l.tar.xz', - armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/pyelftools/0.27_armv7l/pyelftools-0.27-chromeos-armv7l.tar.xz', - i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/pyelftools/0.27_i686/pyelftools-0.27-chromeos-i686.tar.xz', - x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/pyelftools/0.27_x86_64/pyelftools-0.27-chromeos-x86_64.tar.xz', - }) - binary_sha256 ({ - aarch64: '6948872decb8cbd4b9da384e6684fcf55736bd1fd998b94878f0d7896a0c32bb', - armv7l: '6948872decb8cbd4b9da384e6684fcf55736bd1fd998b94878f0d7896a0c32bb', - i686: '2781fb4f954695bdb05a0e5c6b2c36a3b88bc89ae5c001fca16c9daa2c839363', - x86_64: 'cd61b483e2268bfa2f09390710f44d183c8151b1e05d64dcb705ca297cda6b6d', - }) - - def self.install - system "pip3 uninstall -y pyelftools" - system "pip3 install --upgrade --no-warn-script-location pyelftools --prefix #{CREW_PREFIX} --root #{CREW_DEST_DIR}" - end -end diff --git a/packages/pygments.rb b/packages/pygments.rb deleted file mode 100644 index d87239ec1..000000000 --- a/packages/pygments.rb +++ /dev/null @@ -1,33 +0,0 @@ -require 'package' - -class Pygments < Package - description 'Python Syntax Highlighter' - homepage 'https://pygments.org/' - version '2.8.0' - license 'BSD' - compatibility 'all' - source_url 'file:///dev/null' - source_sha256 'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855' - - binary_url({ - aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/pygments/2.8.0_armv7l/pygments-2.8.0-chromeos-armv7l.tar.xz', - armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/pygments/2.8.0_armv7l/pygments-2.8.0-chromeos-armv7l.tar.xz', - i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/pygments/2.8.0_i686/pygments-2.8.0-chromeos-i686.tar.xz', - x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/pygments/2.8.0_x86_64/pygments-2.8.0-chromeos-x86_64.tar.xz' - }) - binary_sha256({ - aarch64: '0b7af6a0717a3b929c8a51fb2466565239810090478b7a4ac23f0e3da2fbc04e', - armv7l: '0b7af6a0717a3b929c8a51fb2466565239810090478b7a4ac23f0e3da2fbc04e', - i686: 'ffe3bd980c153fb1592a6027b44cd4b57161211160e8d2ce4ee4b17d86528615', - x86_64: '955f2f252e98842b63569334ad133908c2c527617b687f632bbfd1f4db8013b6' - }) - - def self.install - system 'pip uninstall -y pygments' - system "pip install --upgrade --no-warn-script-location pygments --prefix #{CREW_PREFIX} --root #{CREW_DEST_DIR}" - end - - def self.postinstall - system 'pip install --upgrade pygments' - end -end diff --git a/packages/pyparsing.rb b/packages/pyparsing.rb deleted file mode 100644 index 33c6bfb7b..000000000 --- a/packages/pyparsing.rb +++ /dev/null @@ -1,28 +0,0 @@ -require 'package' - -class Pyparsing < Package - description 'The pyparsing module is an alternative approach to creating and executing simple grammars, vs. the traditional lex/yacc approach, or the use of regular expressions.' - homepage 'https://github.com/pyparsing/pyparsing' - version '2.4.7' - license 'MIT' - compatibility 'all' - source_url 'https://github.com/pyparsing/pyparsing/releases/download/pyparsing_2.4.7/pyparsing-2.4.7.tar.gz' - source_sha256 'c203ec8783bf771a155b207279b9bccb8dea02d8f0c9e5f8ead507bc3246ecc1' - - binary_url({ - aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/pyparsing/2.4.7_armv7l/pyparsing-2.4.7-chromeos-armv7l.tar.xz', - armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/pyparsing/2.4.7_armv7l/pyparsing-2.4.7-chromeos-armv7l.tar.xz', - i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/pyparsing/2.4.7_i686/pyparsing-2.4.7-chromeos-i686.tar.xz', - x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/pyparsing/2.4.7_x86_64/pyparsing-2.4.7-chromeos-x86_64.tar.xz' - }) - binary_sha256({ - aarch64: 'd4decc10bf590b30f6c05fb463e7fc9d79b7d9e9d84a92de694619ba10da0381', - armv7l: 'd4decc10bf590b30f6c05fb463e7fc9d79b7d9e9d84a92de694619ba10da0381', - i686: '8bf0da6c070cd6b6273b0d75078cd22264031a270b068d48d4eb120251f662a1', - x86_64: '82bd555e8dca145d04a4db65548a711c088d8d9c6e6cee62b2d7931da240e19f' - }) - - def self.install - system "pip3 install --prefix #{CREW_PREFIX} --root #{CREW_DEST_DIR} -I pyparsing==#{version}" - end -end diff --git a/packages/setuptools.rb b/packages/setuptools.rb deleted file mode 100644 index e06aed251..000000000 --- a/packages/setuptools.rb +++ /dev/null @@ -1,16 +0,0 @@ -# Do not use this package as a dependency for other packages. -require 'package' - -class Setuptools < Package - description 'A package that installs setuptools for all python versions.' - homepage 'https://pypi.org/project/setuptools/' - version '1.0' - license 'MIT' - compatibility 'all' - - is_fake - - depends_on 'py3_setuptools' - depends_on 'py2_setuptools' - -end diff --git a/packages/six.rb b/packages/six.rb deleted file mode 100644 index 466c747df..000000000 --- a/packages/six.rb +++ /dev/null @@ -1,37 +0,0 @@ -require 'package' - -class Six < Package - description 'Six is a Python 2 and 3 compatibility library.' - homepage 'https://github.com/benjaminp/six' - version '1.14.0' - license 'MIT' - compatibility 'all' - source_url 'https://github.com/benjaminp/six/archive/1.14.0.tar.gz' - source_sha256 '6efff7289d1d369f0a25180433aba83ec2584e489e90f115b52ba69e4816cfb4' - - binary_url ({ - aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/six/1.14.0_armv7l/six-1.14.0-chromeos-armv7l.tar.xz', - armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/six/1.14.0_armv7l/six-1.14.0-chromeos-armv7l.tar.xz', - i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/six/1.14.0_i686/six-1.14.0-chromeos-i686.tar.xz', - x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/six/1.14.0_x86_64/six-1.14.0-chromeos-x86_64.tar.xz', - }) - binary_sha256 ({ - aarch64: '194646b4fb1a0ed11492d21a45bc09d91ab7da78cbc8a6ad2f0c3ebe723692ba', - armv7l: '194646b4fb1a0ed11492d21a45bc09d91ab7da78cbc8a6ad2f0c3ebe723692ba', - i686: '51c17725b9925874af0fa7bcd86afbc930b5023ab353efb3754c69d7e7d52d4c', - x86_64: '649ca8a551af2fd558bc889cfa0df05ff2e2b853ea76786b61d5d8a765adcd02', - }) - - depends_on 'python3' - depends_on 'python27' - - def self.build - system "python2.7 setup.py build" - system "python3 setup.py build" - end - - def self.install - system "python2.7 setup.py install --prefix #{CREW_PREFIX} --root #{CREW_DEST_DIR}" - system "python3 setup.py install --prefix #{CREW_PREFIX} --root #{CREW_DEST_DIR}" - end -end diff --git a/packages/speedometer.rb b/packages/speedometer.rb index 0c5e66f34..ea6fc7bf1 100644 --- a/packages/speedometer.rb +++ b/packages/speedometer.rb @@ -23,8 +23,8 @@ class Speedometer < Package }) depends_on 'psutil' - depends_on 'six' - depends_on 'nuitka' => :build + depends_on 'py3_six' + depends_on 'py3_nuitka' => :build def self.patch system "sed -i 's:#!/usr/bin/python3:#!#{CREW_PREFIX}/bin/python3:' bin/speedometer" diff --git a/packages/speedtest.rb b/packages/speedtest.rb index de0c3110c..cafaafd73 100644 --- a/packages/speedtest.rb +++ b/packages/speedtest.rb @@ -22,7 +22,7 @@ class Speedtest < Package x86_64: '6245d2d291cb83d4fa4e51fbd867cd956df98209d2ad37237463e44c4c482fcc', }) - depends_on 'setuptools' + depends_on 'py3_setuptools' => :build def self.install system "pip3 install --prefix #{CREW_PREFIX} --root #{CREW_DEST_DIR} -I speedtest-cli==2.0.2" diff --git a/packages/sphinx.rb b/packages/sphinx.rb index e46fbaffe..c64203e12 100644 --- a/packages/sphinx.rb +++ b/packages/sphinx.rb @@ -22,7 +22,7 @@ class Sphinx < Package x86_64: '54effef8d4e749a5d88150867bc4f171d30bbe1c97d600364bd19a260129ef70', }) - depends_on 'setuptools' + depends_on 'py3_setuptools' => :build def self.install system 'git clone https://github.com/sphinx-doc/sphinx.git build' diff --git a/packages/spice_gtk.rb b/packages/spice_gtk.rb index 0ff20d865..8e419fa11 100644 --- a/packages/spice_gtk.rb +++ b/packages/spice_gtk.rb @@ -33,8 +33,8 @@ class Spice_gtk < Package depends_on 'gst_plugins_base' depends_on 'gst_plugins_good' depends_on 'gobject_introspection' => ':build' - depends_on 'pyparsing' => ':build' - depends_on 'pygments' => ':build' + depends_on 'py3_pygments' => ':build' + depends_on 'py3_pygments' => ':build' depends_on 'spice_protocol' => ':build' depends_on 'usbutils' => ':build' depends_on 'vala' => ':build' diff --git a/packages/textract.rb b/packages/textract.rb index 5a9bc1d55..c9e74997d 100644 --- a/packages/textract.rb +++ b/packages/textract.rb @@ -22,7 +22,7 @@ class Textract < Package x86_64: '13e5933fe8082e152cdf80c661f85f9a425e2a303ace296cf82e8d302da39551', }) - depends_on 'setuptools' + depends_on 'py3_setuptools' => :build depends_on 'pulseaudio' depends_on 'swig' diff --git a/packages/tox.rb b/packages/tox.rb deleted file mode 100644 index d95de5a7a..000000000 --- a/packages/tox.rb +++ /dev/null @@ -1,38 +0,0 @@ -require 'package' - -class Tox < Package - description 'tox aims to automate and standardize testing in Python.' - homepage 'https://tox.readthedocs.io/en/latest/' - version '3.4.0' - license 'MIT' - compatibility 'all' - source_url 'https://github.com/tox-dev/tox/archive/3.4.0.tar.gz' - source_sha256 '01171065c1628b5549c370a160979a04fef1de32aa9e39203aaa998057c03d11' - - binary_url ({ - aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/tox/3.4.0_armv7l/tox-3.4.0-chromeos-armv7l.tar.xz', - armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/tox/3.4.0_armv7l/tox-3.4.0-chromeos-armv7l.tar.xz', - i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/tox/3.4.0_i686/tox-3.4.0-chromeos-i686.tar.xz', - x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/tox/3.4.0_x86_64/tox-3.4.0-chromeos-x86_64.tar.xz', - }) - binary_sha256 ({ - aarch64: '39e24875f9ba6375d2bbc2d5318ad6b220209e38c2105d8fde3de7dc3f84ff1c', - armv7l: '39e24875f9ba6375d2bbc2d5318ad6b220209e38c2105d8fde3de7dc3f84ff1c', - i686: '2ff92015a93f1b8764d8b718fc74a8876090dd3ef3c847a90d400271cbfa2a47', - x86_64: '42f63319cae5fe4d78c217a5d3326b735b42503cd5a431198aafcece31dbc60f', - }) - - def self.install - system 'git clone https://github.com/tox-dev/tox.git' - Dir.chdir 'tox' do - system 'git checkout 3.4.0' - system "pip install . --root #{CREW_DEST_DIR} --prefix #{CREW_PREFIX}" - end - end - - def self.postinstall - puts - puts "To generate a tox.ini configuration file automatically, run 'tox-quickstart' and answer a few simple questions.".lightblue - puts - end -end diff --git a/packages/umockdev.rb b/packages/umockdev.rb index 1d9346955..e96aaeab2 100644 --- a/packages/umockdev.rb +++ b/packages/umockdev.rb @@ -25,7 +25,7 @@ class Umockdev < Package depends_on 'glib' depends_on 'libgudev' depends_on 'vala' => :build - depends_on 'six' => :build + depends_on 'py3_six' => :build def self.build system "./autogen.sh" diff --git a/packages/youtube_dl.rb b/packages/youtube_dl.rb new file mode 100644 index 000000000..5903a3eb3 --- /dev/null +++ b/packages/youtube_dl.rb @@ -0,0 +1,20 @@ +require 'package' + +class Youtube_dl < Package + description 'Command-line program to download videos from YouTube.com and other video sites' + homepage 'https://youtube-dl.org/' + @_ver = '2021.04.26' + version @_ver + license 'public-domain' + compatibility 'all' + source_url 'https://github.com/ytdl-org/youtube-dl.git' + git_hashtag @_ver + + def self.build + system "python3 setup.py build #{PY3_SETUP_BUILD_OPTIONS}" + end + + def self.install + system "python3 setup.py install #{PY_SETUP_INSTALL_OPTIONS}" + end +end diff --git a/packages/youtubedl.rb b/packages/youtubedl.rb deleted file mode 100644 index 4393162d0..000000000 --- a/packages/youtubedl.rb +++ /dev/null @@ -1,28 +0,0 @@ -require 'package' - -class Youtubedl < Package - description 'Command-line program to download videos from YouTube.com and other video sites' - homepage 'https://youtube-dl.org/' - version '2021.02.10' - license 'public-domain' - compatibility 'all' - source_url 'https://github.com/ytdl-org/youtube-dl/releases/download/2021.02.10/youtube-dl-2021.02.10.tar.gz' - source_sha256 'd607adf66b7047865733f7d05af9478118ee4dd974ef9f971563e11de7f29122' - - binary_url ({ - aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/youtubedl/2021.02.10_armv7l/youtubedl-2021.02.10-chromeos-armv7l.tar.xz', - armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/youtubedl/2021.02.10_armv7l/youtubedl-2021.02.10-chromeos-armv7l.tar.xz', - i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/youtubedl/2021.02.10_i686/youtubedl-2021.02.10-chromeos-i686.tar.xz', - x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/youtubedl/2021.02.10_x86_64/youtubedl-2021.02.10-chromeos-x86_64.tar.xz', - }) - binary_sha256 ({ - aarch64: '595afef841f6baf7d61cbea4956804e010c1f34c15a631534fb069d113794301', - armv7l: '595afef841f6baf7d61cbea4956804e010c1f34c15a631534fb069d113794301', - i686: '7f5d197be7122f5a63e9cd4ed4f3450b1c61ff256b7b190cd4f059f3dbd5fab6', - x86_64: 'f03d9b99696b5a93be0a1f14271e90ed8ee1029b3d104e7b1d4be3af1b9a044d', - }) - - def self.install - system "pip install --prefix #{CREW_PREFIX} --root #{CREW_DEST_DIR} -I youtube-dl==#{version} --no-warn-script-location" - end -end