Introduce minimal USE flag to avoid collisions with Plasma 5.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x06B1F38DCA45A1EC!

diff --git a/kde-base/kde-l10n/ChangeLog b/kde-base/kde-l10n/ChangeLog
index e5f3185432b46cbf46e8acb7570bbf3745e40781..8dae0361ac484af3d6f8c21f8f8573a4c226770a 100644 (file)
--- a/kde-base/kde-l10n/ChangeLog
+++ b/kde-base/kde-l10n/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kde-l10n
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-l10n/ChangeLog,v 1.261 2015/02/18 16:26:47 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-l10n/ChangeLog,v 1.262 2015/04/02 19:45:11 kensington Exp $
+
+  02 Apr 2015; Michael Palimaka <kensington@gentoo.org> kde-l10n-4.14.3.ebuild:
+  Introduce minimal USE flag to avoid collisions with Plasma 5.
 
   18 Feb 2015; Michał Górny <mgorny@gentoo.org> -kde-l10n-4.12.5.ebuild:
   Remove KDE SC 4.12

diff --git a/kde-base/kde-l10n/Manifest b/kde-base/kde-l10n/Manifest
index 9b0b1fbd052c706378f9eb359ea6b7c29201fea4..0b8294ba1d36ecab5c985e11dc037aa5d7dbe96d 100644 (file)
--- a/kde-base/kde-l10n/Manifest
+++ b/kde-base/kde-l10n/Manifest
@@ -54,25 +54,24 @@ DIST kde-l10n-uk-4.14.3.tar.xz 26569304 SHA256 1d72d53781553a03aa100a4f9d730635f
 DIST kde-l10n-wa-4.14.3.tar.xz 1768108 SHA256 3b804b4dd6442066d0fe97c4a7c3d524e44949bb040ca926745fd830bc7f6785 SHA512 e76636ee9f38862b5cd42be962d5007b7b2dfa8703bf63954c1dd51daa7aaa4e59ce5e662280eaf736bda00ac09202a38cfedfcef1d342a8aaa44bd1262f2eeb WHIRLPOOL b0c5f368ed0d9297ca0311994d13879b11698db1b7718ebc7a1e9f3995eddaaf0e205a98e82315f83ba4f2a3b934f41c26935c7607792d772f914da0aaa1bb71
 DIST kde-l10n-zh_CN-4.14.3.tar.xz 3634472 SHA256 b84a9de26a9de253a1e9d7c4757af2e2957126521c32c6e76d9391d49aeaafe4 SHA512 d1fff626b4934f73c5b42f4a946941b0de47d790ab48c803f69f0d1652a3fc2c477ff50684d8362a064017508ebbeba72ffb94d3ee90b26390e85b1460fc3264 WHIRLPOOL 5b8d61dab7280c4b337bb0470c675783316a9a7cde2065e4815d1df68b427abbd30ba4f7aa43b8d1cb150d9211e2e44a0632ae3d32dd630d0b0912615a027319
 DIST kde-l10n-zh_TW-4.14.3.tar.xz 2696832 SHA256 b14e60377f096f2bdacce28ea2878385002daf3de2bb8188b6591165c7da7b11 SHA512 0cbfb97b19759c5e6553a8ec1dd37a4e3415f4d4a8e0eb4236490910d751a0a53c7d732c38069dc160690db12f599de8f3882a76f67aad919690073db2ed0718 WHIRLPOOL 860b97649fec87238854ccdbe475831b7acbab0b0cbd4877582ffc241aa46a4277f1b85f5230ac376623f20ad3b1ae95b4c4e05aea1d1837849804d71ab1ee81
