app-admin/calamares : version bump

3 files changed, 136 insertions, 97 deletions

diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest
index 409997d8..0afd8154 100644
--- a/app-admin/calamares/Manifest
+++ b/app-admin/calamares/Manifest
@@ -1 +1 @@
-DIST calamares-3.2.62.tar.gz 4333895 BLAKE2B cf9bb1fed12e1782fc5b9248e05cab3e26c7233e965a070250fe85ac114b5560ea7c9d256c52ba6ee1be930d29f167fa48beed1b42b4a6cc30dc1ea31bd025c9 SHA512 a6ec831a9bc35e7f32563def5d48b4fa2e4ab5810fc3065d847a22adfe7c26f7c7427d5d0fe6259ab839c52756e8cd23185e2a61bc5155a3b884f67677e6cd92
+DIST calamares-3.3.6.tar.gz 4733000 BLAKE2B 6c5bae1c7939d84fdbf599e7c5b478c799efbdf21f1aa120fda05106775477274eafd5687a787c177b747226c8438aec72acc90414bff9c7952d71ce8cb5e376 SHA512 3fa38f136a7a8c1f7dc2be8f98d2f323e38ab3bb535ffaf833d26839c3a2fe1d1dab392cd103380098328fc7465f262cde7ae09efa996c7fb66233d8391ae4f6
diff --git a/app-admin/calamares/calamares-3.2.62-r1.ebuild b/app-admin/calamares/calamares-3.2.62-r1.ebuild
deleted file mode 100644
index 00f0b07e..00000000
--- a/app-admin/calamares/calamares-3.2.62-r1.ebuild
+++ /dev/null
@@ -1,96 +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_{10..12} )
-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/calamares-3.3.6-r10.ebuild b/app-admin/calamares/calamares-3.3.6-r10.ebuild
new file mode 100644
index 00000000..04f721f1
--- /dev/null
+++ b/app-admin/calamares/calamares-3.3.6-r10.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="true"
+PYTHON_COMPAT=( python3_{10..12} )
+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 qt6"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+QT5_MIN="5.15.0"
+KF_QT5_MIN="5.78"
+QT6_MIN="6.5.0"
+KF_QT6_MIN="5.240"
+
+BDEPEND="
+	qt6? (
+		>=dev-qt/qttools-${QT6_MIN}:6[linguist]
+		>=kde-frameworks/extra-cmake-modules-${KF_QT6_MIN}
+	)
+	!qt6? (
+		>=dev-qt/linguist-tools-${QT5_MIN}:5
+		>=kde-frameworks/extra-cmake-modules-${KF_QT5_MIN}
+	)
+"
+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}]
+	')
+	qt6? (
+		>=dev-qt/qtbase-${QT6_MIN}:6[concurrent,dbus,gui,network,widgets,xml]
+		>=dev-qt/qtdeclarative-${QT6_MIN}:6
+		>=dev-qt/qtsvg-${QT6_MIN}:6
+		>=dev-qt/qtwebengine-${QT6_MIN}:6[widgets]
+		>=kde-frameworks/kconfig-${KF_QT6_MIN}:6
+		>=kde-frameworks/kcoreaddons-${KF_QT6_MIN}:6
+		>=kde-frameworks/kcrash-${KF_QT6_MIN}:6
+		>=kde-frameworks/ki18n-${KF_QT6_MIN}:6
+		>=kde-frameworks/kpackage-${KF_QT6_MIN}:6
+		>=kde-frameworks/kparts-${KF_QT6_MIN}:6
+		>=kde-frameworks/kservice-${KF_QT6_MIN}:6
+		>=kde-frameworks/kwidgetsaddons-${KF_QT6_MIN}:6
+		sys-auth/polkit-qt[qt6(-)]
+		>=sys-libs/kpmcore-24.01.75:6=
+	)
+	!qt6? (
+		>=dev-qt/qtconcurrent-${QT5_MIN}:5
+		>=dev-qt/qtdbus-${QT5_MIN}:5
+		>=dev-qt/qtdeclarative-${QT5_MIN}:5
+		>=dev-qt/qtgui-${QT5_MIN}:5
+		>=dev-qt/qtnetwork-${QT5_MIN}:5
+		>=dev-qt/qtsvg-${QT5_MIN}:5
+		>=dev-qt/qtwebengine-${QT5_MIN}:5[widgets]
+		>=dev-qt/qtwidgets-${QT5_MIN}:5
+		>=dev-qt/qtxml-${QT5_MIN}:5
+		>=kde-frameworks/kconfig-${KF_QT5_MIN}:5
+		>=kde-frameworks/kcoreaddons-${KF_QT5_MIN}:5
+		>=kde-frameworks/kcrash-${KF_QT5_MIN}:5
+		>=kde-frameworks/ki18n-${KF_QT5_MIN}:5
+		>=kde-frameworks/kpackage-${KF_QT5_MIN}:5
+		>=kde-frameworks/kparts-${KF_QT5_MIN}:5
+		>=kde-frameworks/kservice-${KF_QT5_MIN}:5
+		>=kde-frameworks/kwidgetsaddons-${KF_QT5_MIN}:5
+		sys-auth/polkit-qt[qt5(+)]
+		>=sys-libs/kpmcore-20.04.0:5=
+	)
+	dev-libs/appstream
+	dev-python/jsonschema
+	dev-python/pyyaml
+	sys-apps/dbus
+	sys-apps/dmidecode
+	sys-apps/gptfdisk
+	virtual/libcrypt:=
+"
+DEPEND="${COMMON_DEPEND}
+	test? (
+		!qt6? ( 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
+		-DINSTALL_COMPLETION=ON
+		-DINSTALL_POLKIT=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_LIBPARTED=ON
+		-DWITH_PYTHON=ON
+		-DWITH_PYBIND11=OFF
+		-DBUILD_APPDATA=ON
+		-DWITH_QT6="$(usex qt6)"
+	)
+
+	ecm_src_configure
+}
+
+src_install() {
+	ecm_src_install
+	dobin "${FILESDIR}"/calamares-pkexec
+}