diff options
| author |   Johannes Huber <johu@gentoo.org> | 2017-03-03 19:21:21 +0100 |
|---|---|---|
| committer | Johannes Huber <johu@gentoo.org> | 2017-03-03 19:21:21 +0100 |
| commit | c1f5656c3c4294a908ff125109fc092b0ca698d8 (patch) | |
| tree | 880eb2ab997e2c9d5651657cede693b7b3170294 /app-admin | |
| parent | Drop deprecated $Id$ from ebuild header (diff) | |
| download | johu-c1f5656c3c4294a908ff125109fc092b0ca698d8.tar.gz johu-c1f5656c3c4294a908ff125109fc092b0ca698d8.tar.bz2 johu-c1f5656c3c4294a908ff125109fc092b0ca698d8.zip | |
app-admin/calamares: Sync with gentoo main tree
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Diffstat (limited to 'app-admin')
| -rw-r--r-- | app-admin/calamares/calamares-9999.ebuild | 13 | ||||
| -rw-r--r-- | app-admin/calamares/metadata.xml | 7 |
2 files changed, 15 insertions, 5 deletions
diff --git a/app-admin/calamares/calamares-9999.ebuild b/app-admin/calamares/calamares-9999.ebuild index f4d00d9..9fef434 100644 --- a/app-admin/calamares/calamares-9999.ebuild +++ b/app-admin/calamares/calamares-9999.ebuild @@ -11,12 +11,14 @@ 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" + inherit versionator + MAJOR_PV=$(get_version_component_range 1-2) + SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${MAJOR_PV}/${P}.tar.gz" KEYWORDS="~amd64" fi LICENSE="GPL-3" -IUSE="+networkmanager +upower" +IUSE="+networkmanager pythonqt +upower" REQUIRED_USE="${PYTHON_REQUIRED_USE}" @@ -36,7 +38,8 @@ DEPEND="${PYTHON_DEPS} sys-apps/dbus sys-apps/dmidecode sys-auth/polkit-qt[qt5] - sys-libs/kpmcore:5= + >=sys-libs/kpmcore-3.0.2:5= + pythonqt? ( >=dev-python/PythonQt-3.1:=[${PYTHON_USEDEP}] ) " RDEPEND="${DEPEND} @@ -47,8 +50,7 @@ RDEPEND="${DEPEND} || ( sys-boot/grub:2 sys-boot/systemd-boot ) sys-boot/os-prober sys-fs/squashfs-tools - sys-fs/udisks:2[systemd] - virtual/udev[systemd] + virtual/udev networkmanager? ( net-misc/networkmanager ) upower? ( sys-power/upower ) " @@ -66,6 +68,7 @@ src_prepare() { src_configure() { local mycmakeargs=( -DWEBVIEW_FORCE_WEBKIT=OFF + -DWITH_PYTHONQT=$(usex pythonqt) ) kde5_src_configure diff --git a/app-admin/calamares/metadata.xml b/app-admin/calamares/metadata.xml index f280356..bc9aeb3 100644 --- a/app-admin/calamares/metadata.xml +++ b/app-admin/calamares/metadata.xml @@ -5,6 +5,10 @@ <email>johu@gentoo.org</email> <name>Johannes Huber</name> </maintainer> + <maintainer type="person"> + <email>mudler@gentoo.org</email> + <name>Ettore Di Giacinto</name> + </maintainer> <longdescription> Calamares is a distribution-independent system installer, with an advanced partitioning feature for both manual and automated @@ -17,4 +21,7 @@ <upstream> <remote-id type="github">calamares/calamares</remote-id> </upstream> + <use> + <flag name="pythonqt">Enable PythonQt-based module interface</flag> + </use> </pkgmetadata> |