1 |
commit: cc241e1f69bd2805a363dac50634fd52c42fd731 |
2 |
Author: Johannes Huber <johu <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Jul 22 21:23:46 2015 +0000 |
4 |
Commit: Johannes Huber <johu <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jul 22 21:23:46 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/dev/johu.git/commit/?id=cc241e1f |
7 |
|
8 |
[app-admin/calamares] Migrate to kde5 eclass |
9 |
|
10 |
* sort deps |
11 |
* simplify release/live switch |
12 |
* update DESCRIPTON |
13 |
* add missing wrapper script |
14 |
|
15 |
Package-Manager: portage-2.2.20 |
16 |
|
17 |
app-admin/calamares/calamares-9999.ebuild | 73 +++++++++++++----------------- |
18 |
app-admin/calamares/files/calamares-pkexec | 2 + |
19 |
2 files changed, 34 insertions(+), 41 deletions(-) |
20 |
|
21 |
diff --git a/app-admin/calamares/calamares-9999.ebuild b/app-admin/calamares/calamares-9999.ebuild |
22 |
index d12c0d9..45233df 100644 |
23 |
--- a/app-admin/calamares/calamares-9999.ebuild |
24 |
+++ b/app-admin/calamares/calamares-9999.ebuild |
25 |
@@ -5,64 +5,55 @@ |
26 |
EAPI=5 |
27 |
|
28 |
PYTHON_COMPAT=( python{3_3,3_4} ) |
29 |
-inherit eutils cmake-utils python-r1 |
30 |
+inherit kde5 python-r1 |
31 |
|
32 |
-MY_AUTHOR="calamares" |
33 |
-DESCRIPTION="A Distribution-independent installer framework." |
34 |
-HOMEPAGE="http://${MY_AUTHOR}.io" |
35 |
-if [[ ${PV} == "9999" ]] ; then |
36 |
- inherit git-r3 |
37 |
- SRC_URI="" |
38 |
- EGIT_REPO_URI="git://github.com/${MY_AUTHOR}/${PN}.git |
39 |
- https://github.com/${MY_AUTHOR}/${PN}.git" |
40 |
+DESCRIPTION="Distribution-independent installer framework" |
41 |
+HOMEPAGE="http://calamares.io" |
42 |
+if [[ ${KDE_BUILD_TYPE} == live ]] ; then |
43 |
+ EGIT_REPO_URI="git://github.com/${PN}/${PN}" |
44 |
KEYWORDS="" |
45 |
else |
46 |
- inherit git-r3 |
47 |
- SRC_URI="" |
48 |
- EGIT_REPO_URI="git://github.com/${MY_AUTHOR}/${PN}.git |
49 |
- https://github.com/${MY_AUTHOR}/${PN}.git" |
50 |
- EGIT_COMMIT= |
51 |
- KEYWORDS="~amd64 ~x86" |
52 |
+ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz" |
53 |
+ KEYWORDS="~amd64" |
54 |
fi |
55 |
|
56 |
LICENSE="GPL-3" |
57 |
-SLOT="0" |
58 |
IUSE="+networkmanager +upower" |
59 |
|
60 |
REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
61 |
+ |
62 |
DEPEND="${PYTHON_DEPS} |
63 |
- sys-apps/dbus |
64 |
- >=dev-qt/qtquick1-5.4.0:5 |
65 |
- >=dev-qt/linguist-tools-5.4.0:5 |
66 |
- >=dev-qt/qtconcurrent-5.4.0:5 |
67 |
- >=dev-qt/qtcore-5.4.0:5 |
68 |
- >=dev-qt/qtdbus-5.4.0:5 |
69 |
- >=dev-qt/qtgui-5.4.0:5 |
70 |
- >=dev-qt/qtsvg-5.4.0:5 |
71 |
- >=dev-qt/qtwidgets-5.4.0:5 |
72 |
- sys-auth/polkit-qt[qt5] |
73 |
>=dev-cpp/yaml-cpp-0.5.1 |
74 |
>=dev-libs/boost-1.55[${PYTHON_USEDEP}] |
75 |
- >=kde-frameworks/extra-cmake-modules-5.10.0:5 |
76 |
- sys-apps/dmidecode" |
77 |
+ $(add_frameworks_dep kconfig) |
78 |
+ $(add_frameworks_dep ki18n) |
79 |
+ $(add_frameworks_dep kcoreaddons) |
80 |
+ $(add_frameworks_dep solid) |
81 |
+ dev-qt/linguist-tools:5 |
82 |
+ dev-qt/qtdbus:5 |
83 |
+ dev-qt/qtgui:5 |
84 |
+ dev-qt/qtquick1:5 |
85 |
+ dev-qt/qtsvg:5 |
86 |
+ dev-qt/qtwidgets:5 |
87 |
+ sys-apps/dbus |
88 |
+ sys-apps/dmidecode |
89 |
+ sys-auth/polkit-qt[qt5] |
90 |
+" |
91 |
|
92 |
RDEPEND="${DEPEND} |
93 |
- >=dev-libs/libatasmart-0.19 |
94 |
- >=kde-frameworks/kconfig-5.10.0:5 |
95 |
- >=kde-frameworks/ki18n-5.10.0:5 |
96 |
- >=kde-frameworks/kcoreaddons-5.10.0:5 |
97 |
- >=kde-frameworks/solid-5.10.0:5 |
98 |
+ app-admin/sudo |
99 |
+ dev-libs/libatasmart |
100 |
+ net-misc/rsync |
101 |
+ sys-apps/gptfdisk |
102 |
>=sys-block/parted-3.0 |
103 |
- >=sys-apps/gptfdisk-0.8.10 |
104 |
- sys-fs/udisks:2[systemd] |
105 |
- virtual/udev[systemd] |
106 |
|| ( sys-boot/grub:2 sys-boot/gummiboot ) |
107 |
+ sys-boot/os-prober |
108 |
sys-fs/squashfs-tools |
109 |
+ sys-fs/udisks:2[systemd] |
110 |
+ virtual/udev[systemd] |
111 |
networkmanager? ( net-misc/networkmanager ) |
112 |
upower? ( sys-power/upower ) |
113 |
- net-misc/rsync |
114 |
- app-admin/sudo |
115 |
- sys-boot/os-prober" |
116 |
+" |
117 |
|
118 |
src_prepare() { |
119 |
python_setup |
120 |
@@ -75,12 +66,12 @@ src_prepare() { |
121 |
|
122 |
src_configure() { |
123 |
local mycmakeargs=( "-DWITH_PARTITIONMANAGER=1" ) |
124 |
- cmake-utils_src_configure |
125 |
+ kde5_src_configure |
126 |
sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' "${S}"/calamares.desktop |
127 |
sed -i -e 's:Icon=calamares:Icon=drive-harddisk:' "${S}"/calamares.desktop |
128 |
} |
129 |
|
130 |
src_install() { |
131 |
- cmake-utils_src_install |
132 |
+ kde5_src_install |
133 |
dobin "${FILESDIR}"/calamares-pkexec |
134 |
} |
135 |
|
136 |
diff --git a/app-admin/calamares/files/calamares-pkexec b/app-admin/calamares/files/calamares-pkexec |
137 |
new file mode 100644 |
138 |
index 0000000..3300d3b |
139 |
--- /dev/null |
140 |
+++ b/app-admin/calamares/files/calamares-pkexec |
141 |
@@ -0,0 +1,2 @@ |
142 |
+#!/bin/sh |
143 |
+pkexec "/usr/bin/calamares" "$@" |