1 |
commit: 61ed2b3ed7b15d05ac2e83144d62ed3de24a0dc2 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Aug 17 08:59:32 2019 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Aug 18 11:20:56 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61ed2b3e |
7 |
|
8 |
app-admin/calamares: Drop 3.1.13 and 3.2.2 for security cleanup |
9 |
|
10 |
Both are broken by current stable kpmcore anyway. |
11 |
|
12 |
Package-Manager: Portage-2.3.71, Repoman-2.3.17 |
13 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
14 |
|
15 |
app-admin/calamares/Manifest | 2 - |
16 |
app-admin/calamares/calamares-3.1.13.ebuild | 79 -------------------------- |
17 |
app-admin/calamares/calamares-3.2.2.ebuild | 86 ----------------------------- |
18 |
3 files changed, 167 deletions(-) |
19 |
|
20 |
diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest |
21 |
index 6cf8abc08bc..f7b4da30ca7 100644 |
22 |
--- a/app-admin/calamares/Manifest |
23 |
+++ b/app-admin/calamares/Manifest |
24 |
@@ -1,3 +1 @@ |
25 |
-DIST calamares-3.1.13.tar.gz 2279516 BLAKE2B ff2c81e81086d53c205c25dbdb7e8b1b60f5f10c979e9afd85c02426cd38037c6fbbf76e21fa5fb152ea9bf1c47658563ba5b2fb7e84b4e2734d6269584315df SHA512 451e04fe41448976e612b2a682cf38ed2683b490bb195ba82ad97d47dfd3eb808f8c25251be00104e3f3b4086ab37be462034bbd2866e64536e90f7ebcfb0d7a |
26 |
DIST calamares-3.2.12.tar.gz 3008153 BLAKE2B 32b8a141346da528c2aef40a8fe480445cc8acbccc1190ca5ad1b5b0d03b59c709abd663e5ed33503955e3c0caa71476e7d737d46422992fc22e3acd96260857 SHA512 00dec40eb9c9e95933d3785a7b2ddc606530d8b94fde233d91071afbe11067d4e5b0a81298e66aaa0c65b55b6a86359466d8789f3ed886e76c2102b850f2bbc0 |
27 |
-DIST calamares-3.2.2.tar.gz 2579462 BLAKE2B f477493451e084a287f43abfdd66d4a77ce839cad61f921801462bef73df74d42e616d63682d09d59309d6f98ffe560e6c8f9176c9fb290701dfb4e5aa263b29 SHA512 f060534941e0191defa65f024ec8dbbd275d16d40e491015997f12d3eb404a3117d1f113d4dcef3421ed0d15c1e24bdd8b31fc4554d313ebbd3959058c202e63 |
28 |
|
29 |
diff --git a/app-admin/calamares/calamares-3.1.13.ebuild b/app-admin/calamares/calamares-3.1.13.ebuild |
30 |
deleted file mode 100644 |
31 |
index 9294153d0cc..00000000000 |
32 |
--- a/app-admin/calamares/calamares-3.1.13.ebuild |
33 |
+++ /dev/null |
34 |
@@ -1,79 +0,0 @@ |
35 |
-# Copyright 1999-2019 Gentoo Authors |
36 |
-# Distributed under the terms of the GNU General Public License v2 |
37 |
- |
38 |
-EAPI=6 |
39 |
- |
40 |
-PYTHON_COMPAT=( python{3_5,3_6} ) |
41 |
-inherit kde5 python-r1 |
42 |
- |
43 |
-DESCRIPTION="Distribution-independent installer framework" |
44 |
-HOMEPAGE="https://calamares.io" |
45 |
-if [[ ${KDE_BUILD_TYPE} == live ]] ; then |
46 |
- EGIT_REPO_URI="https://github.com/${PN}/${PN}" |
47 |
-else |
48 |
- SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz" |
49 |
- KEYWORDS="~amd64" |
50 |
-fi |
51 |
- |
52 |
-LICENSE="GPL-3" |
53 |
-IUSE="+networkmanager pythonqt +upower" |
54 |
- |
55 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
56 |
- |
57 |
-DEPEND="${PYTHON_DEPS} |
58 |
- $(add_frameworks_dep kcoreaddons) |
59 |
- $(add_frameworks_dep kparts) |
60 |
- $(add_frameworks_dep kservice) |
61 |
- $(add_qt_dep qtdbus) |
62 |
- $(add_qt_dep qtdeclarative) |
63 |
- $(add_qt_dep qtgui) |
64 |
- $(add_qt_dep qtnetwork) |
65 |
- $(add_qt_dep qtsvg) |
66 |
- $(add_qt_dep qtwebengine 'widgets') |
67 |
- $(add_qt_dep qtwidgets) |
68 |
- dev-cpp/yaml-cpp:= |
69 |
- >=dev-libs/boost-1.55:=[${PYTHON_USEDEP}] |
70 |
- sys-apps/dbus |
71 |
- sys-apps/dmidecode |
72 |
- sys-auth/polkit-qt[qt5(+)] |
73 |
- >=sys-libs/kpmcore-3.0.3:5= |
74 |
- pythonqt? ( >=dev-python/PythonQt-3.1:=[${PYTHON_USEDEP}] ) |
75 |
-" |
76 |
- |
77 |
-RDEPEND="${DEPEND} |
78 |
- app-admin/sudo |
79 |
- dev-libs/libatasmart |
80 |
- net-misc/rsync |
81 |
- >=sys-block/parted-3.0 |
82 |
- || ( sys-boot/grub:2 sys-boot/systemd-boot ) |
83 |
- sys-boot/os-prober |
84 |
- sys-fs/squashfs-tools |
85 |
- virtual/udev |
86 |
- networkmanager? ( net-misc/networkmanager ) |
87 |
- upower? ( sys-power/upower ) |
88 |
-" |
89 |
- |
90 |
-src_prepare() { |
91 |
- cmake-utils_src_prepare |
92 |
- python_setup |
93 |
- export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \ |
94 |
- PYTHON_INCLUDE_PATH="$(python_get_library_path)"\ |
95 |
- PYTHON_CFLAGS="$(python_get_CFLAGS)"\ |
96 |
- PYTHON_LIBS="$(python_get_LIBS)" |
97 |
-} |
98 |
- |
99 |
-src_configure() { |
100 |
- local mycmakeargs=( |
101 |
- -DWEBVIEW_FORCE_WEBKIT=OFF |
102 |
- -DWITH_PYTHONQT=$(usex pythonqt) |
103 |
- ) |
104 |
- |
105 |
- kde5_src_configure |
106 |
- sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' "${S}"/calamares.desktop |
107 |
- sed -i -e 's:Icon=calamares:Icon=drive-harddisk:' "${S}"/calamares.desktop |
108 |
-} |
109 |
- |
110 |
-src_install() { |
111 |
- kde5_src_install |
112 |
- dobin "${FILESDIR}"/calamares-pkexec |
113 |
-} |
114 |
|
115 |
diff --git a/app-admin/calamares/calamares-3.2.2.ebuild b/app-admin/calamares/calamares-3.2.2.ebuild |
116 |
deleted file mode 100644 |
117 |
index 39df940004c..00000000000 |
118 |
--- a/app-admin/calamares/calamares-3.2.2.ebuild |
119 |
+++ /dev/null |
120 |
@@ -1,86 +0,0 @@ |
121 |
-# Copyright 1999-2018 Gentoo Foundation |
122 |
-# Distributed under the terms of the GNU General Public License v2 |
123 |
- |
124 |
-EAPI=6 |
125 |
- |
126 |
-PYTHON_COMPAT=( python{3_5,3_6} ) |
127 |
-inherit kde5 python-r1 |
128 |
- |
129 |
-DESCRIPTION="Distribution-independent installer framework" |
130 |
-HOMEPAGE="https://calamares.io" |
131 |
-if [[ ${KDE_BUILD_TYPE} == live ]] ; then |
132 |
- EGIT_REPO_URI="https://github.com/${PN}/${PN}" |
133 |
-else |
134 |
- SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz" |
135 |
- KEYWORDS="~amd64" |
136 |
-fi |
137 |
- |
138 |
-LICENSE="GPL-3" |
139 |
-IUSE="+networkmanager pythonqt +upower" |
140 |
- |
141 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
142 |
- |
143 |
-DEPEND="${PYTHON_DEPS} |
144 |
- $(add_frameworks_dep kconfig) |
145 |
- $(add_frameworks_dep kcoreaddons) |
146 |
- $(add_frameworks_dep kcrash) |
147 |
- $(add_frameworks_dep kpackage) |
148 |
- $(add_frameworks_dep kparts) |
149 |
- $(add_frameworks_dep kservice) |
150 |
- $(add_qt_dep linguist-tools) |
151 |
- $(add_qt_dep qtdbus) |
152 |
- $(add_qt_dep qtdeclarative) |
153 |
- $(add_qt_dep qtgui) |
154 |
- $(add_qt_dep qtnetwork) |
155 |
- $(add_qt_dep qtsvg) |
156 |
- $(add_qt_dep qtwebengine 'widgets') |
157 |
- $(add_qt_dep qtwidgets) |
158 |
- $(add_qt_dep qtxml) |
159 |
- dev-cpp/yaml-cpp:= |
160 |
- >=dev-libs/boost-1.55:=[${PYTHON_USEDEP}] |
161 |
- dev-libs/libpwquality[${PYTHON_USEDEP}] |
162 |
- sys-apps/dbus |
163 |
- sys-apps/dmidecode |
164 |
- sys-auth/polkit-qt[qt5(+)] |
165 |
- >=sys-libs/kpmcore-3.0.3:5= |
166 |
- pythonqt? ( >=dev-python/PythonQt-3.1:=[${PYTHON_USEDEP}] ) |
167 |
-" |
168 |
- |
169 |
-RDEPEND="${DEPEND} |
170 |
- app-admin/sudo |
171 |
- dev-libs/libatasmart |
172 |
- net-misc/rsync |
173 |
- >=sys-block/parted-3.0 |
174 |
- || ( sys-boot/grub:2 sys-boot/systemd-boot ) |
175 |
- sys-boot/os-prober |
176 |
- sys-fs/squashfs-tools |
177 |
- sys-libs/timezone-data |
178 |
- virtual/udev |
179 |
- networkmanager? ( net-misc/networkmanager ) |
180 |
- upower? ( sys-power/upower ) |
181 |
-" |
182 |
- |
183 |
-src_prepare() { |
184 |
- cmake-utils_src_prepare |
185 |
- python_setup |
186 |
- export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \ |
187 |
- PYTHON_INCLUDE_PATH="$(python_get_library_path)"\ |
188 |
- PYTHON_CFLAGS="$(python_get_CFLAGS)"\ |
189 |
- PYTHON_LIBS="$(python_get_LIBS)" |
190 |
-} |
191 |
- |
192 |
-src_configure() { |
193 |
- local mycmakeargs=( |
194 |
- -DWEBVIEW_FORCE_WEBKIT=OFF |
195 |
- -DWITH_PYTHONQT=$(usex pythonqt) |
196 |
- ) |
197 |
- |
198 |
- kde5_src_configure |
199 |
- sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' "${S}"/calamares.desktop |
200 |
- sed -i -e 's:Icon=calamares:Icon=drive-harddisk:' "${S}"/calamares.desktop |
201 |
-} |
202 |
- |
203 |
-src_install() { |
204 |
- kde5_src_install |
205 |
- dobin "${FILESDIR}"/calamares-pkexec |
206 |
-} |