commit: 867f4b6b4e872a64a6ea40c9bf7e4e65b1dffba7
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Mon May 25 15:22:30 2015 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed May 27 12:07:04 2015 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=867f4b6b
[kde-apps/kde4-l10n] Outsource subdir paths into FILESDIR
Fix file collisions w/ kde-apps/kde-l10n LINGUAS="ca it nn"
See also bug 550346
Package-Manager: portage-2.2.18
.../kde4-l10n/files/kde4-l10n-15.04.1-remove-dirs | 47 ++++++++++++++++++++++
kde-apps/kde4-l10n/kde4-l10n-15.04.1.ebuild | 42 ++++---------------
2 files changed, 55 insertions(+), 34 deletions(-)
diff --git a/kde-apps/kde4-l10n/files/kde4-l10n-15.04.1-remove-dirs
b/kde-apps/kde4-l10n/files/kde4-l10n-15.04.1-remove-dirs
new file mode 100644
index 0000000..57f687a
--- /dev/null
+++ b/kde-apps/kde4-l10n/files/kde4-l10n-15.04.1-remove-dirs
@@ -0,0 +1,47 @@
+# Disable any subdirectories listed here. Comments are ignored
+# First argument: parent directory
+# Second argument: which subdirectory to disable in CMakeLists.txt
+# kde-l10n 5
+data/kdeedu khangman
+docs/applications kate
+docs/applications konsole
+docs/applications kwrite
+docs/kdeedu kig
+docs/kdeedu parley
+docs/kdeedu step
+docs/kdegames bomber
+docs/kdegraphics gwenview
+docs/kdegraphics kruler
+docs/kdesdk kapptemplate
+docs/kdesdk okteta
+# Plasma 5.3
+docs/kde-runtime fundamentals
+docs/kde-runtime kdesu
+docs/kde-runtime khelpcenter
+docs/kde-runtime knetattach
+docs/kde-runtime onlinehelp
+docs/kde-runtime/kcontrol bookmarks
+docs/kde-runtime/kcontrol cookies
+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
+docs/kde-workspace kfontview
+docs/kde-workspace kinfocenter
+docs/kde-workspace klipper
+docs/kde-workspace kmenuedit
+docs/kde-workspace ksysguard
+docs/kde-workspace plasma-desktop
+docs/kde-workspace systemsettings
+docs/kde-workspace/kcontrol clock
+docs/kde-workspace/kcontrol colors
+docs/kde-workspace/kcontrol desktopthemedetails
+docs/kde-workspace/kcontrol joystick
+docs/kde-workspace/kcontrol kcmaccess
+docs/kde-workspace/kcontrol kcmstyle
+docs/kde-workspace/kcontrol solid-actions
+docs/kde-workspace/kcontrol splashscreen
diff --git a/kde-apps/kde4-l10n/kde4-l10n-15.04.1.ebuild
b/kde-apps/kde4-l10n/kde4-l10n-15.04.1.ebuild
index f75b8af..9833f20 100644
--- a/kde-apps/kde4-l10n/kde4-l10n-15.04.1.ebuild
+++ b/kde-apps/kde4-l10n/kde4-l10n-15.04.1.ebuild
@@ -23,6 +23,7 @@ RDEPEND="
KEYWORDS=" ~amd64 ~x86"
IUSE="minimal"
+REMOVE_DIRS="${FILESDIR}/${PN}-15.04.1-remove-dirs"
REMOVE_MSGS="${FILESDIR}/${PN}-15.04.1-remove-messages"
LV="4.14.3"
@@ -82,46 +83,19 @@ src_prepare() {
if use minimal; then
einfo "Removing paths from ${LNG}"
- # kde-l10n 5
- sed -e '/kig/ s/^/#/' -e '/step/
s/^/#/'\
- -i
"${S}"/${DIR}/4/${LNG}/docs/kdeedu/CMakeLists.txt
- sed -e '/kruler/ s/^/#/'\
- -i
"${S}"/${DIR}/4/${LNG}/docs/kdegraphics/CMakeLists.txt
- sed -e '/okteta/ s/^/#/' -e
'/kapptemplate/ s/^/#/'\
- -i
"${S}"/${DIR}/4/${LNG}/docs/kdesdk/CMakeLists.txt
+ # Remove dirs
+ while read path; do
+ if [[ -e
"${S}"/${DIR}/4/${LNG}/${path%\ *}/CMakeLists.txt ]] ; then
+ sed -e "/${path#*\ }/
s/^/#/"\
+ -i
"${S}"/${DIR}/4/${LNG}/${path%\ *}/CMakeLists.txt
+ fi
+ done < <(grep -v "^#" "${REMOVE_DIRS}")
# Remove messages
for path in $(grep -v "^#"
"${REMOVE_MSGS}") ; do
rm -f
"${S}"/${DIR}/4/${LNG}/messages/${path}
done
- # Plasma 5.3
- # kdesu, ksysguard, kio-extras,
khelpcenter, systemsettings, kinfocenter, kmenuedit, plasma-desktop
- sed -i -e '/kdesu/ s/^/#/' -e
'/fundamentals/ s/^/#/'\
- -e '/onlinehelp/ s/^/#/' -e
'/khelpcenter/ s/^/#/'\
- -e '/knetattach/ s/^/#/'\
-
"${S}"/${DIR}/4/${LNG}/docs/kde-runtime/CMakeLists.txt
-
- sed -i -e '/ksysguard/ s/^/#/' -e
'/systemsettings/ s/^/#/'\
- -e '/kinfocenter/ s/^/#/' -e
'/kmenuedit/ s/^/#/'\
- -e '/kfontview/ s/^/#/' -e
'/plasma-desktop/ s/^/#/'\
-
"${S}"/${DIR}/4/${LNG}/docs/kde-workspace/CMakeLists.txt
-
- sed -i -e '/kcmcgi/ s/^/#/' -e '/trash/
s/^/#/' -e '/bookmarks/ s/^/#/'\
- -e '/cookies/ s/^/#/' -e
'/ebrowsing/ s/^/#/' -e '/emoticons/ s/^/#/'\
- -e '/icons/ s/^/#/' -e '/khtml/
s/^/#/' -e '/smb/ s/^/#/'\
- -e '/useragent/ s/^/#/'\
-
"${S}"/${DIR}/4/${LNG}/docs/kde-runtime/kcontrol/CMakeLists.txt
-
- sed -i -e '/joystick/ s/^/#/' -e
'/kcmaccess/ s/^/#/'\
- -e '/kcmstyle/ s/^/#/' -e
'/solid-actions/ s/^/#/'\
- -e '/splashscreen/ s/^/#/' -e
'/clock/ s/^/#/' -e '/colors/ s/^/#/'\
- -e '/desktopthemedetails/
s/^/#/'\
-
"${S}"/${DIR}/4/${LNG}/docs/kde-workspace/kcontrol/CMakeLists.txt
-
- sed -i -e '/docbook/ s/^/#/'\
-
"${S}"/${DIR}/4/${LNG}/docs/kde-workspace/klipper/CMakeLists.txt
-
else
if [[ -d "${KMNAME}-${LNG}-${LV}" ]] ;
then
# Merge legacy localisation
