1 |
commit: d2a0014792bdc10f433bd6ae984098987f5e66ea |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Aug 12 15:48:01 2017 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Aug 12 15:48:01 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=d2a00147 |
7 |
|
8 |
kde-apps/kde4-l10n: Drop REMOVE_MSGS file, block old Plasma instead |
9 |
|
10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.3 |
11 |
|
12 |
.../files/kde4-l10n-17.04.3-remove-messages | 36 ---------------------- |
13 |
kde-apps/kde4-l10n/kde4-l10n-17.08.0.ebuild | 27 +++------------- |
14 |
2 files changed, 4 insertions(+), 59 deletions(-) |
15 |
|
16 |
diff --git a/kde-apps/kde4-l10n/files/kde4-l10n-17.04.3-remove-messages b/kde-apps/kde4-l10n/files/kde4-l10n-17.04.3-remove-messages |
17 |
deleted file mode 100644 |
18 |
index 8328a74e81..0000000000 |
19 |
--- a/kde-apps/kde4-l10n/files/kde4-l10n-17.04.3-remove-messages |
20 |
+++ /dev/null |
21 |
@@ -1,36 +0,0 @@ |
22 |
-# Remove any path listed here. Comments are ignored |
23 |
-# KDE SDK 4 |
24 |
-kdesdk/umbrello.po |
25 |
- |
26 |
-# plasma-desktop - fixed in: 5.10.0 |
27 |
-# KDELIBS 4 |
28 |
-kdelibs/kcm_baloofile.po |
29 |
-# KDE Runtime 4 |
30 |
-kde-runtime/attica_kde.po |
31 |
-kde-runtime/kcm_device_automounter.po |
32 |
-kde-runtime/kcm_emoticons.po |
33 |
-kde-runtime/kcm_phonon.po |
34 |
-kde-runtime/kcmicons.po |
35 |
-kde-runtime/kcmkded.po |
36 |
-kde-runtime/kcmnotify.po |
37 |
-kde-runtime/kcmcomponentchooser.po |
38 |
-kde-runtime/knetattach.po |
39 |
- |
40 |
-# plasma-workspace - fixed in: 5.10.0 |
41 |
-# KDELIBS 4 |
42 |
-kdelibs/plasma_runner_baloosearchrunner.po |
43 |
-# KDE Runtime 4 |
44 |
-kde-runtime/drkonqi.po |
45 |
-kde-runtime/kio_applications.po |
46 |
-kde-runtime/phonon_kde.po |
47 |
-kde-runtime/soliduiserver.po |
48 |
- |
49 |
-# kde-cli-tools - fixed in: 5.10.0 |
50 |
-# KDE Runtime 4 |
51 |
-kde-runtime/filetypes.po |
52 |
-kde-runtime/kcmshell.po |
53 |
-kde-runtime/kmimetypefinder.po |
54 |
-kde-runtime/kdesu.po |
55 |
-kde-runtime/kioclient.po |
56 |
-kde-runtime/kstart.po |
57 |
-kde-runtime/ktraderclient.po |
58 |
|
59 |
diff --git a/kde-apps/kde4-l10n/kde4-l10n-17.08.0.ebuild b/kde-apps/kde4-l10n/kde4-l10n-17.08.0.ebuild |
60 |
index ac3f3b36ab..142d8847a5 100644 |
61 |
--- a/kde-apps/kde4-l10n/kde4-l10n-17.08.0.ebuild |
62 |
+++ b/kde-apps/kde4-l10n/kde4-l10n-17.08.0.ebuild |
63 |
@@ -52,14 +52,16 @@ RDEPEND=" |
64 |
!kde-apps/kde-l10n:5 |
65 |
!<kde-apps/khelpcenter-17.04.1:5 |
66 |
!<kde-apps/kio-extras-17.04.1:5 |
67 |
+ !<kde-apps/umbrello-17.08.0:5 |
68 |
!<kde-frameworks/baloo-5.34.0:5 |
69 |
!<kde-frameworks/baloo-widgets-5.34.0:5 |
70 |
!<kde-frameworks/kfilemetadata-5.34.0:5 |
71 |
- !<kde-plasma/plasma-workspace-5.9.5.1-r1:5 |
72 |
+ !<kde-plasma/kde-cli-tools-5.10.0:5 |
73 |
+ !<kde-plasma/plasma-desktop-5.10.0:5 |
74 |
+ !<kde-plasma/plasma-workspace-5.10.0:5 |
75 |
" |
76 |
|
77 |
REMOVE_DIRS="${FILESDIR}/${PN}-16.12.3-remove-dirs" |
78 |
-REMOVE_MSGS="${FILESDIR}/${PN}-17.04.3-remove-messages" |
79 |
|
80 |
IUSE="test $(printf 'l10n_%s ' ${KDE_L10N[@]})" |
81 |
|
82 |
@@ -115,7 +117,6 @@ src_prepare() { |
83 |
|
84 |
einfo "Removing file collisions with Plasma 5 and Applications" |
85 |
[[ -f ${REMOVE_DIRS} ]] || die "Error: ${REMOVE_DIRS} not found!" |
86 |
- [[ -f ${REMOVE_MSGS} ]] || die "Error: ${REMOVE_MSGS} not found!" |
87 |
|
88 |
use test && einfo "Tests enabled: Listing LINGUAS causing file collisions" |
89 |
|
90 |
@@ -140,26 +141,6 @@ src_prepare() { |
91 |
einfo "F: ${path}" # run with L10N="*" to cut down list |
92 |
fi |
93 |
done < <(grep -ve "^$\|^\s*\#" "${REMOVE_DIRS}") |
94 |
- einfo |
95 |
- einfo "Messages..." |
96 |
- while read path; do |
97 |
- if use test ; then # build a report w/ L10N="*" to submit @upstream |
98 |
- local lngs |
99 |
- for lng in $(kde_l10n2lingua ${KDE_L10N[@]}); do |
100 |
- SDIR="${S}/${KMNAME}-${lng}-${PV}/4/${lng}" |
101 |
- if [[ -e "${SDIR}"/messages/${path} ]] ; then |
102 |
- lngs+=" ${lng}" |
103 |
- fi |
104 |
- done |
105 |
- [[ -n "${lngs}" ]] && einfo "${path}${lngs}" |
106 |
- unset lngs |
107 |
- fi |
108 |
- if ls -U ./*/4/*/messages/${path} > /dev/null 2>&1; then |
109 |
- rm ./*/4/*/messages/${path} || die "Failed to remove ${path}" |
110 |
- else |
111 |
- einfo "F: ${path}" # run with L10N="*" to cut down list |
112 |
- fi |
113 |
- done < <(grep -ve "^$\|^\s*\#" "${REMOVE_MSGS}") |
114 |
} |
115 |
|
116 |
src_configure() { |