-EBUILD kde-l10n-4.14.3.ebuild 2284 SHA256 dd703f084a31b6b08899b543e0ac2bc487fb6d7de42415a85343032f7f4985ee SHA512 26706d22cfb2626d95a095737d8b271d72f66aca9a7c05048013a151aa9c569cc871f72cf104a7c490850b9da18462664abacb6bc4b4af1f2bb7f1cba5770122 WHIRLPOOL ac2c77e9bfe14086e87e171a5f8fc86f34a7b126cee48c2137e030154d4cbfe4e0b1f6d78348ba693532d37b2108fffb16a0d04e94767807d3d25747bff604b1
-MISC ChangeLog 31950 SHA256 bae1cd693f1805395e5859a66b3e5a8c54fc55a0c0eb780154a97bdce9683e5a SHA512 9c11e1787ffa5a197eed455a20e9ddeff49dba8a6751cb7b1652421d2d164e07eec2fca4b892fafb309942a14568cb5a4095b27208a57e9f6529760f046c0e0b WHIRLPOOL b3b27540846a8d5ef0e4cba59121ea01a5dd75f23acd0339d29c3d4ac911256be6558538e992bf477348237dd8b0989ad0d84e9e6b41ad3209e6a25b7771b882
+EBUILD kde-l10n-4.14.3.ebuild 6426 SHA256 a3aed03be13f36ea6fe17cc82b0015d53541d8c8d18032aa31e70050d381924b SHA512 f3b9ea5b13c8da15ac4ef74cc040594b3923becf529996c3f6c6a4a75d871cdd5d22e95eb14d79b6ba6951befd919a55957a6223785c94878c2bf652e4a16fc7 WHIRLPOOL c1dba0366762bcd6c23f78df30061abec8b57c3050119ac4fd2b92b69117668ae1aa6455bc5eded1e698e6e43b9508b9ec521f7af3385f99ecbedbdc4b7e7034
+MISC ChangeLog 32099 SHA256 fcb1107b4e625171b7b9dc774d8fe2b4479f36ddef67df0ebb5825dda960ab78 SHA512 fb2189f7d30f84284241b91151f28c2b208c74f38a3cd22b716bc2d775193ae97750315fe8a205f8200cdf3dfc3957064bdb0c538b82ed488e7899a8823ed6e4 WHIRLPOOL 87a5c530e27eade2c705e998a645e79d115e8c8fae7d666292645b06ca53a05763172eb4fbbf6222515bc75f07e969d968952a7241097f8831ebc4380bcc5965
 MISC metadata.xml 156 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a SHA512 0dcd7cfb246c4518ed1653cb06f5d2c7220ea90160a4b1a1da43edf5124b76d7104fe35a545178b6b3df19f5f3a3eb3f31ac1b4d169e3ca90d78be3e20e58b05 WHIRLPOOL df162e3d521df7decdd84d980e4bc71531bb8e05486c07102c554b529c10a1fb3374dda79d56b13bc037a2d230b4b8ff25702c7a1b86d703a24e8bfe7fe57642
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJU5L1dXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOAlUQAJZgJ1Iyt0ryo2TGLEfH6Cfz
-qnaMHkPCq+CNG3nz81UkMspJciKW7Kk3Kbl+m9kKsAJ91gnWCixQgXsH0xE2Ti/T
-r8bRyYwwcjNlzTj0DENRAnma2hK0OMxOOu22/FeVhjsKiSq9EZRuDX9Ft7dmfHqv
-t8OJY6YJOxMP3ShsWiz+4PXuvY65Jyp6nR2/eQDjLJoVOejOJtK9L5KI0lixXiaX
-dZ4kJ1KkP4XmbljM3coRJ6OTSgxinUKLQ63l8TWBbDUY3My43EGgM2Fu9seKepq+
-U9yyXr8GULG1UYCV4Q5Qnd/WvfhKlQGRO2KbqMoM5KXWA6xHGyxM8ay2juXEtxlu
-te4UUNY5vmiFLMSFgezCsCaWkT/Ew+/Zf30/BzT8V6MQdGZsjPiJo6cLaBQSCDaG
-ftpTNthaciPIggNLhqGp696ZWNZqNl32XbntYAhJqWuF/wMS4cDckwN/tcOoC41T
-cpt0a9ddJGANbGqTFHvgmUGoZFF61WVs/qXkqIq/uHFTMAcZW2zSRjD1T/qmkf6b
-Z5Iegr6u+pwOU9Y+Q+AjRxY/7aEZkiwAQVSR0Okzb4YAkLXFxxV2vMrgaAc7KzPD
-T5eWyr8HurqwZx8FHae5CqJYQqK9j53NinjVczYxWNPqat1+FVxmjPKCMRXQgpw/
-DV0f66r+jntGtQuItPUL
-=ricK
+iQJiBAEBCABMBQJVHZxKRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
+MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
+7OQKEACKmEMYvYTPJSKctMe6FEdrFTevIuWnYrsL+o5pq3qqybGOrHqSdF9UhcY4
+QXxWgTyQg4wGE/y0BJ9owtSPE+PFP3y/3ELXjQyejHnAiLDAXlOUQZJU+75jdcJf
+jSMq+ayLjyYu9sHmbvJz3NKYqm0Q8yRyqkP9Q2u+uGqpBgZH2qXEMuJdXU98QZoI
+14FZE37avGonUDvKk0upfZXdxbiImbYNfWv4uJZvyFPufcfYsCfJeK5iXpDneA0B
+GaBec2EZLyGXZsAncfQi6hWxflV55qluKy9Kj1wEiaPhzlcOved98MFxW6gkY335
+e6s8ptFj7MUW0aSroXYhiq2CfNcAkQZvm6FDOaQGl7kijX36Is1052f/Lm62dWaz
+2NjMWD4xOheTTmTJjWoH+FL0D4wsdO8fczGdVUt5RS3uCFxspt8UOAfoapmn2fiU
+HsQg/w7EGeC/6r+OzZt4DVFTH7fY4RA6qWtUEjLYf5ZhxpJQrlfpdmUSRB73UINl
+uG1pBWS5ExwI6MMkQ+rrJHYhF1H/V10zj7v6/lgoeY1I4Ts3gOrDGqpQEqBb834p
+03qEFb/EzenvPwx5Nah6zUk6poCaxi+EdO5bx25VGIHL3SRXx1YvoUMNVtX/uFMB
+aBj1907t5kJ0k0SRzy4o4WUq+QybRzevtFwReRMfmAApQTNl/g==
+=VWcu
 -----END PGP SIGNATURE-----

