From f39651804b16588a2da3a765b46d1dfd3ae7f624 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 4 Aug 2023 23:23:28 +0100 Subject: app-admin/calamares : version bump --- app-admin/calamares/Manifest | 2 +- app-admin/calamares/calamares-3.2.44.3-r3.ebuild | 100 --------------------- app-admin/calamares/calamares-3.2.62.ebuild | 96 ++++++++++++++++++++ .../files/calamares-dont-run-locale-gen.patch | 24 ----- metadata/md5-cache/app-admin/calamares-3.2.44.3-r3 | 18 ---- metadata/md5-cache/app-admin/calamares-3.2.62 | 18 ++++ metadata/pkg_desc_index | 2 +- 7 files changed, 116 insertions(+), 144 deletions(-) delete mode 100644 app-admin/calamares/calamares-3.2.44.3-r3.ebuild create mode 100644 app-admin/calamares/calamares-3.2.62.ebuild delete mode 100644 app-admin/calamares/files/calamares-dont-run-locale-gen.patch delete mode 100644 metadata/md5-cache/app-admin/calamares-3.2.44.3-r3 create mode 100644 metadata/md5-cache/app-admin/calamares-3.2.62 diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest index 9c9f41e6..409997d8 100644 --- a/app-admin/calamares/Manifest +++ b/app-admin/calamares/Manifest @@ -1 +1 @@ -DIST calamares-3.2.44.3.tar.gz 4170955 BLAKE2B fff2f58bcdcfc3bdca8f290cad6ca584eb7f3b48cb6009731e0cf8ba155664639694eb06ada2fa0205f66b78ee0503c89f66614952f0fa15c55ea0fcca087b78 SHA512 13130befa8705c5b7d04bf90329e97797f2477abf11a77fb41e158724969284278a6078da4e015944d24ac0a062e60c3bbc250c7c359ff1f1a5b28f7b85d159a +DIST calamares-3.2.62.tar.gz 4333895 BLAKE2B cf9bb1fed12e1782fc5b9248e05cab3e26c7233e965a070250fe85ac114b5560ea7c9d256c52ba6ee1be930d29f167fa48beed1b42b4a6cc30dc1ea31bd025c9 SHA512 a6ec831a9bc35e7f32563def5d48b4fa2e4ab5810fc3065d847a22adfe7c26f7c7427d5d0fe6259ab839c52756e8cd23185e2a61bc5155a3b884f67677e6cd92 diff --git a/app-admin/calamares/calamares-3.2.44.3-r3.ebuild b/app-admin/calamares/calamares-3.2.44.3-r3.ebuild deleted file mode 100644 index 67a6371d..00000000 --- a/app-admin/calamares/calamares-3.2.44.3-r3.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_TEST="true" -PYTHON_COMPAT=( python3_{8,9,10} ) -inherit ecm python-single-r1 - -DESCRIPTION="Distribution-independent installer framework" -HOMEPAGE="https://calamares.io" -SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz" -KEYWORDS="~amd64" -SLOT=0 -LICENSE="GPL-3" -IUSE="+branding +config" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -BDEPEND=" - dev-qt/linguist-tools:5 -" -COMMON_DEPEND="${PYTHON_DEPS} - dev-cpp/yaml-cpp:= - $(python_gen_cond_dep ' - >=dev-libs/boost-1.55:=[python,${PYTHON_USEDEP}] - dev-libs/libpwquality[${PYTHON_USEDEP}] - ') - dev-qt/qtconcurrent:5 - dev-qt/qtdbus:5 - dev-qt/qtdeclarative:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtsvg:5 - dev-qt/qtwebengine:5[widgets] - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - dev-libs/appstream - dev-python/jsonschema - dev-python/pyyaml - kde-frameworks/kconfig:5 - kde-frameworks/kcoreaddons:5 - kde-frameworks/kcrash:5 - kde-frameworks/kpackage:5 - kde-frameworks/kparts:5 - kde-frameworks/kservice:5 - sys-apps/dbus - sys-apps/dmidecode - sys-apps/gptfdisk - sys-auth/polkit-qt - >=sys-libs/kpmcore-4.0.0:5= - virtual/libcrypt:= -" -DEPEND="${COMMON_DEPEND} - test? ( dev-qt/qttest:5 ) -" -RDEPEND="${COMMON_DEPEND} - dev-libs/libatasmart - net-misc/rsync - sys-boot/grub:2 - sys-boot/os-prober - sys-fs/squashfs-tools - sys-libs/timezone-data - sys-power/upower - virtual/udev - branding? ( x11-themes/redcore-artwork-calamares ) - config? ( app-misc/calamares-config-redcore ) -" - -PATCHES=" - ${FILESDIR}/calamares-dont-run-locale-gen.patch -" - -src_prepare() { - ecm_src_prepare - export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \ - PYTHON_INCLUDE_PATH="$(python_get_library_path)"\ - PYTHON_CFLAGS="$(python_get_CFLAGS)"\ - PYTHON_LIBS="$(python_get_LIBS)" - - sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' \ - calamares.desktop || die - sed -i -e 's:Icon=calamares:Icon=redcore-weblink:' \ - calamares.desktop || die -} - -src_configure() { - local mycmakeargs=( - -DINSTALL_CONFIG=ON - -DWEBVIEW_FORCE_WEBKIT=OFF - -DCMAKE_DISABLE_FIND_PACKAGE_LIBPARTED=ON - ) - - ecm_src_configure -} - -src_install() { - ecm_src_install - dobin "${FILESDIR}"/calamares-pkexec -} diff --git a/app-admin/calamares/calamares-3.2.62.ebuild b/app-admin/calamares/calamares-3.2.62.ebuild new file mode 100644 index 00000000..cfd00f97 --- /dev/null +++ b/app-admin/calamares/calamares-3.2.62.ebuild @@ -0,0 +1,96 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_TEST="true" +PYTHON_COMPAT=( python3_{8,9,10} ) +inherit ecm python-single-r1 + +DESCRIPTION="Distribution-independent installer framework" +HOMEPAGE="https://calamares.io" +SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz" +KEYWORDS="~amd64" +SLOT=0 +LICENSE="GPL-3" +IUSE="+branding +config" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +BDEPEND=" + dev-qt/linguist-tools:5 +" +COMMON_DEPEND="${PYTHON_DEPS} + dev-cpp/yaml-cpp:= + $(python_gen_cond_dep ' + >=dev-libs/boost-1.55:=[python,${PYTHON_USEDEP}] + dev-libs/libpwquality[${PYTHON_USEDEP}] + ') + dev-qt/qtconcurrent:5 + dev-qt/qtdbus:5 + dev-qt/qtdeclarative:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtsvg:5 + dev-qt/qtwebengine:5[widgets] + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 + dev-libs/appstream + dev-python/jsonschema + dev-python/pyyaml + kde-frameworks/kconfig:5 + kde-frameworks/kcoreaddons:5 + kde-frameworks/kcrash:5 + kde-frameworks/kpackage:5 + kde-frameworks/kparts:5 + kde-frameworks/kservice:5 + sys-apps/dbus + sys-apps/dmidecode + sys-apps/gptfdisk + sys-auth/polkit-qt + >=sys-libs/kpmcore-4.0.0:5= + virtual/libcrypt:= +" +DEPEND="${COMMON_DEPEND} + test? ( dev-qt/qttest:5 ) +" +RDEPEND="${COMMON_DEPEND} + dev-libs/libatasmart + net-misc/rsync + sys-boot/grub:2 + sys-boot/os-prober + sys-fs/squashfs-tools + sys-libs/timezone-data + sys-power/upower + virtual/udev + branding? ( x11-themes/redcore-artwork-calamares ) + config? ( app-misc/calamares-config-redcore ) +" + +src_prepare() { + ecm_src_prepare + export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \ + PYTHON_INCLUDE_PATH="$(python_get_library_path)"\ + PYTHON_CFLAGS="$(python_get_CFLAGS)"\ + PYTHON_LIBS="$(python_get_LIBS)" + + sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' \ + calamares.desktop || die + sed -i -e 's:Icon=calamares:Icon=redcore-weblink:' \ + calamares.desktop || die +} + +src_configure() { + local mycmakeargs=( + -DINSTALL_CONFIG=ON + -DWEBVIEW_FORCE_WEBKIT=OFF + -DCMAKE_DISABLE_FIND_PACKAGE_LIBPARTED=ON + ) + + ecm_src_configure +} + +src_install() { + ecm_src_install + dobin "${FILESDIR}"/calamares-pkexec +} diff --git a/app-admin/calamares/files/calamares-dont-run-locale-gen.patch b/app-admin/calamares/files/calamares-dont-run-locale-gen.patch deleted file mode 100644 index 03314b12..00000000 --- a/app-admin/calamares/files/calamares-dont-run-locale-gen.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Nur a/src/modules/localecfg/main.py b/src/modules/localecfg/main.py ---- a/src/modules/localecfg/main.py 2020-05-11 19:53:23.000000000 +0100 -+++ b/src/modules/localecfg/main.py 2020-05-21 16:11:50.013845904 +0100 -@@ -149,20 +149,6 @@ - target_locale_conf_path = "{!s}/etc/locale.conf".format(install_path) - target_etc_default_path = "{!s}/etc/default".format(install_path) - -- # restore backup if available -- if os.path.exists(target_locale_gen_bak): -- shutil.copy2(target_locale_gen_bak, target_locale_gen) -- libcalamares.utils.debug("Restored backup {!s} -> {!s}" -- .format(target_locale_gen_bak, target_locale_gen)) -- -- # run locale-gen if detected; this *will* cause an exception -- # if the live system has locale.gen, but the target does not: -- # in that case, fix your installation filesystem. -- if os.path.exists('/etc/locale.gen'): -- rewrite_locale_gen(target_locale_gen, target_locale_gen, locale_conf) -- libcalamares.utils.target_env_call(['locale-gen']) -- libcalamares.utils.debug('{!s} done'.format(target_locale_gen)) -- - # write /etc/locale.conf - with open(target_locale_conf_path, "w") as lcf: - for k, v in locale_conf.items(): diff --git a/metadata/md5-cache/app-admin/calamares-3.2.44.3-r3 b/metadata/md5-cache/app-admin/calamares-3.2.44.3-r3 deleted file mode 100644 index 3591bbe2..00000000 --- a/metadata/md5-cache/app-admin/calamares-3.2.44.3-r3 +++ /dev/null @@ -1,18 +0,0 @@ -BDEPEND=dev-qt/linguist-tools:5 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.82.0:5 -DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test -DEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) dev-cpp/yaml-cpp:= python_single_target_python3_10? ( >=dev-libs/boost-1.55:=[python,python_targets_python3_10(-)] dev-libs/libpwquality[python_targets_python3_10(-)] ) dev-qt/qtconcurrent:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-libs/appstream dev-python/jsonschema dev-python/pyyaml kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/kcrash:5 kde-frameworks/kpackage:5 kde-frameworks/kparts:5 kde-frameworks/kservice:5 sys-apps/dbus sys-apps/dmidecode sys-apps/gptfdisk sys-auth/polkit-qt >=sys-libs/kpmcore-4.0.0:5= virtual/libcrypt:= test? ( dev-qt/qttest:5 ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5 -DESCRIPTION=Distribution-independent installer framework -EAPI=8 -HOMEPAGE=https://calamares.io -IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info -INHERIT=ecm python-single-r1 -IUSE=+branding +config debug test +python_single_target_python3_10 -KEYWORDS=~amd64 -LICENSE=GPL-3 -RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) dev-cpp/yaml-cpp:= python_single_target_python3_10? ( >=dev-libs/boost-1.55:=[python,python_targets_python3_10(-)] dev-libs/libpwquality[python_targets_python3_10(-)] ) dev-qt/qtconcurrent:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-libs/appstream dev-python/jsonschema dev-python/pyyaml kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/kcrash:5 kde-frameworks/kpackage:5 kde-frameworks/kparts:5 kde-frameworks/kservice:5 sys-apps/dbus sys-apps/dmidecode sys-apps/gptfdisk sys-auth/polkit-qt >=sys-libs/kpmcore-4.0.0:5= virtual/libcrypt:= dev-libs/libatasmart net-misc/rsync sys-boot/grub:2 sys-boot/os-prober sys-fs/squashfs-tools sys-libs/timezone-data sys-power/upower virtual/udev branding? ( x11-themes/redcore-artwork-calamares ) config? ( app-misc/calamares-config-redcore ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 -REQUIRED_USE=^^ ( python_single_target_python3_10 ) -RESTRICT=!test? ( test ) -SLOT=0 -SRC_URI=https://github.com/calamares/calamares/releases/download/v3.2.44.3/calamares-3.2.44.3.tar.gz -_eclasses_=cmake aa1d1fa7be37663d48162ac963b22692 ecm 582ef00537aa518e5a8ca3aa66bd9dc0 flag-o-matic ad475baa777c9978fa035216c8264a10 multilib c19072c3cd7ac5cb21de013f7e9832e0 multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 ninja-utils f3010c780f65d1bb5aea15a9af1adc9c python-single-r1 75118e916668a74c660a13b0ecb22562 python-utils-r1 7f2c0a7465411e0f3a6db30e966155d6 toolchain-funcs 0c8a0b0d318eb5d5180d114bd3f6592b virtualx 817571665ee28575da44ee08135089e5 xdg 4a14c5c24f121e7da66e5aab4a168c6e xdg-utils baea6080dd821f5562d715887954c9d3 -_md5_=bf6d440c14af499d2e0f0fb106473321 diff --git a/metadata/md5-cache/app-admin/calamares-3.2.62 b/metadata/md5-cache/app-admin/calamares-3.2.62 new file mode 100644 index 00000000..361bc4e1 --- /dev/null +++ b/metadata/md5-cache/app-admin/calamares-3.2.62 @@ -0,0 +1,18 @@ +BDEPEND=dev-qt/linguist-tools:5 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.82.0:5 +DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test +DEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) dev-cpp/yaml-cpp:= python_single_target_python3_10? ( >=dev-libs/boost-1.55:=[python,python_targets_python3_10(-)] dev-libs/libpwquality[python_targets_python3_10(-)] ) dev-qt/qtconcurrent:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-libs/appstream dev-python/jsonschema dev-python/pyyaml kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/kcrash:5 kde-frameworks/kpackage:5 kde-frameworks/kparts:5 kde-frameworks/kservice:5 sys-apps/dbus sys-apps/dmidecode sys-apps/gptfdisk sys-auth/polkit-qt >=sys-libs/kpmcore-4.0.0:5= virtual/libcrypt:= test? ( dev-qt/qttest:5 ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5 +DESCRIPTION=Distribution-independent installer framework +EAPI=8 +HOMEPAGE=https://calamares.io +IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info +INHERIT=ecm python-single-r1 +IUSE=+branding +config debug test +python_single_target_python3_10 +KEYWORDS=~amd64 +LICENSE=GPL-3 +RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) dev-cpp/yaml-cpp:= python_single_target_python3_10? ( >=dev-libs/boost-1.55:=[python,python_targets_python3_10(-)] dev-libs/libpwquality[python_targets_python3_10(-)] ) dev-qt/qtconcurrent:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-libs/appstream dev-python/jsonschema dev-python/pyyaml kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/kcrash:5 kde-frameworks/kpackage:5 kde-frameworks/kparts:5 kde-frameworks/kservice:5 sys-apps/dbus sys-apps/dmidecode sys-apps/gptfdisk sys-auth/polkit-qt >=sys-libs/kpmcore-4.0.0:5= virtual/libcrypt:= dev-libs/libatasmart net-misc/rsync sys-boot/grub:2 sys-boot/os-prober sys-fs/squashfs-tools sys-libs/timezone-data sys-power/upower virtual/udev branding? ( x11-themes/redcore-artwork-calamares ) config? ( app-misc/calamares-config-redcore ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 +REQUIRED_USE=^^ ( python_single_target_python3_10 ) +RESTRICT=!test? ( test ) +SLOT=0 +SRC_URI=https://github.com/calamares/calamares/releases/download/v3.2.62/calamares-3.2.62.tar.gz +_eclasses_=cmake aa1d1fa7be37663d48162ac963b22692 ecm 582ef00537aa518e5a8ca3aa66bd9dc0 flag-o-matic ad475baa777c9978fa035216c8264a10 multilib c19072c3cd7ac5cb21de013f7e9832e0 multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 ninja-utils f3010c780f65d1bb5aea15a9af1adc9c python-single-r1 75118e916668a74c660a13b0ecb22562 python-utils-r1 7f2c0a7465411e0f3a6db30e966155d6 toolchain-funcs 0c8a0b0d318eb5d5180d114bd3f6592b virtualx 817571665ee28575da44ee08135089e5 xdg 4a14c5c24f121e7da66e5aab4a168c6e xdg-utils baea6080dd821f5562d715887954c9d3 +_md5_=cde9beb5c54f8ec2fdecf223c7cb959c diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index index 84d5df8c..fc68cf7d 100644 --- a/metadata/pkg_desc_index +++ b/metadata/pkg_desc_index @@ -1,5 +1,5 @@ acct-group/smbshare 0: System group: smbshare -app-admin/calamares 3.2.44.3-r3: Distribution-independent installer framework +app-admin/calamares 3.2.62: Distribution-independent installer framework app-admin/opensnitch 1.5.2-r1: Desktop application firewall app-admin/vasile 2.1812.2: Versatile Advanced Script for ISO and Latest Enchantments app-arch/unp 2.0_pre9-r1: Script for unpacking various file formats -- cgit v1.2.3