commit: 2a7fa1b65ded2f50d8ad05904e8b1fe0b01ee2b7
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Fri Apr 8 21:56:02 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Apr 9 15:12:06 2016 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=2a7fa1b6
kde-apps/kde4-l10n: Don't die on empty directories
Adds einfo about files not found. Use to update lists.
Package-Manager: portage-2.2.27
...-remove-dirs => kde4-l10n-16.03.90-remove-dirs} | 4 +---
...messages => kde4-l10n-16.03.91-remove-messages} | 6 ------
kde-apps/kde4-l10n/kde4-l10n-16.03.90.ebuild | 24 ++++++++++++++--------
3 files changed, 16 insertions(+), 18 deletions(-)
diff --git a/kde-apps/kde4-l10n/files/kde4-l10n-15.11.90-remove-dirs
b/kde-apps/kde4-l10n/files/kde4-l10n-16.03.90-remove-dirs
similarity index 95%
rename from kde-apps/kde4-l10n/files/kde4-l10n-15.11.90-remove-dirs
rename to kde-apps/kde4-l10n/files/kde4-l10n-16.03.90-remove-dirs
index ab7681e..a5b5a3b 100644
--- a/kde-apps/kde4-l10n/files/kde4-l10n-15.11.90-remove-dirs
+++ b/kde-apps/kde4-l10n/files/kde4-l10n-16.03.90-remove-dirs
@@ -7,7 +7,6 @@ docs/applications kate
docs/applications konsole
docs/applications kwrite
docs/kdeedu kig
-docs/kdeedu pairseditor
docs/kdeedu parley
docs/kdeedu step
docs/kdegames bomber
@@ -16,7 +15,7 @@ docs/kdegraphics kruler
docs/kdesdk kapptemplate
docs/kdesdk okteta
docs/kdeutils kwalletmanager
-# Plasma 5.3
+# Plasma 5
docs/kde-runtime fundamentals
docs/kde-runtime kdesu
docs/kde-runtime khelpcenter
@@ -28,7 +27,6 @@ docs/kde-runtime/kcontrol ebrowsing
docs/kde-runtime/kcontrol emoticons
docs/kde-runtime/kcontrol icons
docs/kde-runtime/kcontrol kcmcgi
-docs/kde-runtime/kcontrol khtml
docs/kde-runtime/kcontrol smb
docs/kde-runtime/kcontrol trash
docs/kde-runtime/kcontrol useragent
diff --git a/kde-apps/kde4-l10n/files/kde4-l10n-16.03.90-remove-messages
b/kde-apps/kde4-l10n/files/kde4-l10n-16.03.91-remove-messages
similarity index 98%
rename from kde-apps/kde4-l10n/files/kde4-l10n-16.03.90-remove-messages
rename to kde-apps/kde4-l10n/files/kde4-l10n-16.03.91-remove-messages
index 0aadb9d..6244608 100644
--- a/kde-apps/kde4-l10n/files/kde4-l10n-16.03.90-remove-messages
+++ b/kde-apps/kde4-l10n/files/kde4-l10n-16.03.91-remove-messages
@@ -206,12 +206,6 @@ kdelibs/kio_timeline.po
kdelibs/plasma_runner_baloosearchrunner.po
# KDE Applications 4
applications/useraccount.po
-# KDE Edu 4
-kdeedu/pairs.po
-kdeedu/pairseditor.po
-kdeedu/pairs.appdata.po
# KDE SDK 4
kdesdk/org.kde.umbrello.appdata.po
kdesdk/umbrello.po
-# KDE Utils 4
-kdeutils/org.kde.kteatime.appdata.po
diff --git a/kde-apps/kde4-l10n/kde4-l10n-16.03.90.ebuild
b/kde-apps/kde4-l10n/kde4-l10n-16.03.90.ebuild
index 89314df..79fa0b3 100644
--- a/kde-apps/kde4-l10n/kde4-l10n-16.03.90.ebuild
+++ b/kde-apps/kde4-l10n/kde4-l10n-16.03.90.ebuild
@@ -20,8 +20,8 @@ RDEPEND="
!<kde-apps/kde-l10n-${PV}
"
-REMOVE_DIRS="${FILESDIR}/${PN}-15.11.90-remove-dirs"
-REMOVE_MSGS="${FILESDIR}/${PN}-16.03.90-remove-messages"
+REMOVE_DIRS="${FILESDIR}/${PN}-16.03.90-remove-dirs"
+REMOVE_MSGS="${FILESDIR}/${PN}-16.03.91-remove-messages"
LV="4.14.3"
LEGACY_LANGS="ar bg bs ca ca@valencia cs da de el en_GB es et eu fa fi fr ga gl
@@ -93,16 +93,22 @@ EOF
einfo " directories..."
while read path; do
- if [[ -n ${path} ]] ; then
- find ./*/4/*/${path%\ *}/CMakeLists.txt -exec \
- sed -i -e ":${path#*\ }: s:^:#:" {} +
|| die
+ if ls -U ./*/4/*/${path%\ *}/${path#*\ } > /dev/null
2>&1; then
+ sed -i -e ":${path#*\ }: s:^:#:"
./*/4/*/${path%\ *}/CMakeLists.txt || \
+ die "Failed to comment out ${path}"
+ else
+ einfo " F: ${path}" # run with LINGUAS="*"
to cut down list
fi
- done < <(grep -v "^#" "${REMOVE_DIRS}")
+ done < <(grep -ve "^$\|^\s*\#" "${REMOVE_DIRS}")
einfo " messages..."
- for path in $(grep -v "^#" "${REMOVE_MSGS}") ; do
- rm -f ./*/4/*/messages/${path}
- done
+ while read path; do
+ if ls -U ./*/4/*/messages/${path} > /dev/null 2>&1; then
+ rm ./*/4/*/messages/${path} || die "Failed to
remove ${path}"
+ else
+ einfo " F: ${path}" # run with LINGUAS="*"
to cut down list
+ fi
+ done < <(grep -ve "^$\|^\s*\#" "${REMOVE_MSGS}")
else
local LNG LDIR
for LNG in ${LINGUAS}; do
