commit: 808bc30e827891294b3832f4a27842cd5f767857
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Wed Aug 19 22:18:32 2015 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed Aug 19 22:31:10 2015 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=808bc30e
kde-apps/kde4-l10n: Fix LINGUAS=sr, baloowidgets.mo collision
Package-Manager: portage-2.2.20.1
.../files/kde4-l10n-15.08.0-remove-messages | 210 +++++++++++++++++++++
kde-apps/kde4-l10n/kde4-l10n-15.08.0.ebuild | 6 +-
2 files changed, 215 insertions(+), 1 deletion(-)
diff --git a/kde-apps/kde4-l10n/files/kde4-l10n-15.08.0-remove-messages
b/kde-apps/kde4-l10n/files/kde4-l10n-15.08.0-remove-messages
new file mode 100644
index 0000000..0044d42
--- /dev/null
+++ b/kde-apps/kde4-l10n/files/kde4-l10n-15.08.0-remove-messages
@@ -0,0 +1,210 @@
+# 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
+kde-runtime/filetypes.po
+kde-runtime/htmlsearch.po
+kde-runtime/kcmcomponentchooser.po
+kde-runtime/kcm_emoticons.po
+kde-runtime/kcmhtmlsearch.po
+kde-runtime/kcmicons.po
+kde-runtime/kcmkded.po
+kde-runtime/kcmnotify.po
+kde-runtime/kcm_phonon.po
+kde-runtime/kcmshell.po
+kde-runtime/kdesu.po
+kde-runtime/kglobalaccel.po
+kde-runtime/khelpcenter.po
+kde-runtime/kio_applications.po
+kde-runtime/kio_archive.po
+kde-runtime/kio_bookmarks.po
+kde-runtime/kioclient.po
+kde-runtime/kio_fish.po
+kde-runtime/kio_info.po
+kde-runtime/kio_man.po
+kde-runtime/kio_nfs.po
+kde-runtime/kio_recentdocuments.po
+kde-runtime/kio_remote.po
+kde-runtime/kio_sftp.po
+kde-runtime/kio_smb.po
+kde-runtime/kio_thumbnail.po
+kde-runtime/kmimetypefinder.po
+kde-runtime/knetattach.po
+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
+kdelibs/baloo_file.po
+kdelibs/baloosearch.po
+kdelibs/balooshow.po
+kdelibs/baloowidgets.po
+kdelibs/kcm_baloofile.po
+kdelibs/kfilemetadata.po
+kdelibs/kio_baloosearch.po
+kdelibs/kio_tags.po
+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
diff --git a/kde-apps/kde4-l10n/kde4-l10n-15.08.0.ebuild
b/kde-apps/kde4-l10n/kde4-l10n-15.08.0.ebuild
index 9fe546e..dfb39da 100644
--- a/kde-apps/kde4-l10n/kde4-l10n-15.08.0.ebuild
+++ b/kde-apps/kde4-l10n/kde4-l10n-15.08.0.ebuild
@@ -23,7 +23,7 @@ KEYWORDS=" ~amd64 ~x86"
IUSE="minimal"
REMOVE_DIRS="${FILESDIR}/${PN}-15.07.90-remove-dirs"
-REMOVE_MSGS="${FILESDIR}/${PN}-15.07.80-remove-messages"
+REMOVE_MSGS="${FILESDIR}/${PN}-15.08.0-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
@@ -96,6 +96,10 @@ src_prepare() {
# Remove messages
for path in $(grep -v "^#"
"${REMOVE_MSGS}") ; do
rm -f
"${S}"/${DIR}/4/${LNG}/messages/${path}
+ # Quirk for LINGUAS=sr variants
+ if [[ ${LNG} = "sr" ]] ; then
+ rm -f
"${S}"/${DIR}/4/${LNG}/${LNG}\@*/messages/${path} || die
+ fi
done
else
