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 AC6DE139694 for ; Thu, 16 Feb 2017 18:32:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9939721C028; Thu, 16 Feb 2017 18:32:25 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6954521C028 for ; Thu, 16 Feb 2017 18:32:25 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DCD7E33BEFC for ; Thu, 16 Feb 2017 18:32:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B8F624A18 for ; Thu, 16 Feb 2017 18:32:21 +0000 (UTC) From: "Ettore Di Giacinto" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ettore Di Giacinto" Message-ID: <1487269932.3174f603c042cb486b54a668a14182c3617b31e5.mudler@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.0.1.ebuild app-admin/calamares/metadata.xml X-VCS-Directories: app-admin/calamares/ X-VCS-Committer: mudler X-VCS-Committer-Name: Ettore Di Giacinto X-VCS-Revision: 3174f603c042cb486b54a668a14182c3617b31e5 X-VCS-Branch: master Date: Thu, 16 Feb 2017 18:32:21 +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-Archives-Salt: 6cac38cd-bede-4302-88b1-0f2bc57b4fd4 X-Archives-Hash: 1e2795ade088d448f0785775ff5f915a commit: 3174f603c042cb486b54a668a14182c3617b31e5 Author: Ettore Di Giacinto gentoo org> AuthorDate: Thu Feb 16 18:01:28 2017 +0000 Commit: Ettore Di Giacinto gentoo org> CommitDate: Thu Feb 16 18:32:12 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3174f603 app-admin/calamares: version bump to 3.0.1 Package-Manager: Portage-2.3.3, Repoman-2.3.1 app-admin/calamares/Manifest | 1 + app-admin/calamares/calamares-3.0.1.ebuild | 82 ++++++++++++++++++++++++++++++ app-admin/calamares/metadata.xml | 3 ++ 3 files changed, 86 insertions(+) diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest index c3bdca772c..c2154b9e36 100644 --- a/app-admin/calamares/Manifest +++ b/app-admin/calamares/Manifest @@ -1 +1,2 @@ DIST calamares-2.4.6.tar.gz 2143386 SHA256 c091ad0db9b69b7552d7f282317ba4a4453d7e5ca7ee4bf98f605fe43c63597e SHA512 d2ba4675a846095c437231eb1d59f86668f7c65e2f9bda9681cd4de60324b8d8007f4337f8cd93ca71a303812ecdb8c55935805adc8fd25bb98f1e39432be009 WHIRLPOOL b54ac8347604942a00293c23e766142af867ac37dc3e910d93a07fc909eefb70bd9dc7744270320fcda10b25c3db50476f35074122ae60ee2243e46ab14ea206 +DIST calamares-3.0.1.tar.gz 2213505 SHA256 2c0f4f04d1520186ef0b30584daa73c32dce99603bb4d8f6880497ee3f2322b5 SHA512 9d6dfae611211bffae5509e97fdd1363701a2db675224badf058a4d22c395e150cf91d148fcfbe49fa7aef8c81049a331a91a3b350cb47acbb9af934e3c96f22 WHIRLPOOL d8fb6c7fe6a594055f3ba0be9fd9e46833b590accc58ffb36ef852bad3dbbb67560b021747f81f1f115d7622df0be1ab776d696d5ed818269badc9b3b47b721d diff --git a/app-admin/calamares/calamares-3.0.1.ebuild b/app-admin/calamares/calamares-3.0.1.ebuild new file mode 100644 index 0000000000..d40894d9ba --- /dev/null +++ b/app-admin/calamares/calamares-3.0.1.ebuild @@ -0,0 +1,82 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +PYTHON_COMPAT=( python{3_4,3_5} ) +inherit kde5 python-r1 + +DESCRIPTION="Distribution-independent installer framework" +HOMEPAGE="http://calamares.io" +if [[ ${KDE_BUILD_TYPE} == live ]] ; then + EGIT_REPO_URI="git://github.com/${PN}/${PN}" +else + SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz" + KEYWORDS="~amd64" +fi + +LICENSE="GPL-3" +IUSE="+networkmanager pythonqt +upower" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +DEPEND="${PYTHON_DEPS} + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep kparts) + $(add_frameworks_dep kservice) + $(add_qt_dep qtdbus) + $(add_qt_dep qtdeclarative) + $(add_qt_dep qtgui) + $(add_qt_dep qtnetwork) + $(add_qt_dep qtsvg) + $(add_qt_dep qtwebengine 'widgets') + $(add_qt_dep qtwidgets) + >=dev-cpp/yaml-cpp-0.5.1 + >=dev-libs/boost-1.55:=[${PYTHON_USEDEP}] + sys-apps/dbus + sys-apps/dmidecode + sys-auth/polkit-qt[qt5] + >=sys-libs/kpmcore-3.0.2:5= + pythonqt? ( >=dev-python/PythonQt-3.1:=[${PYTHON_USEDEP}] ) +" + +RDEPEND="${DEPEND} + app-admin/sudo + dev-libs/libatasmart + net-misc/rsync + >=sys-block/parted-3.0 + || ( sys-boot/grub:2 sys-boot/systemd-boot ) + sys-boot/os-prober + sys-fs/squashfs-tools + sys-fs/udisks:2[systemd] + virtual/udev[systemd] + networkmanager? ( net-misc/networkmanager ) + upower? ( sys-power/upower ) +" + +src_prepare() { + python_setup + export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \ + PYTHON_INCLUDE_PATH="$(python_get_library_path)"\ + PYTHON_CFLAGS="$(python_get_CFLAGS)"\ + PYTHON_LIBS="$(python_get_LIBS)" + + eapply_user +} + +src_configure() { + local mycmakeargs=( + -DWEBVIEW_FORCE_WEBKIT=OFF + -DWITH_PYTHONQT=$(usex pythonqt) + ) + + kde5_src_configure + sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' "${S}"/calamares.desktop + sed -i -e 's:Icon=calamares:Icon=drive-harddisk:' "${S}"/calamares.desktop +} + +src_install() { + kde5_src_install + dobin "${FILESDIR}"/calamares-pkexec +} diff --git a/app-admin/calamares/metadata.xml b/app-admin/calamares/metadata.xml index 8c2f796487..bc9aeb3299 100644 --- a/app-admin/calamares/metadata.xml +++ b/app-admin/calamares/metadata.xml @@ -21,4 +21,7 @@ calamares/calamares + + Enable PythonQt-based module interface +