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

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] proj/kde:master commit in: kde-apps/kde4-l10n/files/, kde-apps/kde4-l10n/
@ 2015-08-19 22:28 Johannes Huber
  0 siblings, 0 replies; 12+ messages in thread
From: Johannes Huber @ 2015-08-19 22:28 UTC (permalink / raw
  To: gentoo-commits

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


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-apps/kde4-l10n/files/, kde-apps/kde4-l10n/
@ 2016-03-20 20:43 Johannes Huber
  0 siblings, 0 replies; 12+ messages in thread
From: Johannes Huber @ 2016-03-20 20:43 UTC (permalink / raw
  To: gentoo-commits

commit:     fd05e1d690810154d956372a5e6b08485b3087b4
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 20 20:17:27 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sun Mar 20 20:17:27 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=fd05e1d6

kde-apps/kde-l10n: Remove empty

 .../files/kde4-l10n-15.08.3-r1-remove-messages     | 213 ---------------------
 .../kde4-l10n/files/kde4-l10n-15.11.90-remove-dirs |  52 -----
 kde-apps/kde4-l10n/metadata.xml                    |   8 -
 3 files changed, 273 deletions(-)

diff --git a/kde-apps/kde4-l10n/files/kde4-l10n-15.08.3-r1-remove-messages b/kde-apps/kde4-l10n/files/kde4-l10n-15.08.3-r1-remove-messages
deleted file mode 100644
index 7a4d671..0000000
--- a/kde-apps/kde4-l10n/files/kde4-l10n-15.08.3-r1-remove-messages
+++ /dev/null
@@ -1,213 +0,0 @@
-# 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_device_automounter.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
-# KDE Utils 4
-kdeutils/org.kde.kteatime.appdata.po

diff --git a/kde-apps/kde4-l10n/files/kde4-l10n-15.11.90-remove-dirs b/kde-apps/kde4-l10n/files/kde4-l10n-15.11.90-remove-dirs
deleted file mode 100644
index ab7681e..0000000
--- a/kde-apps/kde4-l10n/files/kde4-l10n-15.11.90-remove-dirs
+++ /dev/null
@@ -1,52 +0,0 @@
-# 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 pairseditor
-docs/kdeedu parley
-docs/kdeedu step
-docs/kdegames bomber
-docs/kdegraphics gwenview
-docs/kdegraphics kruler
-docs/kdesdk kapptemplate
-docs/kdesdk okteta
-docs/kdeutils kwalletmanager
-# 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
-# kdepim-l10n 5
-docs kdepim
-docs kdepimlibs

diff --git a/kde-apps/kde4-l10n/metadata.xml b/kde-apps/kde4-l10n/metadata.xml
deleted file mode 100644
index 2fdbf33..0000000
--- a/kde-apps/kde4-l10n/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-apps/kde4-l10n/files/, kde-apps/kde4-l10n/
@ 2016-03-29 19:23 Alexey Shvetsov
  0 siblings, 0 replies; 12+ messages in thread
From: Alexey Shvetsov @ 2016-03-29 19:23 UTC (permalink / raw
  To: gentoo-commits

commit:     468e94468b9530eb89efaee32ee8f68294a73297
Author:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 29 19:22:40 2016 +0000
Commit:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Tue Mar 29 19:22:40 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=468e9446

kde-apps/kde4-l10n: add for 16.03.80

Package-Manager: portage-2.2.28

 .../kde4-l10n/files/kde4-l10n-15.07.90-remove-dirs |  49 +++++
 .../files/kde4-l10n-15.08.3-r1-remove-messages     | 213 +++++++++++++++++++++
 .../kde4-l10n/files/kde4-l10n-15.11.90-remove-dirs |  52 +++++
 kde-apps/kde4-l10n/kde4-l10n-16.03.80.ebuild       | 157 +++++++++++++++
 kde-apps/kde4-l10n/metadata.xml                    |   8 +
 5 files changed, 479 insertions(+)

diff --git a/kde-apps/kde4-l10n/files/kde4-l10n-15.07.90-remove-dirs b/kde-apps/kde4-l10n/files/kde4-l10n-15.07.90-remove-dirs
new file mode 100644
index 0000000..005cab1
--- /dev/null
+++ b/kde-apps/kde4-l10n/files/kde4-l10n-15.07.90-remove-dirs
@@ -0,0 +1,49 @@
+# 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 pairseditor
+docs/kdeedu parley
+docs/kdeedu step
+docs/kdegames bomber
+docs/kdegraphics gwenview
+docs/kdegraphics kruler
+docs/kdesdk kapptemplate
+docs/kdesdk okteta
+docs/kdeutils kwalletmanager
+# 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/files/kde4-l10n-15.08.3-r1-remove-messages b/kde-apps/kde4-l10n/files/kde4-l10n-15.08.3-r1-remove-messages
new file mode 100644
index 0000000..7a4d671
--- /dev/null
+++ b/kde-apps/kde4-l10n/files/kde4-l10n-15.08.3-r1-remove-messages
@@ -0,0 +1,213 @@
+# 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_device_automounter.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
+# KDE Utils 4
+kdeutils/org.kde.kteatime.appdata.po

diff --git a/kde-apps/kde4-l10n/files/kde4-l10n-15.11.90-remove-dirs b/kde-apps/kde4-l10n/files/kde4-l10n-15.11.90-remove-dirs
new file mode 100644
index 0000000..ab7681e
--- /dev/null
+++ b/kde-apps/kde4-l10n/files/kde4-l10n-15.11.90-remove-dirs
@@ -0,0 +1,52 @@
+# 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 pairseditor
+docs/kdeedu parley
+docs/kdeedu step
+docs/kdegames bomber
+docs/kdegraphics gwenview
+docs/kdegraphics kruler
+docs/kdesdk kapptemplate
+docs/kdesdk okteta
+docs/kdeutils kwalletmanager
+# 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
+# kdepim-l10n 5
+docs kdepim
+docs kdepimlibs

diff --git a/kde-apps/kde4-l10n/kde4-l10n-16.03.80.ebuild b/kde-apps/kde4-l10n/kde4-l10n-16.03.80.ebuild
new file mode 100644
index 0000000..18a56dc
--- /dev/null
+++ b/kde-apps/kde4-l10n/kde4-l10n-16.03.80.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="optional"
+KMNAME="kde-l10n"
+inherit kde4-base
+
+DESCRIPTION="KDE internationalization package"
+HOMEPAGE="http://l10n.kde.org"
+
+DEPEND="
+	sys-devel/gettext
+"
+RDEPEND="
+	!<kde-apps/kde-l10n-${PV}
+"
+
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="minimal"
+
+REMOVE_DIRS="${FILESDIR}/${PN}-15.11.90-remove-dirs"
+REMOVE_MSGS="${FILESDIR}/${PN}-15.08.3-r1-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
+he hi hr hu ia id is it ja kk km ko lt lv mr nb nds nl nn pa pl pt pt_BR ro ru
+sk sl sr sv tr ug uk wa zh_CN zh_TW"
+
+# /usr/portage/distfiles $ ls -1 kde-l10n-*-${PV}.* |sed -e 's:-${PV}.tar.xz::' -e 's:kde-l10n-::' |tr '\n' ' '
+MY_LANGS="ar bg bs ca ca@valencia cs da de el en_GB eo es et eu fa fi fr ga gl
+he hi hr hu ia id is it ja kk km ko lt lv mr nb nds nl nn pa pl pt pt_BR ro ru
+sk sl sr sv tr ug uk wa zh_CN zh_TW"
+
+URI_BASE="${SRC_URI/-${PV}.tar.xz/}"
+LURI_BASE="mirror://kde/stable/${LV}/src/${KMNAME}"
+SRC_URI=""
+
+for MY_LANG in ${LEGACY_LANGS} ; do
+	IUSE="${IUSE} linguas_${MY_LANG}"
+	SRC_URI="${SRC_URI} linguas_${MY_LANG}? ( ${LURI_BASE}/${KMNAME}-${MY_LANG}-${LV}.tar.xz )"
+done
+
+for MY_LANG in ${MY_LANGS} ; do
+	IUSE="${IUSE} linguas_${MY_LANG}"
+	SRC_URI="${SRC_URI} linguas_${MY_LANG}? ( ${URI_BASE}/${KMNAME}-${MY_LANG}-${PV}.tar.xz )"
+done
+
+S="${WORKDIR}"
+
+src_unpack() {
+	if [[ -z ${A} ]]; then
+		elog
+		elog "You either have the LINGUAS variable unset, or it only"
+		elog "contains languages not supported by ${P}."
+		elog "You won't have any additional language support."
+		elog
+		elog "${P} supports these language codes:"
+		elog "${MY_LANGS}"
+		elog
+	fi
+
+	[[ -n ${A} ]] && unpack ${A}
+}
+
+src_prepare() {
+	local LNG DIR LDIR SDIR
+	# add all linguas to cmake
+	if [[ -n ${A} ]]; then
+		for LNG in ${LINGUAS}; do
+			DIR="${KMNAME}-${LNG}-${PV}"
+			LDIR="${KMNAME}-${LNG}-${LV}"
+			SDIR="${S}/${DIR}/4/${LNG}"
+			if [[ -d "${DIR}" ]] ; then
+				echo "add_subdirectory( ${DIR} )" >> "${S}"/CMakeLists.txt
+
+				# Drop KF5-based part
+				sed -e '/add_subdirectory(5)/ s/^/#/' -i "${S}"/${DIR}/CMakeLists.txt
+
+				# Drop translations installed with plasma 5 and kde-apps 5 packages
+				if use minimal; then
+					einfo "${LNG}: Removing file conflicts"
+					if [[ -d "${LDIR}" ]] ; then
+						rm -rf "${LDIR}"
+					fi
+
+					einfo "   directories..."
+					while read path; do
+						if [[ -n ${path} && -e "${SDIR}"/${path%\ *}/CMakeLists.txt ]] ; then
+							sed -e ":${path#*\ }: s:^:#:"\
+								-i "${SDIR}"/${path%\ *}/CMakeLists.txt
+						fi
+					done < <(grep -v "^#" "${REMOVE_DIRS}")
+
+					einfo "   messages..."
+					for path in $(grep -v "^#" "${REMOVE_MSGS}") ; do
+						rm -f "${SDIR}"/messages/${path}
+						# Quirk for LINGUAS=sr variants
+						if [[ ${LNG} = "sr" ]] ; then
+							rm -f "${SDIR}"/${LNG}\@*/messages/${path} || die
+						fi
+					done
+				else
+					if [[ -d "${LDIR}" ]] ; then
+						einfo "${LNG}: Adding legacy localisation"
+						local dest_path
+						# Step through directories alphabetically first
+						for path in $(ls -R "${LDIR}" | grep ":$" | sed -e 's/:$//') ; do
+							dest_path="${path/${LV}/${PV}/4/${LNG}}"
+							if [[ ! -d "${dest_path}" ]] ; then
+								einfo "   $(basename ${dest_path}) subdirectory"\
+									"added to $(basename $(dirname ${dest_path}))"
+								mkdir "${dest_path}" || die "Failed creating ${dest_path}"
+								echo "add_subdirectory($(basename ${dest_path}))" >> \
+									$(dirname "${dest_path}")/CMakeLists.txt
+							fi
+						done
+						einfo "   merging legacy localisation..."
+						for path in $(find "${LDIR}" -type f) ; do
+							dest_path="${path/${LV}/${PV}/4/${LNG}}"
+							cp -rn "${path}" "${dest_path}" || die "Failed copying ${path}"
+						done
+						# Disable kdepim
+						for path in kdepim kdepimlibs kdepim-runtime ; do
+							find "${SDIR}" -name CMakeLists.txt -type f -exec \
+								sed -i -e "s:^ *add_subdirectory( *${path} *):# no ${path}:g" {} +
+						done
+						rm -rf "${LDIR}"
+					fi
+				fi
+			fi
+		done
+	fi
+
+	kde4-base_src_prepare
+}
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_build handbook docs)
+	)
+	[[ -n ${A} ]] && kde4-base_src_configure
+}
+
+src_compile() {
+	[[ -n ${A} ]] && kde4-base_src_compile
+}
+
+src_test() {
+	[[ -n ${A} ]] && kde4-base_src_test
+}
+
+src_install() {
+	[[ -n ${A} ]] && kde4-base_src_install
+}

