[gentoo-commits] proj/kde:master commit in: kde-apps/kde4-l10n/, kde-apps/kde4-l10n/files/

["Michael Palimaka" <kensington@gentoo.org>]

commit:     058818724de37d6f1839eff92a7f82a2ebf6d638
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sun Apr 10 16:58:49 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Apr 14 17:48:57 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=05881872

kde-apps/kde4-l10n: Fix sed magic, remove more conflicts

Package-Manager: portage-2.2.27

 ...-remove-dirs => kde4-l10n-16.03.91-remove-dirs} |  21 +--
 .../files/kde4-l10n-16.03.91-remove-messages       | 155 ---------------------
 ...6.03.90.ebuild => kde4-l10n-16.03.90-r1.ebuild} |  21 ++-
 3 files changed, 15 insertions(+), 182 deletions(-)

diff --git a/kde-apps/kde4-l10n/files/kde4-l10n-16.03.90-remove-dirs b/kde-apps/kde4-l10n/files/kde4-l10n-16.03.91-remove-dirs
similarity index 64%
rename from kde-apps/kde4-l10n/files/kde4-l10n-16.03.90-remove-dirs
rename to kde-apps/kde4-l10n/files/kde4-l10n-16.03.91-remove-dirs
index a5b5a3b..5bfd288 100644
--- a/kde-apps/kde4-l10n/files/kde4-l10n-16.03.90-remove-dirs
+++ b/kde-apps/kde4-l10n/files/kde4-l10n-16.03.91-remove-dirs
@@ -6,6 +6,8 @@ data/kdeedu khangman
 docs/applications kate
 docs/applications konsole
 docs/applications kwrite
+docs/kde-runtime glossary
+docs/kde-runtime khelpcenter
 docs/kdeedu kig
 docs/kdeedu parley
 docs/kdeedu step
@@ -14,8 +16,10 @@ docs/kdegraphics gwenview
 docs/kdegraphics kruler
 docs/kdesdk kapptemplate
 docs/kdesdk okteta
+docs/kdesdk umbrello
 docs/kdeutils kwalletmanager
 # Plasma 5
+docs kde-workspace
 docs/kde-runtime fundamentals
 docs/kde-runtime kdesu
 docs/kde-runtime khelpcenter
@@ -30,21 +34,8 @@ docs/kde-runtime/kcontrol kcmcgi
 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
+messages kde-workspace
+messages kdeplasma-addons
 # kdepim-l10n 5
 docs kdepim
 docs kdepimlibs

diff --git a/kde-apps/kde4-l10n/files/kde4-l10n-16.03.91-remove-messages b/kde-apps/kde4-l10n/files/kde4-l10n-16.03.91-remove-messages
index 6244608..2b76c23 100644
--- a/kde-apps/kde4-l10n/files/kde4-l10n-16.03.91-remove-messages
+++ b/kde-apps/kde4-l10n/files/kde4-l10n-16.03.91-remove-messages
@@ -1,105 +1,4 @@
 # Remove any path listed here. Comments are ignored
