From f658868b6e504639221a1bc5545225b04742fff1 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 18 Dec 2020 20:06:11 +0000 Subject: app-admin/calamares : version bump --- app-admin/calamares/Manifest | 2 +- app-admin/calamares/calamares-3.2.24-r1.ebuild | 95 -------------------------- app-admin/calamares/calamares-3.2.35.1.ebuild | 95 ++++++++++++++++++++++++++ 3 files changed, 96 insertions(+), 96 deletions(-) delete mode 100644 app-admin/calamares/calamares-3.2.24-r1.ebuild create mode 100644 app-admin/calamares/calamares-3.2.35.1.ebuild diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest index 684761a4..ca6dfaca 100644 --- a/app-admin/calamares/Manifest +++ b/app-admin/calamares/Manifest @@ -1 +1 @@ -DIST calamares-3.2.24.tar.gz 3557006 BLAKE2B 80dda7556bc2a21ac15b527472f1867ecd825a46ced3281243329704e7260923bd39ecb4ebabfd6d39e10a3c5ca805002fb51387db5f6c59ddea594aa1399c13 SHA512 96e62f97b3257208eec3cdc4b048b9089f64babab745a1f52362b6a367dc550aed0f03b79de5a7456c0576fc681c37ce569a16b591b9f5b84dd01e12cefdb880 +DIST calamares-3.2.35.1.tar.gz 3533073 BLAKE2B 08da21e60ef8f180374fb07001d28bce768e0055b87e04cca966146ce8ee01e7c0a3c8a739876696657b4faca5de381a20e2a619ff7abe54281dd1d4b12516fd SHA512 5c0c19fdfaeea85f467a6b59a3e088ad5709940a25521a28bbf8a9bb69a2e87d44f40a4500688c383036c48d4c4d70176bb170dcc39897fff3e09be3117de9ff diff --git a/app-admin/calamares/calamares-3.2.24-r1.ebuild b/app-admin/calamares/calamares-3.2.24-r1.ebuild deleted file mode 100644 index 2d97bb32..00000000 --- a/app-admin/calamares/calamares-3.2.24-r1.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ECM_TEST="true" -PYTHON_COMPAT=( python3_7 ) -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_MULTI_USEDEP}] - dev-libs/libpwquality[${PYTHON_MULTI_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 - 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-auth/polkit-qt - >=sys-libs/kpmcore-4.0.0:5= -" -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.35.1.ebuild b/app-admin/calamares/calamares-3.2.35.1.ebuild new file mode 100644 index 00000000..2d97bb32 --- /dev/null +++ b/app-admin/calamares/calamares-3.2.35.1.ebuild @@ -0,0 +1,95 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +ECM_TEST="true" +PYTHON_COMPAT=( python3_7 ) +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_MULTI_USEDEP}] + dev-libs/libpwquality[${PYTHON_MULTI_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 + 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-auth/polkit-qt + >=sys-libs/kpmcore-4.0.0:5= +" +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 +} -- cgit v1.2.3