diff --git a/kde-apps/kde4-l10n/metadata.xml b/kde-apps/kde4-l10n/metadata.xml
new file mode 100644
index 0000000..2fdbf33
--- /dev/null
+++ b/kde-apps/kde4-l10n/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+</pkgmetadata>


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-apps/kde4-l10n/files/, kde-apps/kde4-l10n/
@ 2016-04-07 19:19 Michael Palimaka
  0 siblings, 0 replies; 12+ messages in thread
From: Michael Palimaka @ 2016-04-07 19:19 UTC (permalink / raw
  To: gentoo-commits

commit:     fd6b1b7dbfa002107f3a3e8e15de1f0fd4588160
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Thu Apr  7 18:16:49 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Apr  7 19:18:48 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=fd6b1b7d

kde-apps/kde4-l10n: Fix file collisions

Package-Manager: portage-2.2.27

 ...l10n-15.12.3-remove-messages => kde4-l10n-16.03.90-remove-messages} | 3 +++
 kde-apps/kde4-l10n/kde4-l10n-16.03.90.ebuild                           | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/kde-apps/kde4-l10n/files/kde4-l10n-15.12.3-remove-messages b/kde-apps/kde4-l10n/files/kde4-l10n-16.03.90-remove-messages
similarity index 99%
rename from kde-apps/kde4-l10n/files/kde4-l10n-15.12.3-remove-messages
rename to kde-apps/kde4-l10n/files/kde4-l10n-16.03.90-remove-messages
index a7901c6..0aadb9d 100644
--- a/kde-apps/kde4-l10n/files/kde4-l10n-15.12.3-remove-messages
+++ b/kde-apps/kde4-l10n/files/kde4-l10n-16.03.90-remove-messages
@@ -210,5 +210,8 @@ applications/useraccount.po
 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 27ad2d9..89314df 100644
--- a/kde-apps/kde4-l10n/kde4-l10n-16.03.90.ebuild
+++ b/kde-apps/kde4-l10n/kde4-l10n-16.03.90.ebuild
@@ -21,7 +21,7 @@ RDEPEND="
 "
 
 REMOVE_DIRS="${FILESDIR}/${PN}-15.11.90-remove-dirs"
-REMOVE_MSGS="${FILESDIR}/${PN}-15.12.3-remove-messages"
+REMOVE_MSGS="${FILESDIR}/${PN}-16.03.90-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


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-apps/kde4-l10n/files/, kde-apps/kde4-l10n/
@ 2016-07-13 18:23 Johannes Huber
  0 siblings, 0 replies; 12+ messages in thread
