From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7B986138350 for ; Thu, 19 Mar 2020 07:08:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 74962E0A8F; Thu, 19 Mar 2020 07:08:18 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 141F8E0A8F for ; Thu, 19 Mar 2020 07:08:17 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8587A34F30C for ; Thu, 19 Mar 2020 07:08:16 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 057C7161 for ; Thu, 19 Mar 2020 07:08:14 +0000 (UTC) From: "Johannes Huber" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Johannes Huber" Message-ID: <1584601674.eb1c1d2a1c311be00c79d0e400ca62d346dcd9df.johu@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/calamares/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-admin/calamares/Manifest app-admin/calamares/calamares-3.2.20.ebuild X-VCS-Directories: app-admin/calamares/ X-VCS-Committer: johu X-VCS-Committer-Name: Johannes Huber X-VCS-Revision: eb1c1d2a1c311be00c79d0e400ca62d346dcd9df X-VCS-Branch: master Date: Thu, 19 Mar 2020 07:08:14 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 3fd98a9d-6814-439d-b799-a90550c8b8df X-Archives-Hash: 2eab55c66bf009425063ff9a45ecb05a commit: eb1c1d2a1c311be00c79d0e400ca62d346dcd9df Author: Johannes Huber gentoo org> AuthorDate: Thu Mar 19 07:03:44 2020 +0000 Commit: Johannes Huber gentoo org> CommitDate: Thu Mar 19 07:07:54 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb1c1d2a app-admin/calamares: Version bump 3.2.20 Closes: https://bugs.gentoo.org/708702 Closes: https://bugs.gentoo.org/698430 Package-Manager: Portage-2.3.94, Repoman-2.3.21 Signed-off-by: Johannes Huber gentoo.org> app-admin/calamares/Manifest | 1 + app-admin/calamares/calamares-3.2.20.ebuild | 93 +++++++++++++++++++++++++++++ 2 files changed, 94 insertions(+) diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest index 4c0f5ca38d5..a57d55683de 100644 --- a/app-admin/calamares/Manifest +++ b/app-admin/calamares/Manifest @@ -1 +1,2 @@ DIST calamares-3.2.17.1.tar.gz 3128350 BLAKE2B a6926faaf1d521647cc0037b88686f9ceee1cc8167b888fe3c25228cbca8058572c8786a51f6ce0ccb77b31351d21ac41fa6c86a6577569c118729e1263ccafa SHA512 fa8f1906aa7774b0f6bd65d1dc87ea2e08df92018c162f7e7fe01fe6119e65d6391141bc242623f88040bb18eb8b71003cb7417b27c10b39bc30de0f0bf8deb0 +DIST calamares-3.2.20.tar.gz 3246752 BLAKE2B 11bc23da8f035a0399f54c1f0f9e11806b0e3b77ad9f57c694c15de077ad37d3f282d29d0b4c010f19372e78d14af2cf9c58b95b03d6d867ea6c0c104e701fab SHA512 473422eca83007ce0d82e09d637b73c114fffab338ece8269d37a4496d786eeef5e75b06b60ec51fb85bbd145984d37f0a586edd9c5d58e23abde665b8370c7c diff --git a/app-admin/calamares/calamares-3.2.20.ebuild b/app-admin/calamares/calamares-3.2.20.ebuild new file mode 100644 index 00000000000..8ad695ecfb2 --- /dev/null +++ b/app-admin/calamares/calamares-3.2.20.ebuild @@ -0,0 +1,93 @@ +# 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=5 +LICENSE="GPL-3" +IUSE="+networkmanager pythonqt +upower" + +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= + pythonqt? ( >=dev-python/PythonQt-3.1:=[${PYTHON_SINGLE_USEDEP}] ) +" +DEPEND="${COMMON_DEPEND} + test? ( dev-qt/qttest:5 ) +" +RDEPEND="${COMMON_DEPEND} + app-admin/sudo + dev-libs/libatasmart + net-misc/rsync + || ( sys-boot/grub:2 sys-boot/systemd-boot ) + sys-boot/os-prober + sys-fs/squashfs-tools + sys-libs/timezone-data + virtual/udev + networkmanager? ( net-misc/networkmanager ) + upower? ( sys-power/upower ) +" + +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=drive-harddisk:' \ + calamares.desktop || die +} + +src_configure() { + local mycmakeargs=( + -DINSTALL_CONFIG=ON + -DWEBVIEW_FORCE_WEBKIT=OFF + -DCMAKE_DISABLE_FIND_PACKAGE_LIBPARTED=ON + -DWITH_PYTHONQT=$(usex pythonqt) + ) + + ecm_src_configure +} + +src_install() { + ecm_src_install + dobin "${FILESDIR}"/calamares-pkexec +}