-# KDE Workspace 4
-kde-workspace/freespacenotifier.po
-kde-workspace/joystick.po
-kde-workspace/kaccess.po
-kde-workspace/kcmaccess.po
-kde-workspace/kcm_autostart.po
-kde-workspace/kcmbell.po
-kde-workspace/kcmcolors.po
-kde-workspace/kcm_desktoppaths.po
-kde-workspace/kcm_desktopthemedetails.po
-kde-workspace/kcmdevinfo.po
-kde-workspace/kcmfonts.po
-kde-workspace/kcm_infobase.po
-kde-workspace/kcminfo.po
-kde-workspace/kcm_infosummary.po
-kde-workspace/kcminit.po
-kde-workspace/kcminput.po
-kde-workspace/kcmkclock.po
-kde-workspace/kcmkeyboard.po
-kde-workspace/kcmkeys.po
-kde-workspace/kcmkwincompositing.po
-kde-workspace/kcmkwindecoration.po
-kde-workspace/kcm_kwindesktop.po
-kde-workspace/kcmkwinrules.po
-kde-workspace/kcmkwinscreenedges.po
-kde-workspace/kcm-kwin-scripts.po
-kde-workspace/kcm_kwintabbox.po
-kde-workspace/kcmkwm.po
-kde-workspace/kcmlaunch.po
-kde-workspace/kcm_memory.po
-kde-workspace/kcmnic.po
-kde-workspace/kcmopengl.po
-kde-workspace/kcm_pci.po
-kde-workspace/kcmsamba.po
-kde-workspace/kcmsmserver.po
-kde-workspace/kcm_solid_actions.po
-kde-workspace/kcm_standard_actions.po
-kde-workspace/kcmstyle.po
-kde-workspace/kcmusb.po
-kde-workspace/kcmview1394.po
-kde-workspace/kcmworkspaceoptions.po
-kde-workspace/kfontinst.po
-kde-workspace/khotkeys.po
-kde-workspace/kinfocenter.po
-kde-workspace/klipper.po
-kde-workspace/kmenuedit.po
-kde-workspace/krdb.po
-kde-workspace/krunner.po
-kde-workspace/kscreenlocker_greet.po
-kde-workspace/kscreenlocker.po
-kde-workspace/ksgrd.po
-kde-workspace/ksmserver.po
-kde-workspace/ksplashthemes.po
-kde-workspace/ksysguardlsofwidgets.po
-kde-workspace/ksysguard.po
-kde-workspace/ktouchpadenabler.po
-kde-workspace/kwin_clients.po
-kde-workspace/kwin_effects.po
-kde-workspace/kwin.po
-kde-workspace/kwin_scripting.po
-kde-workspace/libkdecorations.po
-kde-workspace/libkworkspace.po
-kde-workspace/liboxygenstyleconfig.po
-kde-workspace/libpowerdevilcommonconfig.po
-kde-workspace/libtaskmanager.po
-kde-workspace/plasma_applet_quicklaunch.po
-kde-workspace/plasma_applet_system-monitor.po
-kde-workspace/plasma_applet_webbrowser.po
-kde-workspace/plasma_containmentactions_contextmenu.po
-kde-workspace/plasma_containmentactions_switchwindow.po
-kde-workspace/plasma_engine_keystate.po
-kde-workspace/plasma_engine_mpris2.po
-kde-workspace/plasma_engine_network.po
-kde-workspace/plasma_engine_notifications.po
-kde-workspace/plasma_engine_rss.po
-kde-workspace/plasma_engine_share.po
-kde-workspace/plasma_engine_soliddevice.po
-kde-workspace/plasma_engine_weather.po
-kde-workspace/plasma_runner_activities.po
-kde-workspace/plasma_runner_bookmarksrunner.po
-kde-workspace/plasma_runner_calculatorrunner.po
-kde-workspace/plasma_runner_kill.po
-kde-workspace/plasma_runner_locations.po
-kde-workspace/plasma_runner_placesrunner.po
-kde-workspace/plasma_runner_plasma-desktop.po
-kde-workspace/plasma_runner_powerdevil.po
-kde-workspace/plasma_runner_recentdocuments.po
-kde-workspace/plasma_runner_services.po
-kde-workspace/plasma_runner_sessions.po
-kde-workspace/plasma_runner_shell.po
-kde-workspace/plasma_runner_solid.po
-kde-workspace/plasma_runner_webshortcuts.po
-kde-workspace/plasma_runner_windowedwidgets.po
-kde-workspace/plasma_runner_windows.po
-kde-workspace/powerdevilactivitiesconfig.po
-kde-workspace/powerdevilglobalconfig.po
-kde-workspace/powerdevil.po
-kde-workspace/powerdevilprofilesconfig.po
-kde-workspace/processcore.po
-kde-workspace/processui.po
-kde-workspace/systemsettings.po
 # KDE Runtime 4
 kde-runtime/attica_kde.po
 kde-runtime/drkonqi.po
@@ -136,60 +35,6 @@ kde-runtime/kstart.po
 kde-runtime/ktraderclient.po
 kde-runtime/phonon_kde.po
 kde-runtime/soliduiserver.po
-# KDE Plasma Addons 4
-kdeplasma-addons/konqprofiles.po
-kdeplasma-addons/konsoleprofiles.po
-kdeplasma-addons/lancelot.po
-kdeplasma-addons/liblancelot-datamodels.po
-kdeplasma-addons/libplasma_groupingcontainment.po
-kdeplasma-addons/libplasmaweather.po
-kdeplasma-addons/plasma_applet_binaryclock.po
-kdeplasma-addons/plasma_applet_bookmarks.po
-kdeplasma-addons/plasma_applet_bubblemon.po
-kdeplasma-addons/plasma_applet_CharSelectApplet.po
-kdeplasma-addons/plasma_applet_comic.po
-kdeplasma-addons/plasma_applet_fifteenPuzzle.po
-kdeplasma-addons/plasma_applet_fileWatcher.po
-kdeplasma-addons/plasma_applet_frame.po
-kdeplasma-addons/plasma_applet_groupingpanel.po
-kdeplasma-addons/plasma_applet_incomingmsg.po
-kdeplasma-addons/plasma_applet_knowledgebase.po
-kdeplasma-addons/plasma_applet_kolourpicker.po
-kdeplasma-addons/plasma_applet_leavenote.po
-kdeplasma-addons/plasma_applet_life.po
-kdeplasma-addons/plasma_applet_luna.po
-kdeplasma-addons/plasma_applet_magnifique.po
-kdeplasma-addons/plasma_applet_microblog.po
-kdeplasma-addons/plasma_applet_news.po
-kdeplasma-addons/plasma_applet_plasmaboard.po
-kdeplasma-addons/plasma_applet_previewer.po
-kdeplasma-addons/plasma_applet_qalculate.po
-kdeplasma-addons/plasma_applet_qstardict.po
-kdeplasma-addons/plasma_applet_rssnow.po
-kdeplasma-addons/plasma_applet_showdashboard.po
-kdeplasma-addons/plasma_applet_showdesktop.po
-kdeplasma-addons/plasma_applet_spellcheck.po
-kdeplasma-addons/plasma_applet_unitconverter.po
-kdeplasma-addons/plasma_applet_weather.po
-kdeplasma-addons/plasma_applet_weatherstation.po
-kdeplasma-addons/plasma_applet_webslice.po
-kdeplasma-addons/plasma_packagestructure_comic.po
-kdeplasma-addons/plasma_runner_audioplayercontrol.po
-kdeplasma-addons/plasma_runner_browserhistory.po
-kdeplasma-addons/plasma_runner_CharacterRunner.po
-kdeplasma-addons/plasma_runner_contacts.po
-kdeplasma-addons/plasma_runner_converterrunner.po
-kdeplasma-addons/plasma_runner_datetime.po
-kdeplasma-addons/plasma_runner_events.po
-kdeplasma-addons/plasma_runner_katesessions.po
-kdeplasma-addons/plasma_runner_konquerorsessions.po
-kdeplasma-addons/plasma_runner_konsolesessions.po
-kdeplasma-addons/plasma_runner_kopete.po
-kdeplasma-addons/plasma_runner_krunner_dictionary.po
-kdeplasma-addons/plasma_runner_mediawiki.po
-kdeplasma-addons/plasma_runner_spellcheckrunner.po
-kdeplasma-addons/plasma_runner_translator.po
-kdeplasma-addons/plasma_runner_youtube.po
 # KDELIBS 4
 kdelibs/akonadi_baloo_indexer.po
 kdelibs/baloo_file_extractor.po