From: Johannes Huber @ 2016-07-13 18:23 UTC (permalink / raw
  To: gentoo-commits

commit:     97e5b2da06082c1f7c0c83bd03058eb2c96921d6
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sun Jul 10 16:01:26 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed Jul 13 18:21:52 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=97e5b2da

kde-apps/kde4-l10n: Merge kde5.eclass changes here, fix file collisions

Gentoo-bug: 588436

Also, bail out if files are missing.

Package-Manager: portage-2.2.28

Signed-off-by: Johannes Huber <johu <AT> gentoo.org>

 .../kde4-l10n/files/kde4-l10n-16.04.1-remove-dirs  |  43 ---------
 kde-apps/kde4-l10n/kde4-l10n-16.04.3.ebuild        | 107 +++++++++++++++------
 2 files changed, 77 insertions(+), 73 deletions(-)

diff --git a/kde-apps/kde4-l10n/files/kde4-l10n-16.04.1-remove-dirs b/kde-apps/kde4-l10n/files/kde4-l10n-16.04.1-remove-dirs
deleted file mode 100644
index 9563950..0000000
--- a/kde-apps/kde4-l10n/files/kde4-l10n-16.04.1-remove-dirs
+++ /dev/null
@@ -1,43 +0,0 @@
-# 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/kde-runtime glossary
-docs/kde-runtime khelpcenter
-docs/kdeedu kig
-docs/kdeedu parley
-docs/kdeedu step
-docs/kdegames bomber
-docs/kdegraphics gwenview
-docs/kdegraphics kruler
-docs/kdesdk kapptemplate
-docs/kdesdk okteta
-docs/kdesdk umbrello
-docs/kdeutils kwalletmanager
-scripts kdeedu
-# Plasma 5
-docs kde-workspace
-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 nepomuk
-docs/kde-runtime/kcontrol smb
-docs/kde-runtime/kcontrol trash
-docs/kde-runtime/kcontrol useragent
-messages kde-workspace
-messages kdeplasma-addons
-# kdepim-l10n 5
-docs kdepim
-docs kdepimlibs

diff --git a/kde-apps/kde4-l10n/kde4-l10n-16.04.3.ebuild b/kde-apps/kde4-l10n/kde4-l10n-16.04.3.ebuild
index 57b27d6..4e5b493 100644
--- a/kde-apps/kde4-l10n/kde4-l10n-16.04.3.ebuild
+++ b/kde-apps/kde4-l10n/kde4-l10n-16.04.3.ebuild
@@ -8,7 +8,7 @@ KDE_HANDBOOK="optional"
 KMNAME="kde-l10n"
 inherit kde4-base
 
-DESCRIPTION="KDE internationalization package"
+DESCRIPTION="KDE legacy internationalization package"
 HOMEPAGE="http://l10n.kde.org"
 
 KEYWORDS="~amd64 ~arm ~x86"
@@ -20,23 +20,46 @@ RDEPEND="
 	>=kde-apps/kde-l10n-${PV}
 "
 
-REMOVE_DIRS="${FILESDIR}/${PN}-16.04.1-remove-dirs"
+REMOVE_DIRS="${FILESDIR}/${PN}-16.04.2-remove-dirs"
 REMOVE_MSGS="${FILESDIR}/${PN}-16.03.91-remove-messages"
 
 # /usr/portage/distfiles $ ls -1 kde-l10n-*-${PV}.* |sed -e 's:-${PV}.tar.xz::' -e 's:kde-l10n-::' |tr '\n' ' '
-MY_LANGS="ar ast bg bs ca ca@valencia cs da de el en_GB eo es et eu fa fi fr ga
-gl he hi hr hu ia id is it ja kk km ko lt lv mr nb nds nl nn pa pl pt pt_BR ro
-ru sk sl sr sv tr ug uk wa zh_CN zh_TW"
+# Make this correspond with kde5.eclass; important: L10N, not LINGUAS here!
+KDE_L10N=(
+	ar ast bg bs ca ca-valencia cs da de el en-GB eo es et eu fa fi fr ga
+	gl he hi hr hu ia id is it ja kk km ko lt lv mr nb nds nl nn pa pl pt pt-BR ro
+	ru sk sl sr sr-ijekavsk sr-Latn sr-Latn-ijekavsk sv tr ug uk wa zh-CN zh-TW
+)
 
 # TODO: Drop no-op +minimal in 16.08.x - necessary kde5.eclass change happened after KF-5.23/Plasma-5.6.5
-IUSE="+minimal test $(printf 'l10n_%s ' ${MY_LANGS//[@_]/-})"
+IUSE="+minimal test $(printf 'l10n_%s ' ${KDE_L10N[@]})"
 
 URI_BASE="${SRC_URI/-${PV}.tar.xz/}"
-LURI_BASE="mirror://kde/stable/${LV}/src/${KMNAME}"
 SRC_URI=""
 
-for MY_LANG in ${MY_LANGS} ; do
-	SRC_URI="${SRC_URI} l10n_${MY_LANG/[@_]/-}? ( ${URI_BASE}/${KMNAME}-${MY_LANG}-${PV}.tar.xz )"
+kde_l10n2lingua() {
+	local l
+	for l; do
+		case ${l} in
+			ca-valencia) echo ca@valencia;;
+			sr-ijekavsk) echo sr@ijekavian;;
+			sr-Latn-ijekavsk) echo sr@ijekavianlatin;;
+			sr-Latn) echo sr@latin;;
+			uz-Cyrl) echo uz@cyrillic;;
+			*) echo "${l/-/_}";;
+		esac
+	done
+}
+
+for my_l10n in ${KDE_L10N[@]} ; do
+	case ${my_l10n} in
+		sr | sr-ijekavsk | sr-Latn-ijekavsk | sr-Latn)
+			SRC_URI="${SRC_URI} l10n_${my_l10n}? ( ${URI_BASE}/${KMNAME}-sr-${PV}.tar.xz )"
+			;;
+		*)
+			SRC_URI="${SRC_URI} l10n_${my_l10n}? ( ${URI_BASE}/${KMNAME}-$(kde_l10n2lingua ${my_l10n})-${PV}.tar.xz )"
+			;;
+	esac
 done
 
 S="${WORKDIR}"