diff --git a/kde-base/kde-l10n/kde-l10n-4.14.3.ebuild b/kde-base/kde-l10n/kde-l10n-4.14.3.ebuild
index 7411621da6848bff35cda3347ee20598ce68c88e..d1c19aded0be4bd3a7c5357879899b43341f7aa6 100644 (file)
--- a/kde-base/kde-l10n/kde-l10n-4.14.3.ebuild
+++ b/kde-base/kde-l10n/kde-l10n-4.14.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-l10n/kde-l10n-4.14.3.ebuild,v 1.5 2015/02/17 11:06:40 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-l10n/kde-l10n-4.14.3.ebuild,v 1.6 2015/04/02 19:45:11 kensington Exp $
 
 EAPI=5
 
@@ -16,7 +16,7 @@ DEPEND="
 RDEPEND="!<kde-base/konq-plugins-4.6"
 
 KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE=""
+IUSE="minimal"
 
 # /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 es et eu fa fi fr ga gl he
@@ -69,6 +69,76 @@ src_prepare() {
        # quick workaround for bug 493278
        find "${S}" -name "akonadi_knut_resource*" -delete
 
+                               # Drop translations that get installed with plasma 5 and kde apps 5 packages
+                               if use minimal; then
+
+                                       # KDE Workspace 4
+                                       rm -f "${S}"/*/messages/kde-workspace/{freespacenotifier,\
+joystick,kaccess,kcmaccess,kcm_autostart,kcmbell,kcmcolors,kcm_desktoppaths,\
+kcm_desktopthemedetails,kcmdevinfo,kcmfonts,kcm_infobase,kcminfo,\
+kcm_infosummary,kcminit,kcminput,kcmkclock,kcmkeyboard,kcmkeys,\
+kcmkwincompositing,kcmkwindecoration,kcm_kwindesktop,kcmkwinrules,\
+kcmkwinscreenedges,kcm-kwin-scripts,kcm_kwintabbox,kcmkwm,kcmlaunch,kcm_memory,\
+kcmnic,kcmopengl,kcm_pci,kcmsamba,kcmsmserver,kcm_solid_actions,\
+kcm_standard_actions,kcmstyle,kcmusb,kcmview1394,kcmworkspaceoptions,kfontinst,\
+khotkeys,kinfocenter,klipper,kmenuedit,krdb,krunner,kscreenlocker_greet,\
+kscreenlocker,ksgrd,ksmserver,ksplashthemes,ksysguardlsofwidgets,ksysguard,\
+ktouchpadenabler,kwin_clients,kwin_effects,kwin,kwin_scripting,libkdecorations,\
+libkworkspace,liboxygenstyleconfig,libpowerdevilcommonconfig,libtaskmanager,\
+plasma_applet_quicklaunch,plasma_applet_system-monitor,\
+plasma_applet_webbrowser,plasma_containmentactions_contextmenu,\
+plasma_containmentactions_switchwindow,plasma_engine_keystate,\
+plasma_engine_mpris2,plasma_engine_network,plasma_engine_notifications,\
+plasma_engine_rss,plasma_engine_share,plasma_engine_soliddevice,\
+plasma_engine_weather,plasma_runner_activities,plasma_runner_bookmarksrunner,\
+plasma_runner_calculatorrunner,plasma_runner_kill,plasma_runner_locations,\
+plasma_runner_placesrunner,plasma_runner_plasma-desktop,\
+plasma_runner_powerdevil,plasma_runner_recentdocuments,plasma_runner_services,\
+plasma_runner_sessions,plasma_runner_shell,plasma_runner_solid,\
+plasma_runner_webshortcuts,plasma_runner_windowedwidgets,plasma_runner_windows,\
+powerdevilactivitiesconfig,powerdevilglobalconfig,powerdevil,\
+powerdevilprofilesconfig,processcore,processui,systemsettings}.po
+
+                                       # KDE Runtime 4
+                                       rm -f "${S}"/*/messages/kde-runtime/{attica_kde,drkonqi,\
+filetypes,htmlsearch,kcmcomponentchooser,kcm_emoticons,kcmhtmlsearch,\
+kcmicons,kcmkded,kcmnotify,kcm_phonon,kcmshell,kdesu,kglobalaccel,\
+khelpcenter,kio_applications,kio_archive,kio_bookmarks,kioclient,\
+kio_fish,kio_info,kio_man,kio_nfs,kio_recentdocuments,kio_remote,\
+kio_sftp,kio_smb,kio_thumbnail,kmimetypefinder,knetattach,kstart,\
+ktraderclient,phonon_kde,soliduiserver}.po
+
+                                       # KDE Plasma Addons 4
+                                       rm -f "${S}"/*/messages/kdeplasma-addons/{konqprofiles,\
+konsoleprofiles,lancelot,liblancelot-datamodels,libplasma_groupingcontainment,\
+libplasmaweather,plasma_applet_binaryclock,plasma_applet_bookmarks,\
+plasma_applet_bubblemon,plasma_applet_CharSelectApplet,plasma_applet_comic,\
+plasma_applet_fifteenPuzzle,plasma_applet_fileWatcher,plasma_applet_frame,\
+plasma_applet_groupingpanel,plasma_applet_incomingmsg,\
+plasma_applet_knowledgebase,plasma_applet_kolourpicker,plasma_applet_leavenote,\
+plasma_applet_life,plasma_applet_luna,plasma_applet_magnifique,\
+plasma_applet_microblog,plasma_applet_news,plasma_applet_plasmaboard,\
+plasma_applet_previewer,plasma_applet_qalculate,plasma_applet_qstardict,\
+plasma_applet_rssnow,plasma_applet_showdashboard,plasma_applet_showdesktop,\
+plasma_applet_spellcheck,plasma_applet_unitconverter,plasma_applet_weather,\
+plasma_applet_weatherstation,plasma_applet_webslice,\
+plasma_packagestructure_comic,plasma_runner_audioplayercontrol,\
+plasma_runner_browserhistory,plasma_runner_CharacterRunner,\
+plasma_runner_contacts,plasma_runner_converterrunner,plasma_runner_datetime,\
+plasma_runner_events,plasma_runner_katesessions,\
+plasma_runner_konquerorsessions,plasma_runner_konsolesessions,\
+plasma_runner_kopete,plasma_runner_krunner_dictionary,plasma_runner_mediawiki,\
+plasma_runner_spellcheckrunner,plasma_runner_translator,plasma_runner_youtube}.po
+
+                                       # KDELIBS 4
+                                       rm -f "${S}"/*/messages/kdelibs/{akonadi_baloo_indexer,\
+baloo_file,baloo_file_extractor,baloosearch,balooshow,kcm_baloofile,kfilemetadata,\
+kio_baloosearch,kio_tags,kio_timeline,plasma_runner_baloosearchrunner}.po
+
+                                       # KDE Applications 4
+                                       rm -f "${S}"/*/messages/applications/useraccount.po
+                               fi
+
        kde4-base_src_prepare
 }