| 1 |
commit: 9b4bbcfafd68ec32c766af9bcf343d25f48d3cd3 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Oct 11 08:03:57 2020 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Oct 11 08:34:35 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=9b4bbcfa |
| 7 |
|
| 8 |
kde-plasma/plasma-workspace: Cleanup pre-5.17 migration code |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.8, Repoman-3.0.1 |
| 11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 12 |
|
| 13 |
.../plasma-workspace-5.20.0.ebuild | 49 ++-------------------- |
| 14 |
.../plasma-workspace-5.20.49.9999.ebuild | 49 ++-------------------- |
| 15 |
.../plasma-workspace/plasma-workspace-9999.ebuild | 49 ++-------------------- |
| 16 |
3 files changed, 12 insertions(+), 135 deletions(-) |
| 17 |
|
| 18 |
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.20.0.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.20.0.ebuild |
| 19 |
index 441c03cb23..a6d7537cb5 100644 |
| 20 |
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.20.0.ebuild |
| 21 |
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.20.0.ebuild |
| 22 |
@@ -122,9 +122,9 @@ RDEPEND="${COMMON_DEPEND} |
| 23 |
>=dev-qt/qtquickcontrols-${QTMIN}:5[widgets] |
| 24 |
>=dev-qt/qtquickcontrols2-${QTMIN}:5 |
| 25 |
>=kde-apps/kio-extras-19.04.3:5 |
| 26 |
- >=kde-frameworks/kquickcharts-${KFMIN}:5 |
| 27 |
>=kde-frameworks/kdesu-${KFMIN}:5 |
| 28 |
>=kde-frameworks/kirigami-${KFMIN}:5 |
| 29 |
+ >=kde-frameworks/kquickcharts-${KFMIN}:5 |
| 30 |
>=kde-plasma/ksysguard-${PVCUT}:5 |
| 31 |
>=kde-plasma/milou-${PVCUT}:5 |
| 32 |
>=kde-plasma/plasma-integration-${PVCUT}:5 |
| 33 |
@@ -144,42 +144,9 @@ PATCHES=( "${FILESDIR}/${PN}-5.14.2-split-libkworkspace.patch" ) |
| 34 |
|
| 35 |
RESTRICT+=" test" |
| 36 |
|
| 37 |
-pkg_setup() { |
| 38 |
- ecm_pkg_setup |
| 39 |
- |
| 40 |
- local md5 |
| 41 |
- local srcfile=/etc/plasma/XX/10-agent-XX.sh |
| 42 |
- local newdir="${EPREFIX}"/etc/xdg/plasma-workspace |
| 43 |
- |
| 44 |
- if [[ -f "${EROOT}"${srcfile//XX/startup} ]]; then |
| 45 |
- md5=$(md5sum "${EROOT}"${srcfile//XX/startup}) |
| 46 |
- if [[ ${md5%% *} != 90caaabb40b56bfbe65388841a6dd6ca ]]; then |
| 47 |
- elog "Existing modified ${EPREFIX}${srcfile//XX/startup} detected." |
| 48 |
- elog "Copying to ${newdir}/env/10-agent-startup.sh..." |
| 49 |
- cp -v "${EROOT}"${srcfile//XX/startup} "${T}"/ || die |
| 50 |
- fi |
| 51 |
- fi |
| 52 |
- |
| 53 |
- if [[ -f "${EROOT}"${srcfile//XX/shutdown} ]]; then |
| 54 |
- md5=$(md5sum "${EROOT}"${srcfile//XX/shutdown}) |
| 55 |
- if [[ ${md5%% *} != d7bffa0273f92abd999c7c3c43dbc23d ]]; then |
| 56 |
- elog "Existing modified ${EPREFIX}${srcfile//XX/shutdown} detected." |
| 57 |
- elog "Copying to ${newdir}/shutdown/10-agent-shutdown.sh..." |
| 58 |
- cp -v "${EROOT}"${srcfile//XX/shutdown} "${T}"/ || die |
| 59 |
- fi |
| 60 |
- fi |
| 61 |
-} |
| 62 |
- |
| 63 |
src_prepare() { |
| 64 |
ecm_src_prepare |
| 65 |
|
| 66 |
- if [[ ! -f "${T}"/10-agent-startup.sh ]]; then |
| 67 |
- cp "${FILESDIR}"/10-agent-startup.sh "${T}"/ || die |
| 68 |
- fi |
| 69 |
- if [[ ! -f "${T}"/10-agent-shutdown.sh ]]; then |
| 70 |
- cp "${FILESDIR}"/10-agent-shutdown.sh "${T}"/ || die |
| 71 |
- fi |
| 72 |
- |
| 73 |
cmake_comment_add_subdirectory libkworkspace |
| 74 |
# delete colliding libkworkspace translations |
| 75 |
if [[ ${KDE_BUILD_TYPE} = release ]]; then |
| 76 |
@@ -215,25 +182,17 @@ src_install() { |
| 77 |
|
| 78 |
# default startup and shutdown scripts |
| 79 |
insinto /etc/xdg/plasma-workspace/env |
| 80 |
- doins "${T}"/10-agent-startup.sh |
| 81 |
+ doins "${FILESDIR}"/10-agent-startup.sh |
| 82 |
|
| 83 |
insinto /etc/xdg/plasma-workspace/shutdown |
| 84 |
- doins "${T}"/10-agent-shutdown.sh |
| 85 |
+ doins "${FILESDIR}"/10-agent-shutdown.sh |
| 86 |
fperms +x /etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh |
| 87 |
} |
| 88 |
|
| 89 |
pkg_postinst () { |
| 90 |
ecm_pkg_postinst |
| 91 |
|
| 92 |
- # Clean up pre-5.17.4 scripts |
| 93 |
- if [[ -e "${EROOT}"/etc/plasma/startup/10-agent-startup.sh ]]; then |
| 94 |
- rm "${EROOT}"/etc/plasma/startup/10-agent-startup.sh || die |
| 95 |
- elog "Removed obsolete ${EPREFIX}/etc/plasma/startup/10-agent-startup.sh" |
| 96 |
- fi |
| 97 |
- if [[ -e "${EROOT}"/etc/plasma/shutdown/10-agent-shutdown.sh ]]; then |
| 98 |
- rm "${EROOT}"/etc/plasma/shutdown/10-agent-shutdown.sh || die |
| 99 |
- elog "Removed obsolete ${EPREFIX}/etc/plasma/shutdown/10-agent-shutdown.sh" |
| 100 |
- fi |
| 101 |
+ # Clean up pre-5.17.4 dirs |
| 102 |
rmdir -v "${EROOT}"/etc/plasma{/startup,/shutdown,} 2> /dev/null |
| 103 |
|
| 104 |
elog "To enable gpg-agent and/or ssh-agent in Plasma sessions," |
| 105 |
|
| 106 |
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.20.49.9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.20.49.9999.ebuild |
| 107 |
index a882b30ebc..e90d540b27 100644 |
| 108 |
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.20.49.9999.ebuild |
| 109 |
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.20.49.9999.ebuild |
| 110 |
@@ -122,9 +122,9 @@ RDEPEND="${COMMON_DEPEND} |
| 111 |
>=dev-qt/qtquickcontrols-${QTMIN}:5[widgets] |
| 112 |
>=dev-qt/qtquickcontrols2-${QTMIN}:5 |
| 113 |
>=kde-apps/kio-extras-19.04.3:5 |
| 114 |
- >=kde-frameworks/kquickcharts-${KFMIN}:5 |
| 115 |
>=kde-frameworks/kdesu-${KFMIN}:5 |
| 116 |
>=kde-frameworks/kirigami-${KFMIN}:5 |
| 117 |
+ >=kde-frameworks/kquickcharts-${KFMIN}:5 |
| 118 |
>=kde-plasma/ksysguard-${PVCUT}:5 |
| 119 |
>=kde-plasma/milou-${PVCUT}:5 |
| 120 |
>=kde-plasma/plasma-integration-${PVCUT}:5 |
| 121 |
@@ -144,42 +144,9 @@ PATCHES=( "${FILESDIR}/${PN}-5.14.2-split-libkworkspace.patch" ) |
| 122 |
|
| 123 |
RESTRICT+=" test" |
| 124 |
|
| 125 |
-pkg_setup() { |
| 126 |
- ecm_pkg_setup |
| 127 |
- |
| 128 |
- local md5 |
| 129 |
- local srcfile=/etc/plasma/XX/10-agent-XX.sh |
| 130 |
- local newdir="${EPREFIX}"/etc/xdg/plasma-workspace |
| 131 |
- |
| 132 |
- if [[ -f "${EROOT}"${srcfile//XX/startup} ]]; then |
| 133 |
- md5=$(md5sum "${EROOT}"${srcfile//XX/startup}) |
| 134 |
- if [[ ${md5%% *} != 90caaabb40b56bfbe65388841a6dd6ca ]]; then |
| 135 |
- elog "Existing modified ${EPREFIX}${srcfile//XX/startup} detected." |
| 136 |
- elog "Copying to ${newdir}/env/10-agent-startup.sh..." |
| 137 |
- cp -v "${EROOT}"${srcfile//XX/startup} "${T}"/ || die |
| 138 |
- fi |
| 139 |
- fi |
| 140 |
- |
| 141 |
- if [[ -f "${EROOT}"${srcfile//XX/shutdown} ]]; then |
| 142 |
- md5=$(md5sum "${EROOT}"${srcfile//XX/shutdown}) |
| 143 |
- if [[ ${md5%% *} != d7bffa0273f92abd999c7c3c43dbc23d ]]; then |
| 144 |
- elog "Existing modified ${EPREFIX}${srcfile//XX/shutdown} detected." |
| 145 |
- elog "Copying to ${newdir}/shutdown/10-agent-shutdown.sh..." |
| 146 |
- cp -v "${EROOT}"${srcfile//XX/shutdown} "${T}"/ || die |
| 147 |
- fi |
| 148 |
- fi |
| 149 |
-} |
| 150 |
- |
| 151 |
src_prepare() { |
| 152 |
ecm_src_prepare |
| 153 |
|
| 154 |
- if [[ ! -f "${T}"/10-agent-startup.sh ]]; then |
| 155 |
- cp "${FILESDIR}"/10-agent-startup.sh "${T}"/ || die |
| 156 |
- fi |
| 157 |
- if [[ ! -f "${T}"/10-agent-shutdown.sh ]]; then |
| 158 |
- cp "${FILESDIR}"/10-agent-shutdown.sh "${T}"/ || die |
| 159 |
- fi |
| 160 |
- |
| 161 |
cmake_comment_add_subdirectory libkworkspace |
| 162 |
# delete colliding libkworkspace translations |
| 163 |
if [[ ${KDE_BUILD_TYPE} = release ]]; then |
| 164 |
@@ -215,25 +182,17 @@ src_install() { |
| 165 |
|
| 166 |
# default startup and shutdown scripts |
| 167 |
insinto /etc/xdg/plasma-workspace/env |
| 168 |
- doins "${T}"/10-agent-startup.sh |
| 169 |
+ doins "${FILESDIR}"/10-agent-startup.sh |
| 170 |
|
| 171 |
insinto /etc/xdg/plasma-workspace/shutdown |
| 172 |
- doins "${T}"/10-agent-shutdown.sh |
| 173 |
+ doins "${FILESDIR}"/10-agent-shutdown.sh |
| 174 |
fperms +x /etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh |
| 175 |
} |
| 176 |
|
| 177 |
pkg_postinst () { |
| 178 |
ecm_pkg_postinst |
| 179 |
|
| 180 |
- # Clean up pre-5.17.4 scripts |
| 181 |
- if [[ -e "${EROOT}"/etc/plasma/startup/10-agent-startup.sh ]]; then |
| 182 |
- rm "${EROOT}"/etc/plasma/startup/10-agent-startup.sh || die |
| 183 |
- elog "Removed obsolete ${EPREFIX}/etc/plasma/startup/10-agent-startup.sh" |
| 184 |
- fi |
| 185 |
- if [[ -e "${EROOT}"/etc/plasma/shutdown/10-agent-shutdown.sh ]]; then |
| 186 |
- rm "${EROOT}"/etc/plasma/shutdown/10-agent-shutdown.sh || die |
| 187 |
- elog "Removed obsolete ${EPREFIX}/etc/plasma/shutdown/10-agent-shutdown.sh" |
| 188 |
- fi |
| 189 |
+ # Clean up pre-5.17.4 dirs |
| 190 |
rmdir -v "${EROOT}"/etc/plasma{/startup,/shutdown,} 2> /dev/null |
| 191 |
|
| 192 |
elog "To enable gpg-agent and/or ssh-agent in Plasma sessions," |
| 193 |
|
| 194 |
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild |
| 195 |
index 9cb4823419..8048cd4c9d 100644 |
| 196 |
--- a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild |
| 197 |
+++ b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild |
| 198 |
@@ -125,9 +125,9 @@ RDEPEND="${COMMON_DEPEND} |
| 199 |
>=dev-qt/qtquickcontrols-${QTMIN}:5[widgets] |
| 200 |
>=dev-qt/qtquickcontrols2-${QTMIN}:5 |
| 201 |
>=kde-apps/kio-extras-19.04.3:5 |
| 202 |
- >=kde-frameworks/kquickcharts-${KFMIN}:5 |
| 203 |
>=kde-frameworks/kdesu-${KFMIN}:5 |
| 204 |
>=kde-frameworks/kirigami-${KFMIN}:5 |
| 205 |
+ >=kde-frameworks/kquickcharts-${KFMIN}:5 |
| 206 |
>=kde-plasma/ksysguard-${PVCUT}:5 |
| 207 |
>=kde-plasma/milou-${PVCUT}:5 |
| 208 |
>=kde-plasma/plasma-integration-${PVCUT}:5 |
| 209 |
@@ -147,42 +147,9 @@ PATCHES=( "${FILESDIR}/${PN}-5.14.2-split-libkworkspace.patch" ) |
| 210 |
|
| 211 |
RESTRICT+=" test" |
| 212 |
|
| 213 |
-pkg_setup() { |
| 214 |
- ecm_pkg_setup |
| 215 |
- |
| 216 |
- local md5 |
| 217 |
- local srcfile=/etc/plasma/XX/10-agent-XX.sh |
| 218 |
- local newdir="${EPREFIX}"/etc/xdg/plasma-workspace |
| 219 |
- |
| 220 |
- if [[ -f "${EROOT}"${srcfile//XX/startup} ]]; then |
| 221 |
- md5=$(md5sum "${EROOT}"${srcfile//XX/startup}) |
| 222 |
- if [[ ${md5%% *} != 90caaabb40b56bfbe65388841a6dd6ca ]]; then |
| 223 |
- elog "Existing modified ${EPREFIX}${srcfile//XX/startup} detected." |
| 224 |
- elog "Copying to ${newdir}/env/10-agent-startup.sh..." |
| 225 |
- cp -v "${EROOT}"${srcfile//XX/startup} "${T}"/ || die |
| 226 |
- fi |
| 227 |
- fi |
| 228 |
- |
| 229 |
- if [[ -f "${EROOT}"${srcfile//XX/shutdown} ]]; then |
| 230 |
- md5=$(md5sum "${EROOT}"${srcfile//XX/shutdown}) |
| 231 |
- if [[ ${md5%% *} != d7bffa0273f92abd999c7c3c43dbc23d ]]; then |
| 232 |
- elog "Existing modified ${EPREFIX}${srcfile//XX/shutdown} detected." |
| 233 |
- elog "Copying to ${newdir}/shutdown/10-agent-shutdown.sh..." |
| 234 |
- cp -v "${EROOT}"${srcfile//XX/shutdown} "${T}"/ || die |
| 235 |
- fi |
| 236 |
- fi |
| 237 |
-} |
| 238 |
- |
| 239 |
src_prepare() { |
| 240 |
ecm_src_prepare |
| 241 |
|
| 242 |
- if [[ ! -f "${T}"/10-agent-startup.sh ]]; then |
| 243 |
- cp "${FILESDIR}"/10-agent-startup.sh "${T}"/ || die |
| 244 |
- fi |
| 245 |
- if [[ ! -f "${T}"/10-agent-shutdown.sh ]]; then |
| 246 |
- cp "${FILESDIR}"/10-agent-shutdown.sh "${T}"/ || die |
| 247 |
- fi |
| 248 |
- |
| 249 |
cmake_comment_add_subdirectory libkworkspace |
| 250 |
# delete colliding libkworkspace translations |
| 251 |
if [[ ${KDE_BUILD_TYPE} = release ]]; then |
| 252 |
@@ -218,25 +185,17 @@ src_install() { |
| 253 |
|
| 254 |
# default startup and shutdown scripts |
| 255 |
insinto /etc/xdg/plasma-workspace/env |
| 256 |
- doins "${T}"/10-agent-startup.sh |
| 257 |
+ doins "${FILESDIR}"/10-agent-startup.sh |
| 258 |
|
| 259 |
insinto /etc/xdg/plasma-workspace/shutdown |
| 260 |
- doins "${T}"/10-agent-shutdown.sh |
| 261 |
+ doins "${FILESDIR}"/10-agent-shutdown.sh |
| 262 |
fperms +x /etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh |
| 263 |
} |
| 264 |
|
| 265 |
pkg_postinst () { |
| 266 |
ecm_pkg_postinst |
| 267 |
|
| 268 |
- # Clean up pre-5.17.4 scripts |
| 269 |
- if [[ -e "${EROOT}"/etc/plasma/startup/10-agent-startup.sh ]]; then |
| 270 |
- rm "${EROOT}"/etc/plasma/startup/10-agent-startup.sh || die |
| 271 |
- elog "Removed obsolete ${EPREFIX}/etc/plasma/startup/10-agent-startup.sh" |
| 272 |
- fi |
| 273 |
- if [[ -e "${EROOT}"/etc/plasma/shutdown/10-agent-shutdown.sh ]]; then |
| 274 |
- rm "${EROOT}"/etc/plasma/shutdown/10-agent-shutdown.sh || die |
| 275 |
- elog "Removed obsolete ${EPREFIX}/etc/plasma/shutdown/10-agent-shutdown.sh" |
| 276 |
- fi |
| 277 |
+ # Clean up pre-5.17.4 dirs |
| 278 |
rmdir -v "${EROOT}"/etc/plasma{/startup,/shutdown,} 2> /dev/null |
| 279 |
|
| 280 |
elog "To enable gpg-agent and/or ssh-agent in Plasma sessions," |
Archives