@@ -47,7 +70,7 @@ pkg_setup() {
 		elog "None of the requested L10N are supported by ${P}."
 		elog
 		elog "${P} supports these language codes:"
-		elog "${MY_LANGS//[@_]/-}"
+		elog "${KDE_L10N[@]}"
 		elog
 	fi
 	[[ -n ${A} ]] && kde4-base_pkg_setup
@@ -65,24 +88,16 @@ src_prepare() {
 	default
 	[[ -n ${A} ]] || return
 
-	# L10N=sr variants are subdirs within sr/ ...
-	if [[ -d "${KMNAME}-sr-${PV}" ]] ; then
-		for variant in "${KMNAME}"-sr-${PV}/4/sr/sr@*; do
-			mkdir -p "${KMNAME}-${variant##*/}-${PV}/4" ||
-				die "Failed to create L10N=${variant##*/} subdir"
-			mv ${variant} "${KMNAME}-${variant##*/}-${PV}/4/${variant##*/}" ||
-				die "Failed to move L10N=${variant##*/}"
-			cp -f "${KMNAME}-sr-${PV}"/CMakeLists.txt "${KMNAME}-${variant##*/}-${PV}" ||
-				die "Failed to prepare L10N=${variant##*/} subdir"
-			echo "add_subdirectory(${variant##*/})" > "${KMNAME}-${variant##*/}-${PV}"/4/CMakeLists.txt ||
-				die "Failed to prepare L10N=${variant##*/} subdir"
-			cp -f "${KMNAME}-sr-${PV}"/4/sr/CMakeLists.txt "${KMNAME}-${variant##*/}-${PV}"/4/${variant##*/} ||
-				die "Failed to prepare L10N=${variant##*/} subdir"
-			sed -e "/^macro.*sr/d" \
-				-e "s/sr/${variant##*/}/" \
-				-i "${KMNAME}-${variant##*/}-${PV}"/4/${variant##*/}/CMakeLists.txt ||
-				die "Failed to prepare L10N=${variant##*/} subdir"
-		done
+	# move known variant subdirs to root dir, currently sr@*
+	use_if_iuse l10n_sr-ijekavsk && _l10n_variant_subdir2root sr-ijekavsk sr
+	use_if_iuse l10n_sr-Latn-ijekavsk && _l10n_variant_subdir2root sr-Latn-ijekavsk sr
+	use_if_iuse l10n_sr-Latn && _l10n_variant_subdir2root sr-Latn sr
+	if use_if_iuse l10n_sr; then
+		rm -rf kde-l10n-sr-${PV}/4/sr/sr@* || die "Failed to cleanup L10N=sr"
+		_l10n_variant_subdir_buster sr
+	elif [[ -d kde-l10n-sr-${PV} ]]; then
+		# having any variant selected means parent lingua will be unpacked as well
+		rm -r kde-l10n-sr-${PV} || die "Failed to remove sr parent lingua"
 	fi
 
 	# add all l10n to cmake
@@ -97,13 +112,16 @@ EOF
 		sed -i -e "/add_subdirectory(5)/ s/^/#DONT/" {} + || die
 
 	einfo "Removing file collisions with Plasma 5 and Applications"
+	[[ -f ${REMOVE_DIRS} ]] || die "Error: ${REMOVE_DIRS} not found!"
+	[[ -f ${REMOVE_MSGS} ]] || die "Error: ${REMOVE_MSGS} not found!"
+
 	use test && einfo "Tests enabled: Listing LINGUAS causing file collisions"
 
 	einfo "Directories..."
 	while read path; do
 		if use test ; then	# build a report w/ L10N="*" to submit @upstream
 			local lngs
-			for lng in ${MY_LANGS}; do
+			for lng in $(kde_l10n2lingua ${KDE_L10N[@]}); do
 				SDIR="${S}/${KMNAME}-${lng}-${PV}/4/${lng}"
 				if [[ -d "${SDIR}"/${path%\ *}/${path#*\ } ]] ; then
 					lngs+=" ${lng}"
@@ -125,7 +143,7 @@ EOF
 	while read path; do
 		if use test ; then	# build a report w/ L10N="*" to submit @upstream
 			local lngs
-			for lng in ${MY_LANGS}; do
+			for lng in $(kde_l10n2lingua ${KDE_L10N[@]}); do
 				SDIR="${S}/${KMNAME}-${lng}-${PV}/4/${lng}"
 				if [[ -e "${SDIR}"/messages/${path} ]] ; then
 					lngs+=" ${lng}"
@@ -158,3 +176,32 @@ src_test() { :; }
 src_install() {
 	[[ -n ${A} ]] && kde4-base_src_install
 }
+
+_l10n_variant_subdir2root() {
+	local lingua=$(kde_l10n2lingua ${1})
+	local src=kde-l10n-${2}-${PV}
+	local dest=kde-l10n-${lingua}-${PV}/4
+
+	# create variant rootdir structure from parent lingua and adapt it
+	mkdir -p ${dest} || die "Failed to create ${dest}"
+	mv ${src}/4/${2}/${lingua} ${dest}/${lingua} || die "Failed to create ${dest}/${lingua}"
+	cp -f ${src}/CMakeLists.txt kde-l10n-${lingua}-${PV} || die "Failed to prepare L10N=${1} subdir"
+	echo "add_subdirectory(${lingua})" > ${dest}/CMakeLists.txt ||
+		die "Failed to prepare ${dest}/CMakeLists.txt"
+	cp -f ${src}/4/${2}/CMakeLists.txt ${dest}/${lingua} ||
+		die "Failed to create ${dest}/${lingua}/CMakeLists.txt"
+	sed -e "s/${2}/${lingua}/" -i ${dest}/${lingua}/CMakeLists.txt ||
+		die "Failed to prepare ${dest}/${lingua}/CMakeLists.txt"
+
+	_l10n_variant_subdir_buster ${1}
+}
+
+_l10n_variant_subdir_buster() {
+	local dir=kde-l10n-$(kde_l10n2lingua ${1})-${PV}/4/$(kde_l10n2lingua ${1})
+
+	sed -e "/^macro.*subdirectory(/d" -i ${dir}/CMakeLists.txt || die "Failed to cleanup ${dir} subdir"
+
+	for subdir in $(find ${dir} -mindepth 1 -maxdepth 1 -type d | sed -e "s:^\./::"); do
+		echo "add_subdirectory(${subdir##*/})" >> ${dir}/CMakeLists.txt
+	done
+}


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-apps/kde4-l10n/files/, kde-apps/kde4-l10n/
@ 2016-07-15  6:16 Johannes Huber
  0 siblings, 0 replies; 12+ messages in thread
From: Johannes Huber @ 2016-07-15  6:16 UTC (permalink / raw
  To: gentoo-commits

commit:     f990883633bc4335d48ba648fd3c2c59e397d4df
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 15 06:14:42 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Fri Jul 15 06:14:42 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=f9908836

kde-apps/kde4-l10n: Remove empty

 .../files/kde4-l10n-16.03.91-remove-messages       | 56 ----------------------
 .../kde4-l10n/files/kde4-l10n-16.04.2-remove-dirs  | 44 -----------------
 kde-apps/kde4-l10n/metadata.xml                    |  8 ----
 3 files changed, 108 deletions(-)

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
deleted file mode 100644
index 2b76c23..0000000
--- a/kde-apps/kde4-l10n/files/kde4-l10n-16.03.91-remove-messages
+++ /dev/null
@@ -1,56 +0,0 @@
-# Remove any path listed here. Comments are ignored
-# 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_device_automounter.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
-# 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_activities.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 SDK 4
-kdesdk/org.kde.umbrello.appdata.po
-kdesdk/umbrello.po

diff --git a/kde-apps/kde4-l10n/files/kde4-l10n-16.04.2-remove-dirs b/kde-apps/kde4-l10n/files/kde4-l10n-16.04.2-remove-dirs
deleted file mode 100644
index f09bf82..0000000
--- a/kde-apps/kde4-l10n/files/kde4-l10n-16.04.2-remove-dirs
+++ /dev/null
@@ -1,44 +0,0 @@
-# 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/kde-runtime glossary
-docs/kde-runtime khelpcenter
-docs/kdeedu kig
-docs/kdeedu parley
-docs/kdeedu step
-docs/kdegames bomber
-docs/kdegraphics gwenview
-docs/kdegraphics kruler
-docs/kdesdk kapptemplate
-docs/kdesdk okteta
-docs/kdesdk umbrello
-docs/kdeutils kwalletmanager
-scripts kdeedu
-# Plasma 5
-docs kde-workspace
-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 kcm_ssl
-docs/kde-runtime/kcontrol nepomuk
-docs/kde-runtime/kcontrol smb
-docs/kde-runtime/kcontrol trash
-docs/kde-runtime/kcontrol useragent
-messages kde-workspace
-messages kdeplasma-addons
-# kdepim-l10n 5
-docs kdepim
-docs kdepimlibs

diff --git a/kde-apps/kde4-l10n/metadata.xml b/kde-apps/kde4-l10n/metadata.xml
deleted file mode 100644
index 2fdbf33..0000000
--- a/kde-apps/kde4-l10n/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-apps/kde4-l10n/files/, kde-apps/kde4-l10n/
@ 2016-07-25 15:30 Michael Palimaka
  0 siblings, 0 replies; 12+ messages in thread
From: Michael Palimaka @ 2016-07-25 15:30 UTC (permalink / raw
  To: gentoo-commits

commit:     3d299c12bc698a54306741443dfc9b1381981c9d
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Fri Jul 22 17:04:04 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Jul 25 15:30:14 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=3d299c12

kde-apps/kde4-l10n: File removal cleanup

Result of L10N="*" test run

Package-Manager: portage-2.2.28

 ...{kde4-l10n-16.04.2-remove-dirs => kde4-l10n-16.07.80-remove-dirs} | 5 -----
 ...n-16.03.91-remove-messages => kde4-l10n-16.07.80-remove-messages} | 1 -
 kde-apps/kde4-l10n/kde4-l10n-16.07.80.ebuild                         | 4 ++--
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/kde-apps/kde4-l10n/files/kde4-l10n-16.04.2-remove-dirs b/kde-apps/kde4-l10n/files/kde4-l10n-16.07.80-remove-dirs
similarity index 91%
rename from kde-apps/kde4-l10n/files/kde4-l10n-16.04.2-remove-dirs
rename to kde-apps/kde4-l10n/files/kde4-l10n-16.07.80-remove-dirs
index f09bf82..ea4fd52 100644
--- a/kde-apps/kde4-l10n/files/kde4-l10n-16.04.2-remove-dirs
+++ b/kde-apps/kde4-l10n/files/kde4-l10n-16.07.80-remove-dirs
@@ -5,17 +5,13 @@
 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
-docs/kdegames bomber
 docs/kdegraphics gwenview
 docs/kdegraphics kruler
-docs/kdesdk kapptemplate
-docs/kdesdk okteta
 docs/kdesdk umbrello
 docs/kdeutils kwalletmanager
 scripts kdeedu
@@ -41,4 +37,3 @@ 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.07.80-remove-messages
similarity index 97%
rename from kde-apps/kde4-l10n/files/kde4-l10n-16.03.91-remove-messages
rename to kde-apps/kde4-l10n/files/kde4-l10n-16.07.80-remove-messages
index 2b76c23..44a85c1 100644
--- a/kde-apps/kde4-l10n/files/kde4-l10n-16.03.91-remove-messages
+++ b/kde-apps/kde4-l10n/files/kde4-l10n-16.07.80-remove-messages
@@ -52,5 +52,4 @@ kdelibs/plasma_runner_baloosearchrunner.po
 # KDE Applications 4
 applications/useraccount.po
 # KDE SDK 4
-kdesdk/org.kde.umbrello.appdata.po
 kdesdk/umbrello.po

diff --git a/kde-apps/kde4-l10n/kde4-l10n-16.07.80.ebuild b/kde-apps/kde4-l10n/kde4-l10n-16.07.80.ebuild
index 4f21894..a6bcfa9 100644
--- a/kde-apps/kde4-l10n/kde4-l10n-16.07.80.ebuild
+++ b/kde-apps/kde4-l10n/kde4-l10n-16.07.80.ebuild
@@ -27,8 +27,8 @@ RDEPEND="
 	>=kde-apps/kde-l10n-${PV}
 "
 
-REMOVE_DIRS="${FILESDIR}/${PN}-16.04.2-remove-dirs"
-REMOVE_MSGS="${FILESDIR}/${PN}-16.03.91-remove-messages"
+REMOVE_DIRS="${FILESDIR}/${PN}-16.07.80-remove-dirs"
+REMOVE_MSGS="${FILESDIR}/${PN}-16.07.80-remove-messages"
 
 IUSE="aqua test" # TODO: Drop aqua as soon as possible
 


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-apps/kde4-l10n/files/, kde-apps/kde4-l10n/
@ 2017-03-25 17:07 Andreas Sturmlechner
  0 siblings, 0 replies; 12+ messages in thread
From: Andreas Sturmlechner @ 2017-03-25 17:07 UTC (permalink / raw
  To: gentoo-commits

commit:     48e7f90e50ed2d8d9ebe7d4c4d3cc5a7335bd67a
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 25 17:04:06 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Mar 25 17:04:06 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=48e7f90e

kde-apps/kde4-l10n: Drop old

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 .../kde4-l10n/files/kde4-l10n-16.11.90-remove-dirs |  25 -----
 kde-apps/kde4-l10n/kde4-l10n-17.03.80.ebuild       | 114 ---------------------
 2 files changed, 139 deletions(-)

diff --git a/kde-apps/kde4-l10n/files/kde4-l10n-16.11.90-remove-dirs b/kde-apps/kde4-l10n/files/kde4-l10n-16.11.90-remove-dirs
deleted file mode 100644
index 93630fefca..0000000000
--- a/kde-apps/kde4-l10n/files/kde4-l10n-16.11.90-remove-dirs
+++ /dev/null
@@ -1,25 +0,0 @@
-# Disable any subdirectories listed here. Comments are ignored
-# First argument: parent directory
-# Second argument: which subdirectory to disable in CMakeLists.txt
-# kde-l10n 5
-docs/kde-runtime glossary
-docs/kde-runtime khelpcenter
-docs/kdesdk umbrello
-scripts kdeedu
-# Plasma 5
-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 kcm_ssl
-docs/kde-runtime/kcontrol nepomuk
-docs/kde-runtime/kcontrol smb
-docs/kde-runtime/kcontrol trash
-docs/kde-runtime/kcontrol useragent

diff --git a/kde-apps/kde4-l10n/kde4-l10n-17.03.80.ebuild b/kde-apps/kde4-l10n/kde4-l10n-17.03.80.ebuild
deleted file mode 100644
index 7cb6d087a9..0000000000
--- a/kde-apps/kde4-l10n/kde4-l10n-17.03.80.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_AUTODEPS="false"
-KDE_HANDBOOK="optional"
-KDE_L10N=(
-	ar ast bg bs ca ca-valencia cs da de el en-GB eo es et eu fa fi fr ga gl he
-	hi hr hu ia id is it ja kk km ko lt lv mr nb nds nl nn pa pl pt pt-BR ro ru
-	sk sl sr sr-ijekavsk sr-Latn sr-Latn-ijekavsk sv tr ug uk wa zh-CN zh-TW
-)
-KMNAME="kde-l10n"
-inherit kde5
-
-DESCRIPTION="KDE legacy internationalization package"
-
-SLOT="4"
-KEYWORDS="~amd64 ~arm ~x86"
-
-DEPEND="
-	kde-frameworks/kdelibs:4
-	sys-devel/gettext
-"
-RDEPEND="
-	>=kde-apps/kde-l10n-${PV}
-"
-
-REMOVE_DIRS="${FILESDIR}/${PN}-16.11.90-remove-dirs"
-REMOVE_MSGS="${FILESDIR}/${PN}-16.11.90-remove-messages"
-
-IUSE="aqua test" # TODO: Drop aqua as soon as possible
-
-pkg_setup() {
-	if [[ -z ${A} ]]; then
-		elog
-		elog "None of the requested L10N are supported by ${P}."
-		elog
-		elog "${P} supports these language codes:"
-		elog "${KDE_L10N[@]}"
-		elog
-	fi
-	[[ -n ${A} ]] && kde5_pkg_setup
-}
-
-src_prepare() {
-	kde5_src_prepare
-	[[ -n ${A} ]] || return
-
-	einfo "Removing file collisions with Plasma 5 and Applications"
-	[[ -f ${REMOVE_DIRS} ]] || die "Error: ${REMOVE_DIRS} not found!"
-	[[ -f ${REMOVE_MSGS} ]] || die "Error: ${REMOVE_MSGS} not found!"
-
-	use test && einfo "Tests enabled: Listing LINGUAS causing file collisions"
-
-	einfo "Directories..."
-	while read path; do
-		if use test ; then	# build a report w/ L10N="*" to submit @upstream
-			local lngs
-			for lng in $(kde_l10n2lingua ${KDE_L10N[@]}); do
-				SDIR="${S}/${KMNAME}-${lng}-${PV}/4/${lng}"
-				if [[ -d "${SDIR}"/${path%\ *}/${path#*\ } ]] ; then
-					lngs+=" ${lng}"
-				fi
-			done
-			[[ -n "${lngs}" ]] && einfo "${path%\ *}/${path#*\ }${lngs}"
-			unset lngs
-		fi
-		if ls -U ./*/4/*/${path%\ *}/${path#*\ } > /dev/null 2>&1; then
-			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 L10N="*" to cut down list
-		fi
-	done < <(grep -ve "^$\|^\s*\#" "${REMOVE_DIRS}")
-	einfo
-	einfo "Messages..."
-	while read path; do
-		if use test ; then	# build a report w/ L10N="*" to submit @upstream
-			local lngs
-			for lng in $(kde_l10n2lingua ${KDE_L10N[@]}); do
-				SDIR="${S}/${KMNAME}-${lng}-${PV}/4/${lng}"
-				if [[ -e "${SDIR}"/messages/${path} ]] ; then
-					lngs+=" ${lng}"
-				fi
-			done
-			[[ -n "${lngs}" ]] && einfo "${path}${lngs}"
-			unset lngs
-		fi
-		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 L10N="*" to cut down list
-		fi
-	done < <(grep -ve "^$\|^\s*\#" "${REMOVE_MSGS}")
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_docs=$(usex handbook)
-	)
-	[[ -n ${A} ]] && kde5_src_configure
-}
-
-src_compile() {
-	[[ -n ${A} ]] && kde5_src_compile
-}
-
-src_test() { :; }
-
-src_install() {
-	[[ -n ${A} ]] && kde5_src_install
-}


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-apps/kde4-l10n/files/, kde-apps/kde4-l10n/
@ 2017-03-25 17:07 Andreas Sturmlechner
  0 siblings, 0 replies; 12+ messages in thread
From: Andreas Sturmlechner @ 2017-03-25 17:07 UTC (permalink / raw
  To: gentoo-commits

commit:     0251fc087ce5b1e3cc6999341437f09055c6f23c
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 25 17:03:30 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Mar 25 17:03:30 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=0251fc08

kde-apps/kde4-l10n: Fix file collision w/ kde-plasma/plasma-desktop-5.9.4

Reported-by: Sabayon

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 .../kde4-l10n/files/kde4-l10n-16.12.3-remove-dirs  |  26 +++++
 kde-apps/kde4-l10n/kde4-l10n-17.03.80-r1.ebuild    | 114 +++++++++++++++++++++
 2 files changed, 140 insertions(+)

diff --git a/kde-apps/kde4-l10n/files/kde4-l10n-16.12.3-remove-dirs b/kde-apps/kde4-l10n/files/kde4-l10n-16.12.3-remove-dirs
new file mode 100644
index 0000000000..c1827c7aee
--- /dev/null
+++ b/kde-apps/kde4-l10n/files/kde4-l10n-16.12.3-remove-dirs
@@ -0,0 +1,26 @@
+# Disable any subdirectories listed here. Comments are ignored
+# First argument: parent directory
+# Second argument: which subdirectory to disable in CMakeLists.txt
+# kde-l10n 5
+docs/kde-runtime glossary
+docs/kde-runtime khelpcenter
+docs/kdesdk umbrello
+scripts kdeedu
+# Plasma 5
+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 kcm_ssl
+docs/kde-runtime/kcontrol nepomuk
+docs/kde-runtime/kcontrol smb
+docs/kde-runtime/kcontrol trash
+docs/kde-runtime/kcontrol useragent
+scripts kdebase

diff --git a/kde-apps/kde4-l10n/kde4-l10n-17.03.80-r1.ebuild b/kde-apps/kde4-l10n/kde4-l10n-17.03.80-r1.ebuild
new file mode 100644
index 0000000000..cc1656c3b5
--- /dev/null
+++ b/kde-apps/kde4-l10n/kde4-l10n-17.03.80-r1.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_AUTODEPS="false"
+KDE_HANDBOOK="optional"
+KDE_L10N=(
+	ar ast bg bs ca ca-valencia cs da de el en-GB eo es et eu fa fi fr ga gl he
+	hi hr hu ia id is it ja kk km ko lt lv mr nb nds nl nn pa pl pt pt-BR ro ru
+	sk sl sr sr-ijekavsk sr-Latn sr-Latn-ijekavsk sv tr ug uk wa zh-CN zh-TW
+)
+KMNAME="kde-l10n"
+inherit kde5
+
+DESCRIPTION="KDE legacy internationalization package"
+
+SLOT="4"
+KEYWORDS="~amd64 ~arm ~x86"
+
+DEPEND="
+	kde-frameworks/kdelibs:4
+	sys-devel/gettext
+"
+RDEPEND="
+	>=kde-apps/kde-l10n-${PV}
+"
+
+REMOVE_DIRS="${FILESDIR}/${PN}-16.12.3-remove-dirs"
+REMOVE_MSGS="${FILESDIR}/${PN}-16.11.90-remove-messages"
+
+IUSE="aqua test" # TODO: Drop aqua as soon as possible
+
+pkg_setup() {
+	if [[ -z ${A} ]]; then
+		elog
+		elog "None of the requested L10N are supported by ${P}."
+		elog
+		elog "${P} supports these language codes:"
+		elog "${KDE_L10N[@]}"
+		elog
+	fi
+	[[ -n ${A} ]] && kde5_pkg_setup
+}
+
+src_prepare() {
+	kde5_src_prepare
+	[[ -n ${A} ]] || return
+
+	einfo "Removing file collisions with Plasma 5 and Applications"
+	[[ -f ${REMOVE_DIRS} ]] || die "Error: ${REMOVE_DIRS} not found!"
+	[[ -f ${REMOVE_MSGS} ]] || die "Error: ${REMOVE_MSGS} not found!"
+
+	use test && einfo "Tests enabled: Listing LINGUAS causing file collisions"
+
+	einfo "Directories..."
+	while read path; do
+		if use test ; then	# build a report w/ L10N="*" to submit @upstream
+			local lngs
+			for lng in $(kde_l10n2lingua ${KDE_L10N[@]}); do
+				SDIR="${S}/${KMNAME}-${lng}-${PV}/4/${lng}"
+				if [[ -d "${SDIR}"/${path%\ *}/${path#*\ } ]] ; then
+					lngs+=" ${lng}"
+				fi
+			done
+			[[ -n "${lngs}" ]] && einfo "${path%\ *}/${path#*\ }${lngs}"
+			unset lngs
+		fi
+		if ls -U ./*/4/*/${path%\ *}/${path#*\ } > /dev/null 2>&1; then
+			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 L10N="*" to cut down list
+		fi
+	done < <(grep -ve "^$\|^\s*\#" "${REMOVE_DIRS}")
+	einfo
+	einfo "Messages..."
+	while read path; do
+		if use test ; then	# build a report w/ L10N="*" to submit @upstream
+			local lngs
+			for lng in $(kde_l10n2lingua ${KDE_L10N[@]}); do
+				SDIR="${S}/${KMNAME}-${lng}-${PV}/4/${lng}"
+				if [[ -e "${SDIR}"/messages/${path} ]] ; then
+					lngs+=" ${lng}"
+				fi
+			done
+			[[ -n "${lngs}" ]] && einfo "${path}${lngs}"
+			unset lngs
+		fi
+		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 L10N="*" to cut down list
+		fi
+	done < <(grep -ve "^$\|^\s*\#" "${REMOVE_MSGS}")
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_docs=$(usex handbook)
+	)
+	[[ -n ${A} ]] && kde5_src_configure
+}
+
+src_compile() {
+	[[ -n ${A} ]] && kde5_src_compile
+}
+
+src_test() { :; }
+
+src_install() {
+	[[ -n ${A} ]] && kde5_src_install
+}


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-apps/kde4-l10n/files/, kde-apps/kde4-l10n/
@ 2017-07-13 20:07 Andreas Sturmlechner
  0 siblings, 0 replies; 12+ messages in thread
From: Andreas Sturmlechner @ 2017-07-13 20:07 UTC (permalink / raw
  To: gentoo-commits

commit:     672bb71c3e8b5206e63bccb6346c56193f4eeee9
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 13 19:53:08 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jul 13 20:07:36 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=672bb71c

kde-apps/kde4-l10n: Merge kde5.eclass l10n hacks, switch to kde4-base

No need to keep these functions in the eclass for a single consumer.
Upstream is cleaning up - drop obsolete conflicts.

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 ...-messages => kde4-l10n-17.04.3-remove-messages} |  65 +++++------
 kde-apps/kde4-l10n/kde4-l10n-17.04.3.ebuild        | 123 ++++++++++++++++++---
 2 files changed, 135 insertions(+), 53 deletions(-)

diff --git a/kde-apps/kde4-l10n/files/kde4-l10n-16.11.90-remove-messages b/kde-apps/kde4-l10n/files/kde4-l10n-17.04.3-remove-messages
similarity index 53%
rename from kde-apps/kde4-l10n/files/kde4-l10n-16.11.90-remove-messages
rename to kde-apps/kde4-l10n/files/kde4-l10n-17.04.3-remove-messages
index 7f77a89708..493415f1fb 100644
--- a/kde-apps/kde4-l10n/files/kde4-l10n-16.11.90-remove-messages
+++ b/kde-apps/kde4-l10n/files/kde4-l10n-17.04.3-remove-messages
@@ -1,53 +1,38 @@
 # Remove any path listed here. Comments are ignored
+# KDE SDK 4
+kdesdk/umbrello.po
+
+# plasma-desktop - fixed in: 5.10.0
+# KDELIBS 4
+kdelibs/kcm_baloofile.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_device_automounter.po
 kde-runtime/kcm_emoticons.po
-kde-runtime/kcmhtmlsearch.po
+kde-runtime/kcm_phonon.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/kcmcomponentchooser.po
+kde-runtime/knetattach.po
+
+# plasma-workspace - fixed in: 5.10.0
+# KDELIBS 4
+kdelibs/plasma_runner_baloosearchrunner.po
+# KDE Runtime 4
+kde-runtime/drkonqi.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/phonon_kde.po
+kde-runtime/soliduiserver.po
+# fixed in: 5.8.6-r1, 5.9.5.1-r1
 kde-runtime/kio_remote.po
-kde-runtime/kio_sftp.po
-kde-runtime/kio_smb.po
-kde-runtime/kio_thumbnail.po
+
+# kde-cli-tools - fixed in: 5.10.0
+# KDE Runtime 4
+kde-runtime/filetypes.po
+kde-runtime/kcmshell.po
 kde-runtime/kmimetypefinder.po
-kde-runtime/knetattach.po
+kde-runtime/kdesu.po
+kde-runtime/kioclient.po
 kde-runtime/kstart.po
 kde-runtime/ktraderclient.po
-kde-runtime/phonon_kde.po
-kde-runtime/soliduiserver.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_activities.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 SDK 4
-kdesdk/umbrello.po

diff --git a/kde-apps/kde4-l10n/kde4-l10n-17.04.3.ebuild b/kde-apps/kde4-l10n/kde4-l10n-17.04.3.ebuild
index f5397b5a76..dff133c010 100644
--- a/kde-apps/kde4-l10n/kde4-l10n-17.04.3.ebuild
+++ b/kde-apps/kde4-l10n/kde4-l10n-17.04.3.ebuild
@@ -3,31 +3,65 @@
 
 EAPI=6
 
-KDE_AUTODEPS="false"
 KDE_HANDBOOK="optional"
 KDE_L10N=(
 	ar ast bg bs ca ca-valencia cs da de el en-GB eo es et eu fa fi fr ga gl he
 	hi hr hu ia id is it ja kk km ko lt lv mr nb nds nl nn pa pl pt pt-BR ro ru
 	sk sl sr sr-ijekavsk sr-Latn sr-Latn-ijekavsk sv tr ug uk wa zh-CN zh-TW
 )
-KMNAME="kde-l10n"
-inherit kde5
+inherit kde4-base
 
 DESCRIPTION="KDE legacy internationalization package"
+HOMEPAGE="https://l10n.kde.org"
+
+kde_l10n2lingua() {
+	local l
+	for l; do
+		case ${l} in
+			ca-valencia) echo ca@valencia;;
+			sr-ijekavsk) echo sr@ijekavian;;
+			sr-Latn-ijekavsk) echo sr@ijekavianlatin;;
+			sr-Latn) echo sr@latin;;
+			uz-Cyrl) echo uz@cyrillic;;
+			*) echo "${l/-/_}";;
+		esac
+	done
+}
+
+URI_BASE="${SRC_URI/kde4-l10n-${PV}.tar.xz/}kde-l10n/kde-l10n"
+SRC_URI=""
+for my_l10n in ${KDE_L10N[@]} ; do
+	case ${my_l10n} in
+		sr | sr-ijekavsk | sr-Latn-ijekavsk | sr-Latn)
+			SRC_URI="${SRC_URI} l10n_${my_l10n}? ( ${URI_BASE}-sr-${PV}.tar.xz )"
+			;;
+		*)
+			SRC_URI="${SRC_URI} l10n_${my_l10n}? ( ${URI_BASE}-$(kde_l10n2lingua ${my_l10n})-${PV}.tar.xz )"
+			;;
+	esac
+done
+unset URI_BASE
 
-SLOT="4"
 KEYWORDS="~amd64 ~arm ~x86"
 
 DEPEND="
-	kde-frameworks/kdelibs:4
 	sys-devel/gettext
 "
-RDEPEND=""
+RDEPEND="
+	!<kde-apps/akonadi-search-17.04.1:5
+	!<kde-apps/khelpcenter-17.04.1:5
+	!<kde-apps/kio-extras-17.04.1:5
+	!<kde-frameworks/baloo-5.34.0:5
+	!<kde-frameworks/baloo-widgets-5.34.0:5
+	!<kde-frameworks/kfilemetadata-5.34.0:5
+"
 
 REMOVE_DIRS="${FILESDIR}/${PN}-16.12.3-remove-dirs"
-REMOVE_MSGS="${FILESDIR}/${PN}-16.11.90-remove-messages"
+REMOVE_MSGS="${FILESDIR}/${P}-remove-messages"
 
-IUSE="aqua test" # TODO: Drop aqua as soon as possible
+IUSE="test $(printf 'l10n_%s ' ${KDE_L10N[@]})"
+
+S="${WORKDIR}"
 
 pkg_setup() {
 	if [[ -z ${A} ]]; then
@@ -38,11 +72,43 @@ pkg_setup() {
 		elog "${KDE_L10N[@]}"
 		elog
 	fi
-	[[ -n ${A} ]] && kde5_pkg_setup
+	[[ -n ${A} ]] && kde4-base_pkg_setup
+}
+
+src_unpack() {
+	for my_tar in ${A}; do
+		tar -xpf "${DISTDIR}/${my_tar}" --xz \
+			"${my_tar/.tar.xz/}/CMakeLists.txt" "${my_tar/.tar.xz/}/4" 2> /dev/null ||
+			elog "${my_tar}: tar extract command failed at least partially - continuing"
+	done
 }
 
 src_prepare() {
-	kde5_src_prepare
+	# move known variant subdirs to root dir, currently sr@*
+	use_if_iuse l10n_sr-ijekavsk && l10n_variant_subdir2root sr-ijekavsk sr
+	use_if_iuse l10n_sr-Latn-ijekavsk && l10n_variant_subdir2root sr-Latn-ijekavsk sr
+	use_if_iuse l10n_sr-Latn && l10n_variant_subdir2root sr-Latn sr
+	if use_if_iuse l10n_sr; then
+		rm -rf kde-l10n-sr-${PV}/4/sr/sr@* || die "Failed to cleanup L10N=sr"
+		l10n_variant_subdir_buster sr
+	elif [[ -d kde-l10n-sr-${PV} ]]; then
+		# having any variant selected means parent lingua will be unpacked as well
+		rm -r kde-l10n-sr-${PV} || die "Failed to remove sr parent lingua"
+	fi
+
+	cat <<-EOF > CMakeLists.txt || die
+	project(${PN})
+	cmake_minimum_required(VERSION 2.8.12)
+	EOF
+	# add all l10n directories to cmake
+	if [[ -n ${A} ]]; then
+		cat <<-EOF >> CMakeLists.txt || die
+		$(printf "add_subdirectory( %s )\n" \
+			`find . -mindepth 1 -maxdepth 1 -type d | sed -e "s:^\./::"`)
+		EOF
+	fi
+
+	kde4-base_src_prepare
 	[[ -n ${A} ]] || return
 
 	einfo "Removing file collisions with Plasma 5 and Applications"
@@ -98,15 +164,46 @@ src_configure() {
 	local mycmakeargs=(
 		-DBUILD_docs=$(usex handbook)
 	)
-	[[ -n ${A} ]] && kde5_src_configure
+	[[ -n ${A} ]] && kde4-base_src_configure
 }
 
 src_compile() {
-	[[ -n ${A} ]] && kde5_src_compile
+	[[ -n ${A} ]] && kde4-base_src_compile
 }
 
 src_test() { :; }
 
 src_install() {
-	[[ -n ${A} ]] && kde5_src_install
+	[[ -n ${A} ]] && kde4-base_src_install
+}
+
+l10n_variant_subdir2root() {
+	local lingua=$(kde_l10n2lingua ${1})
+	local src=kde-l10n-${2}-${PV}
+	local dest=kde-l10n-${lingua}-${PV}/4
+
+	# create variant rootdir structure from parent lingua and adapt it
+	mkdir -p ${dest} || die "Failed to create ${dest}"
+	mv ${src}/4/${2}/${lingua} ${dest}/${lingua} || die "Failed to create ${dest}/${lingua}"
+	cp -f ${src}/CMakeLists.txt kde-l10n-${lingua}-${PV} || die "Failed to prepare L10N=${1} subdir"
+	echo "add_subdirectory(${lingua})" > ${dest}/CMakeLists.txt ||
+		die "Failed to prepare ${dest}/CMakeLists.txt"
+	cp -f ${src}/4/${2}/CMakeLists.txt ${dest}/${lingua} ||
+		die "Failed to create ${dest}/${lingua}/CMakeLists.txt"
+	sed -e "s/${2}/${lingua}/" -i ${dest}/${lingua}/CMakeLists.txt ||
+		die "Failed to prepare ${dest}/${lingua}/CMakeLists.txt"
+
+	l10n_variant_subdir_buster ${1}
+}
+
+l10n_variant_subdir_buster() {
+	local dir=kde-l10n-$(kde_l10n2lingua ${1})-${PV}/4/$(kde_l10n2lingua ${1})
+
+	sed -e "/^macro.*subdirectory(/d" -i ${dir}/CMakeLists.txt || die "Failed to cleanup ${dir} subdir"
+
+	for subdir in $(find ${dir} -mindepth 1 -maxdepth 1 -type d | sed -e "s:^\./::"); do
+		if [[ ${subdir##*/} != "cmake_modules" ]] ; then
+			echo "add_subdirectory(${subdir##*/})" >> ${dir}/CMakeLists.txt || die
+		fi
+	done
 }


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-apps/kde4-l10n/files/, kde-apps/kde4-l10n/
@ 2017-07-13 20:18 Andreas Sturmlechner
  0 siblings, 0 replies; 12+ messages in thread
From: Andreas Sturmlechner @ 2017-07-13 20:18 UTC (permalink / raw
  To: gentoo-commits

commit:     df6321a2413aa20275f9675bb6a0828b43bb2b99
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 13 20:18:01 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jul 13 20:18:01 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=df6321a2

kde-apps/kde4-l10n: More conflict cleanup

Conflicting versions of kde-plasma/plasma-workspace are gone,
so just add a blocker for late upgraders.

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 kde-apps/kde4-l10n/files/kde4-l10n-17.04.3-remove-messages | 2 --
 kde-apps/kde4-l10n/kde4-l10n-17.04.3.ebuild                | 1 +
 2 files changed, 1 insertion(+), 2 deletions(-)

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
index 493415f1fb..8328a74e81 100644
--- 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
@@ -24,8 +24,6 @@ kde-runtime/drkonqi.po
 kde-runtime/kio_applications.po
 kde-runtime/phonon_kde.po
 kde-runtime/soliduiserver.po
-# fixed in: 5.8.6-r1, 5.9.5.1-r1
-kde-runtime/kio_remote.po
 
 # kde-cli-tools - fixed in: 5.10.0
 # KDE Runtime 4

diff --git a/kde-apps/kde4-l10n/kde4-l10n-17.04.3.ebuild b/kde-apps/kde4-l10n/kde4-l10n-17.04.3.ebuild
index dff133c010..6a44819890 100644
--- a/kde-apps/kde4-l10n/kde4-l10n-17.04.3.ebuild
+++ b/kde-apps/kde4-l10n/kde4-l10n-17.04.3.ebuild
@@ -54,6 +54,7 @@ RDEPEND="
 	!<kde-frameworks/baloo-5.34.0:5
 	!<kde-frameworks/baloo-widgets-5.34.0:5
 	!<kde-frameworks/kfilemetadata-5.34.0:5
+	!<kde-plasma/plasma-workspace-5.9.5.1-r1
 "
 
 REMOVE_DIRS="${FILESDIR}/${PN}-16.12.3-remove-dirs"


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-apps/kde4-l10n/files/, kde-apps/kde4-l10n/
@ 2017-08-12 15:48 Andreas Sturmlechner
  0 siblings, 0 replies; 12+ messages in thread
From: Andreas Sturmlechner @ 2017-08-12 15:48 UTC (permalink / raw
  To: gentoo-commits

commit:     d2a0014792bdc10f433bd6ae984098987f5e66ea
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 12 15:48:01 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Aug 12 15:48:01 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=d2a00147

kde-apps/kde4-l10n: Drop REMOVE_MSGS file, block old Plasma instead

Package-Manager: Portage-2.3.6, Repoman-2.3.3

 .../files/kde4-l10n-17.04.3-remove-messages        | 36 ----------------------
 kde-apps/kde4-l10n/kde4-l10n-17.08.0.ebuild        | 27 +++-------------
 2 files changed, 4 insertions(+), 59 deletions(-)

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
deleted file mode 100644
index 8328a74e81..0000000000
--- a/kde-apps/kde4-l10n/files/kde4-l10n-17.04.3-remove-messages
+++ /dev/null
@@ -1,36 +0,0 @@
-# Remove any path listed here. Comments are ignored
-# KDE SDK 4
-kdesdk/umbrello.po
-
-# plasma-desktop - fixed in: 5.10.0
-# KDELIBS 4
-kdelibs/kcm_baloofile.po
-# KDE Runtime 4
-kde-runtime/attica_kde.po
-kde-runtime/kcm_device_automounter.po
-kde-runtime/kcm_emoticons.po
-kde-runtime/kcm_phonon.po
-kde-runtime/kcmicons.po
-kde-runtime/kcmkded.po
-kde-runtime/kcmnotify.po
-kde-runtime/kcmcomponentchooser.po
-kde-runtime/knetattach.po
-
-# plasma-workspace - fixed in: 5.10.0
-# KDELIBS 4
-kdelibs/plasma_runner_baloosearchrunner.po
-# KDE Runtime 4
-kde-runtime/drkonqi.po
-kde-runtime/kio_applications.po
-kde-runtime/phonon_kde.po
-kde-runtime/soliduiserver.po
-
-# kde-cli-tools - fixed in: 5.10.0
-# KDE Runtime 4
-kde-runtime/filetypes.po
-kde-runtime/kcmshell.po
-kde-runtime/kmimetypefinder.po
-kde-runtime/kdesu.po
-kde-runtime/kioclient.po
-kde-runtime/kstart.po
-kde-runtime/ktraderclient.po

diff --git a/kde-apps/kde4-l10n/kde4-l10n-17.08.0.ebuild b/kde-apps/kde4-l10n/kde4-l10n-17.08.0.ebuild
index ac3f3b36ab..142d8847a5 100644
--- a/kde-apps/kde4-l10n/kde4-l10n-17.08.0.ebuild
+++ b/kde-apps/kde4-l10n/kde4-l10n-17.08.0.ebuild
@@ -52,14 +52,16 @@ RDEPEND="
 	!kde-apps/kde-l10n:5
 	!<kde-apps/khelpcenter-17.04.1:5
 	!<kde-apps/kio-extras-17.04.1:5
+	!<kde-apps/umbrello-17.08.0:5
 	!<kde-frameworks/baloo-5.34.0:5
 	!<kde-frameworks/baloo-widgets-5.34.0:5
 	!<kde-frameworks/kfilemetadata-5.34.0:5
-	!<kde-plasma/plasma-workspace-5.9.5.1-r1:5
+	!<kde-plasma/kde-cli-tools-5.10.0:5
+	!<kde-plasma/plasma-desktop-5.10.0:5
+	!<kde-plasma/plasma-workspace-5.10.0:5
 "
 
 REMOVE_DIRS="${FILESDIR}/${PN}-16.12.3-remove-dirs"
-REMOVE_MSGS="${FILESDIR}/${PN}-17.04.3-remove-messages"
 
 IUSE="test $(printf 'l10n_%s ' ${KDE_L10N[@]})"
 
@@ -115,7 +117,6 @@ src_prepare() {
 
 	einfo "Removing file collisions with Plasma 5 and Applications"
 	[[ -f ${REMOVE_DIRS} ]] || die "Error: ${REMOVE_DIRS} not found!"
-	[[ -f ${REMOVE_MSGS} ]] || die "Error: ${REMOVE_MSGS} not found!"
 
 	use test && einfo "Tests enabled: Listing LINGUAS causing file collisions"
 
@@ -140,26 +141,6 @@ src_prepare() {
 			einfo "F: ${path}"	# run with L10N="*" to cut down list
 		fi
 	done < <(grep -ve "^$\|^\s*\#" "${REMOVE_DIRS}")
-	einfo
-	einfo "Messages..."
-	while read path; do
-		if use test ; then	# build a report w/ L10N="*" to submit @upstream
-			local lngs
-			for lng in $(kde_l10n2lingua ${KDE_L10N[@]}); do
-				SDIR="${S}/${KMNAME}-${lng}-${PV}/4/${lng}"
-				if [[ -e "${SDIR}"/messages/${path} ]] ; then
-					lngs+=" ${lng}"
-				fi
-			done
-			[[ -n "${lngs}" ]] && einfo "${path}${lngs}"
-			unset lngs
-		fi
-		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 L10N="*" to cut down list
-		fi
-	done < <(grep -ve "^$\|^\s*\#" "${REMOVE_MSGS}")
 }
 
 src_configure() {


^ permalink raw reply related	[flat|nested] 12+ messages in thread

end of thread, other threads:[~2017-08-12 15:48 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-08-12 15:48 [gentoo-commits] proj/kde:master commit in: kde-apps/kde4-l10n/files/, kde-apps/kde4-l10n/ Andreas Sturmlechner
  -- strict thread matches above, loose matches on Subject: below --
2017-07-13 20:18 Andreas Sturmlechner
2017-07-13 20:07 Andreas Sturmlechner
2017-03-25 17:07 Andreas Sturmlechner
2017-03-25 17:07 Andreas Sturmlechner
2016-07-25 15:30 Michael Palimaka
2016-07-15  6:16 Johannes Huber
2016-07-13 18:23 Johannes Huber
2016-04-07 19:19 Michael Palimaka
2016-03-29 19:23 Alexey Shvetsov
2016-03-20 20:43 Johannes Huber
2015-08-19 22:28 Johannes Huber

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox