[gentoo-commits] dev/johu:master commit in: app-admin/calamares/files/, app-admin/calamares/

[gentoo-commits] dev/johu:master commit in: app-admin/calamares/files/, app-admin/calamares/

[Johannes Huber]

commit:     cc241e1f69bd2805a363dac50634fd52c42fd731
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 22 21:23:46 2015 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed Jul 22 21:23:46 2015 +0000
URL:        https://gitweb.gentoo.org/dev/johu.git/commit/?id=cc241e1f

[app-admin/calamares] Migrate to kde5 eclass

* sort deps
* simplify release/live switch
* update DESCRIPTON
* add missing wrapper script

Package-Manager: portage-2.2.20

 app-admin/calamares/calamares-9999.ebuild  | 73 +++++++++++++-----------------
 app-admin/calamares/files/calamares-pkexec |  2 +
 2 files changed, 34 insertions(+), 41 deletions(-)

diff --git a/app-admin/calamares/calamares-9999.ebuild b/app-admin/calamares/calamares-9999.ebuild
index d12c0d9..45233df 100644
--- a/app-admin/calamares/calamares-9999.ebuild
+++ b/app-admin/calamares/calamares-9999.ebuild
@@ -5,64 +5,55 @@
 EAPI=5
 
 PYTHON_COMPAT=( python{3_3,3_4} )
-inherit eutils cmake-utils python-r1
+inherit kde5 python-r1
 
-MY_AUTHOR="calamares"
-DESCRIPTION="A Distribution-independent installer framework."
-HOMEPAGE="http://${MY_AUTHOR}.io"
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	SRC_URI=""
-	EGIT_REPO_URI="git://github.com/${MY_AUTHOR}/${PN}.git
-		       https://github.com/${MY_AUTHOR}/${PN}.git"
+DESCRIPTION="Distribution-independent installer framework"
+HOMEPAGE="http://calamares.io"
+if [[ ${KDE_BUILD_TYPE} == live ]] ; then
+	EGIT_REPO_URI="git://github.com/${PN}/${PN}"
 	KEYWORDS=""
 else
-	inherit git-r3
-	SRC_URI=""
-	EGIT_REPO_URI="git://github.com/${MY_AUTHOR}/${PN}.git
-		       https://github.com/${MY_AUTHOR}/${PN}.git"
-	EGIT_COMMIT=
-	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64"
 fi
 
 LICENSE="GPL-3"
-SLOT="0"
 IUSE="+networkmanager +upower"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
 DEPEND="${PYTHON_DEPS}
-	sys-apps/dbus
-	>=dev-qt/qtquick1-5.4.0:5
-	>=dev-qt/linguist-tools-5.4.0:5
-	>=dev-qt/qtconcurrent-5.4.0:5
-	>=dev-qt/qtcore-5.4.0:5
-	>=dev-qt/qtdbus-5.4.0:5
-	>=dev-qt/qtgui-5.4.0:5
-	>=dev-qt/qtsvg-5.4.0:5
-	>=dev-qt/qtwidgets-5.4.0:5
-	sys-auth/polkit-qt[qt5]
 	>=dev-cpp/yaml-cpp-0.5.1
 	>=dev-libs/boost-1.55[${PYTHON_USEDEP}]
-	>=kde-frameworks/extra-cmake-modules-5.10.0:5
-	sys-apps/dmidecode"
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep solid)
+	dev-qt/linguist-tools:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtquick1:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	sys-apps/dbus
+	sys-apps/dmidecode
+	sys-auth/polkit-qt[qt5]
+"
 
 RDEPEND="${DEPEND}
-	>=dev-libs/libatasmart-0.19
-	>=kde-frameworks/kconfig-5.10.0:5
-	>=kde-frameworks/ki18n-5.10.0:5
-	>=kde-frameworks/kcoreaddons-5.10.0:5
-	>=kde-frameworks/solid-5.10.0:5
+	app-admin/sudo
+	dev-libs/libatasmart
+	net-misc/rsync
+	sys-apps/gptfdisk
 	>=sys-block/parted-3.0
-	>=sys-apps/gptfdisk-0.8.10
-	sys-fs/udisks:2[systemd]
-	virtual/udev[systemd]
 	|| ( sys-boot/grub:2 sys-boot/gummiboot )
+	sys-boot/os-prober
 	sys-fs/squashfs-tools
+	sys-fs/udisks:2[systemd]
+	virtual/udev[systemd]
 	networkmanager? ( net-misc/networkmanager )
 	upower? ( sys-power/upower )
-	net-misc/rsync
-	app-admin/sudo
-	sys-boot/os-prober"
+"
 
 src_prepare() {
 	python_setup
@@ -75,12 +66,12 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=( "-DWITH_PARTITIONMANAGER=1" )
-	cmake-utils_src_configure
+	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() {
-	cmake-utils_src_install
+	kde5_src_install
 	dobin "${FILESDIR}"/calamares-pkexec
 }

diff --git a/app-admin/calamares/files/calamares-pkexec b/app-admin/calamares/files/calamares-pkexec
new file mode 100644
index 0000000..3300d3b
--- /dev/null
+++ b/app-admin/calamares/files/calamares-pkexec
@@ -0,0 +1,2 @@
+#!/bin/sh
+pkexec "/usr/bin/calamares" "$@"