diff --git a/kde-apps/kde4-l10n/kde4-l10n-16.03.90.ebuild b/kde-apps/kde4-l10n/kde4-l10n-16.03.90-r1.ebuild
similarity index 91%
rename from kde-apps/kde4-l10n/kde4-l10n-16.03.90.ebuild
rename to kde-apps/kde4-l10n/kde4-l10n-16.03.90-r1.ebuild
index 32c7f80..65c9eef 100644
--- a/kde-apps/kde4-l10n/kde4-l10n-16.03.90.ebuild
+++ b/kde-apps/kde4-l10n/kde4-l10n-16.03.90-r1.ebuild
@@ -20,7 +20,7 @@ RDEPEND="
 	!<kde-apps/kde-l10n-${PV}
 "
 
-REMOVE_DIRS="${FILESDIR}/${PN}-16.03.90-remove-dirs"
+REMOVE_DIRS="${FILESDIR}/${PN}-16.03.91-remove-dirs"
 REMOVE_MSGS="${FILESDIR}/${PN}-16.03.91-remove-messages"
 
 LV="4.14.3"
@@ -98,17 +98,16 @@ EOF
 				local lngs
 				for lng in ${LINGUAS}; do
 					SDIR="${S}/${KMNAME}-${lng}-${PV}/4/${lng}"
-					if [[ -d "${SDIR}" ]] ; then
-						if [[ -d "${SDIR}"/${path%\ *}/${path#*\ } ]] ; then
-							lngs+=" ${lng}"
-						fi
+					if [[ -d "${SDIR}"/${path%\ *}/${path#*\ } ]] ; then
+						lngs+=" ${lng}"
 					fi
 				done
-				[[ -n ${lngs} ]] && einfo "${path%\ *}/${path#*\ }${lngs}"
+				[[ -n "${lngs}" ]] && einfo "${path%\ *}/${path#*\ }${lngs}"
 				unset lngs
 			fi
 			if ls -U ./*/4/*/${path%\ *}/${path#*\ } > /dev/null 2>&1; then
-				sed -i -e ":${path#*\ }: s:^:#:" ./*/4/*/${path%\ *}/CMakeLists.txt || \
+				sed -e "\:add_subdirectory(\s*${path#*\ }\s*): s:^:#:" \
+					-i ./*/4/*/${path%\ *}/CMakeLists.txt || \
 					die "Failed to comment out ${path}"
 			else
 				einfo "F: ${path}"	# run with LINGUAS="*" to cut down list
@@ -121,13 +120,11 @@ EOF
 				local lngs
 				for lng in ${LINGUAS}; do
 					SDIR="${S}/${KMNAME}-${lng}-${PV}/4/${lng}"
-					if [[ -d "${SDIR}" ]] ; then
-						if [[ -e "${SDIR}"/messages/${path} ]] ; then
-							lngs+=" ${lng}"
-						fi
+					if [[ -e "${SDIR}"/messages/${path} ]] ; then
+						lngs+=" ${lng}"
 					fi
 				done
-				[[ -n ${lngs} ]] && einfo "${path}${lngs}"
+				[[ -n "${lngs}" ]] && einfo "${path}${lngs}"
 				unset lngs
 			fi
 			if ls -U ./*/4/*/messages/${path} > /dev/null 2>&1; then