* [gentoo-commits] proj/kde:master commit in: kde-apps/kde4-l10n/
@ 2015-05-23 17:16 Michael Palimaka
0 siblings, 0 replies; 16+ messages in thread
From: Michael Palimaka @ 2015-05-23 17:16 UTC (permalink / raw
To: gentoo-commits
commit: da7b9babbe7b4d692a8e114c3fb649e6b219451f
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sat May 9 15:21:11 2015 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat May 23 17:15:51 2015 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=da7b9bab
[kde-apps/kde4-l10n] Add split KDE4-based l10n
Package-Manager: portage-2.2.18
kde-apps/kde4-l10n/kde4-l10n-15.04.1.ebuild | 195 ++++++++++++++++++++++++++++
kde-apps/kde4-l10n/metadata.xml | 5 +
2 files changed, 200 insertions(+)
diff --git a/kde-apps/kde4-l10n/kde4-l10n-15.04.1.ebuild b/kde-apps/kde4-l10n/kde4-l10n-15.04.1.ebuild
new file mode 100644
index 0000000..89f88b6
--- /dev/null
+++ b/kde-apps/kde4-l10n/kde4-l10n-15.04.1.ebuild
@@ -0,0 +1,195 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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-15.04.0-r1
+ !kde-base/kde-l10n
+ !kde-base/kdepim-l10n
+"
+
+KEYWORDS=" ~amd64 ~x86"
+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 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/}"
+SRC_URI=""
+
+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
+ # add all linguas to cmake
+ if [[ -n ${A} ]]; then
+ for LNG in ${LINGUAS}; do
+ DIR="${KMNAME}-${LNG}-${PV}"
+ 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 that get installed with plasma 5 and kde apps 5 packages
+ if use minimal; then
+
+ # kde-l10n 5
+ sed -e '/kig/ s/^/#/' -e '/step/ s/^/#/'\
+ -i "${S}"/${DIR}/4/${LNG}/docs/kdeedu/CMakeLists.txt
+ sed -e '/kruler/ s/^/#/'\
+ -i "${S}"/${DIR}/4/${LNG}/docs/kdegraphics/CMakeLists.txt
+ sed -e '/okteta/ s/^/#/' -e '/kapptemplate/ s/^/#/'\
+ -i "${S}"/${DIR}/4/${LNG}/docs/kdesdk/CMakeLists.txt
+
+ # KDE Workspace 4
+ rm -f "${S}"/${DIR}/4/${LNG}/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}"/${DIR}/4/${LNG}/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}"/${DIR}/4/${LNG}/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}"/${DIR}/4/${LNG}/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}"/${DIR}/4/${LNG}/messages/applications/useraccount.po
+
+ # Plasma 5.3
+ # kdesu, ksysguard, kio-extras, khelpcenter, systemsettings, kinfocenter, kmenuedit, plasma-desktop
+ sed -i -e '/kdesu/ s/^/#/' -e '/fundamentals/ s/^/#/'\
+ -e '/onlinehelp/ s/^/#/' -e '/khelpcenter/ s/^/#/'\
+ -e '/knetattach/ s/^/#/'\
+ "${S}"/${DIR}/4/${LNG}/docs/kde-runtime/CMakeLists.txt
+
+ sed -i -e '/ksysguard/ s/^/#/' -e '/systemsettings/ s/^/#/'\
+ -e '/kinfocenter/ s/^/#/' -e '/kmenuedit/ s/^/#/'\
+ -e '/kfontview/ s/^/#/' -e '/plasma-desktop/ s/^/#/'\
+ "${S}"/${DIR}/4/${LNG}/docs/kde-workspace/CMakeLists.txt
+
+ sed -i -e '/kcmcgi/ s/^/#/' -e '/trash/ s/^/#/' -e '/bookmarks/ s/^/#/'\
+ -e '/cookies/ s/^/#/' -e '/ebrowsing/ s/^/#/' -e '/emoticons/ s/^/#/'\
+ -e '/icons/ s/^/#/' -e '/khtml/ s/^/#/' -e '/smb/ s/^/#/'\
+ -e '/useragent/ s/^/#/'\
+ "${S}"/${DIR}/4/${LNG}/docs/kde-runtime/kcontrol/CMakeLists.txt
+
+ sed -i -e '/joystick/ s/^/#/' -e '/kcmaccess/ s/^/#/'\
+ -e '/kcmstyle/ s/^/#/' -e '/solid-actions/ s/^/#/'\
+ -e '/splashscreen/ s/^/#/' -e '/clock/ s/^/#/' -e '/colors/ s/^/#/'\
+ -e '/desktopthemedetails/ s/^/#/'\
+ "${S}"/${DIR}/4/${LNG}/docs/kde-workspace/kcontrol/CMakeLists.txt
+
+ sed -i -e '/docbook/ s/^/#/'\
+ "${S}"/${DIR}/4/${LNG}/docs/kde-workspace/klipper/CMakeLists.txt
+
+ fi
+ fi
+ done
+ fi
+}
+
+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..a23f444
--- /dev/null
+++ b/kde-apps/kde4-l10n/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>kde</herd>
+</pkgmetadata>
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-apps/kde4-l10n/
@ 2015-05-23 17:16 Michael Palimaka
0 siblings, 0 replies; 16+ messages in thread
From: Michael Palimaka @ 2015-05-23 17:16 UTC (permalink / raw
To: gentoo-commits
commit: 18f84ec9bdaf054b51bd015d8f1900246533ebfd
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sat May 16 17:07:10 2015 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat May 23 17:15:52 2015 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=18f84ec9
[kde-apps/kde4-l10n] Merge back legacy (4.14.3) messages
Package-Manager: portage-2.2.18
kde-apps/kde4-l10n/kde4-l10n-15.04.1.ebuild | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/kde-apps/kde4-l10n/kde4-l10n-15.04.1.ebuild b/kde-apps/kde4-l10n/kde4-l10n-15.04.1.ebuild
index 89f88b6..f9cca27 100644
--- a/kde-apps/kde4-l10n/kde4-l10n-15.04.1.ebuild
+++ b/kde-apps/kde4-l10n/kde4-l10n-15.04.1.ebuild
@@ -23,14 +23,25 @@ RDEPEND="
KEYWORDS=" ~amd64 ~x86"
IUSE="minimal"
+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 )"
@@ -169,6 +180,12 @@ kio_baloosearch,kio_tags,kio_timeline,plasma_runner_baloosearchrunner}.po
sed -i -e '/docbook/ s/^/#/'\
"${S}"/${DIR}/4/${LNG}/docs/kde-workspace/klipper/CMakeLists.txt
+ else
+ if [[ -d "${KMNAME}-${LNG}-${LV}" ]] ; then
+ # Merge legacy localisation
+ find "${KMNAME}-${LNG}-${LV}" -name "*.po" | while read file; \
+ do cp -rn "${file}" "${file/${LV}/${PV}/4/${LNG}}"; done
+ fi
fi
fi
done
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-apps/kde4-l10n/
@ 2015-05-27 12:07 Michael Palimaka
0 siblings, 0 replies; 16+ messages in thread
From: Michael Palimaka @ 2015-05-27 12:07 UTC (permalink / raw
To: gentoo-commits
commit: d6beae6e7da83ab630a6588f8a756a1735a27701
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Mon May 25 17:25:49 2015 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed May 27 12:07:04 2015 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=d6beae6e
[kde-apps/kde4-l10n] Improve legacy messages handling
Package-Manager: portage-2.2.18
kde-apps/kde4-l10n/kde4-l10n-15.04.1.ebuild | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/kde-apps/kde4-l10n/kde4-l10n-15.04.1.ebuild b/kde-apps/kde4-l10n/kde4-l10n-15.04.1.ebuild
index 9833f20..8f5a8c4 100644
--- a/kde-apps/kde4-l10n/kde4-l10n-15.04.1.ebuild
+++ b/kde-apps/kde4-l10n/kde4-l10n-15.04.1.ebuild
@@ -82,6 +82,9 @@ src_prepare() {
# Drop translations that get installed with plasma 5 and kde apps 5 packages
if use minimal; then
einfo "Removing paths from ${LNG}"
+ if [[ -d "${KMNAME}-${LNG}-${LV}" ]] ; then
+ rm -rf "${KMNAME}-${LNG}-${LV}"
+ fi
# Remove dirs
while read path; do
@@ -99,8 +102,10 @@ src_prepare() {
else
if [[ -d "${KMNAME}-${LNG}-${LV}" ]] ; then
# Merge legacy localisation
- find "${KMNAME}-${LNG}-${LV}" -name "*.po" | while read file; \
- do cp -rn "${file}" "${file/${LV}/${PV}/4/${LNG}}"; done
+ for path in $(find "${KMNAME}-${LNG}-${LV}" -name "*.po"); do
+ cp -rn "${path}" "${path/${LV}/${PV}/4/${LNG}}" || die
+ done
+ rm -rf "${KMNAME}-${LNG}-${LV}"
fi
fi
fi
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-apps/kde4-l10n/
@ 2015-05-31 19:09 Manuel Rüger
0 siblings, 0 replies; 16+ messages in thread
From: Manuel Rüger @ 2015-05-31 19:09 UTC (permalink / raw
To: gentoo-commits
commit: 3ea557bbb5e6265890555def7273206f9f55fc19
Author: Manuel Rüger <mrueg <AT> gentoo <DOT> org>
AuthorDate: Sun May 31 19:07:51 2015 +0000
Commit: Manuel Rüger <mrueg <AT> gentoo <DOT> org>
CommitDate: Sun May 31 19:07:51 2015 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=3ea557bb
[kde-apps/kde4-l10n] Version bump
Package-Manager: portage-2.2.20
kde-apps/kde4-l10n/kde4-l10n-15.04.2.ebuild | 133 ++++++++++++++++++++++++++++
1 file changed, 133 insertions(+)
diff --git a/kde-apps/kde4-l10n/kde4-l10n-15.04.2.ebuild b/kde-apps/kde4-l10n/kde4-l10n-15.04.2.ebuild
new file mode 100644
index 0000000..8f5a8c4
--- /dev/null
+++ b/kde-apps/kde4-l10n/kde4-l10n-15.04.2.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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-15.04.0-r1
+ !kde-base/kde-l10n
+ !kde-base/kdepim-l10n
+"
+
+KEYWORDS=" ~amd64 ~x86"
+IUSE="minimal"
+
+REMOVE_DIRS="${FILESDIR}/${PN}-15.04.1-remove-dirs"
+REMOVE_MSGS="${FILESDIR}/${PN}-15.04.1-remove-messages"
+
+LV="4.14.3"
+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
+ # add all linguas to cmake
+ if [[ -n ${A} ]]; then
+ for LNG in ${LINGUAS}; do
+ DIR="${KMNAME}-${LNG}-${PV}"
+ 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 that get installed with plasma 5 and kde apps 5 packages
+ if use minimal; then
+ einfo "Removing paths from ${LNG}"
+ if [[ -d "${KMNAME}-${LNG}-${LV}" ]] ; then
+ rm -rf "${KMNAME}-${LNG}-${LV}"
+ fi
+
+ # Remove dirs
+ while read path; do
+ if [[ -e "${S}"/${DIR}/4/${LNG}/${path%\ *}/CMakeLists.txt ]] ; then
+ sed -e "/${path#*\ }/ s/^/#/"\
+ -i "${S}"/${DIR}/4/${LNG}/${path%\ *}/CMakeLists.txt
+ fi
+ done < <(grep -v "^#" "${REMOVE_DIRS}")
+
+ # Remove messages
+ for path in $(grep -v "^#" "${REMOVE_MSGS}") ; do
+ rm -f "${S}"/${DIR}/4/${LNG}/messages/${path}
+ done
+
+ else
+ if [[ -d "${KMNAME}-${LNG}-${LV}" ]] ; then
+ # Merge legacy localisation
+ for path in $(find "${KMNAME}-${LNG}-${LV}" -name "*.po"); do
+ cp -rn "${path}" "${path/${LV}/${PV}/4/${LNG}}" || die
+ done
+ rm -rf "${KMNAME}-${LNG}-${LV}"
+ fi
+ fi
+ fi
+ done
+ fi
+}
+
+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
+}
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-apps/kde4-l10n/
@ 2015-06-14 15:24 Michael Palimaka
0 siblings, 0 replies; 16+ messages in thread
From: Michael Palimaka @ 2015-06-14 15:24 UTC (permalink / raw
To: gentoo-commits
commit: f639873d6fbf5f4b744b94c840db5b572029c9c7
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 12 19:09:56 2015 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Jun 14 15:24:37 2015 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=f639873d
[kde-apps/kde4-l10n] Remove old blocker.
Package-Manager: portage-2.2.20
kde-apps/kde4-l10n/kde4-l10n-15.04.2.ebuild | 1 -
1 file changed, 1 deletion(-)
diff --git a/kde-apps/kde4-l10n/kde4-l10n-15.04.2.ebuild b/kde-apps/kde4-l10n/kde4-l10n-15.04.2.ebuild
index 8f5a8c4..5859dad 100644
--- a/kde-apps/kde4-l10n/kde4-l10n-15.04.2.ebuild
+++ b/kde-apps/kde4-l10n/kde4-l10n-15.04.2.ebuild
@@ -16,7 +16,6 @@ DEPEND="
"
RDEPEND="
!<kde-apps/kde-l10n-15.04.0-r1
- !kde-base/kde-l10n
!kde-base/kdepim-l10n
"
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-apps/kde4-l10n/
@ 2015-06-27 13:53 Manuel Rüger
0 siblings, 0 replies; 16+ messages in thread
From: Manuel Rüger @ 2015-06-27 13:53 UTC (permalink / raw
To: gentoo-commits
commit: fece60707dd706ed6191622eb822752e6617bb65
Author: Manuel Rüger <mrueg <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 27 13:52:45 2015 +0000
Commit: Manuel Rüger <mrueg <AT> gentoo <DOT> org>
CommitDate: Sat Jun 27 13:52:45 2015 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=fece6070
[kde-apps/kde4-l10n] Version bump.
Package-Manager: portage-2.2.20
kde-apps/kde4-l10n/kde4-l10n-15.04.3.ebuild | 132 ++++++++++++++++++++++++++++
1 file changed, 132 insertions(+)
diff --git a/kde-apps/kde4-l10n/kde4-l10n-15.04.3.ebuild b/kde-apps/kde4-l10n/kde4-l10n-15.04.3.ebuild
new file mode 100644
index 0000000..5859dad
--- /dev/null
+++ b/kde-apps/kde4-l10n/kde4-l10n-15.04.3.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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-15.04.0-r1
+ !kde-base/kdepim-l10n
+"
+
+KEYWORDS=" ~amd64 ~x86"
+IUSE="minimal"
+
+REMOVE_DIRS="${FILESDIR}/${PN}-15.04.1-remove-dirs"
+REMOVE_MSGS="${FILESDIR}/${PN}-15.04.1-remove-messages"
+
+LV="4.14.3"
+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
+ # add all linguas to cmake
+ if [[ -n ${A} ]]; then
+ for LNG in ${LINGUAS}; do
+ DIR="${KMNAME}-${LNG}-${PV}"
+ 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 that get installed with plasma 5 and kde apps 5 packages
+ if use minimal; then
+ einfo "Removing paths from ${LNG}"
+ if [[ -d "${KMNAME}-${LNG}-${LV}" ]] ; then
+ rm -rf "${KMNAME}-${LNG}-${LV}"
+ fi
+
+ # Remove dirs
+ while read path; do
+ if [[ -e "${S}"/${DIR}/4/${LNG}/${path%\ *}/CMakeLists.txt ]] ; then
+ sed -e "/${path#*\ }/ s/^/#/"\
+ -i "${S}"/${DIR}/4/${LNG}/${path%\ *}/CMakeLists.txt
+ fi
+ done < <(grep -v "^#" "${REMOVE_DIRS}")
+
+ # Remove messages
+ for path in $(grep -v "^#" "${REMOVE_MSGS}") ; do
+ rm -f "${S}"/${DIR}/4/${LNG}/messages/${path}
+ done
+
+ else
+ if [[ -d "${KMNAME}-${LNG}-${LV}" ]] ; then
+ # Merge legacy localisation
+ for path in $(find "${KMNAME}-${LNG}-${LV}" -name "*.po"); do
+ cp -rn "${path}" "${path/${LV}/${PV}/4/${LNG}}" || die
+ done
+ rm -rf "${KMNAME}-${LNG}-${LV}"
+ fi
+ fi
+ fi
+ done
+ fi
+}
+
+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
+}
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-apps/kde4-l10n/
@ 2015-08-08 12:28 Johannes Huber
0 siblings, 0 replies; 16+ messages in thread
From: Johannes Huber @ 2015-08-08 12:28 UTC (permalink / raw
To: gentoo-commits
commit: dc4ab1943276e565efa982c72e7a13b670640dcc
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Fri Aug 7 21:24:34 2015 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat Aug 8 12:30:22 2015 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=dc4ab194
[kde-apps/kde4-l10n] Always block older kde-l10n
Package-Manager: portage-2.2.20
kde-apps/kde4-l10n/kde4-l10n-15.07.90.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kde-apps/kde4-l10n/kde4-l10n-15.07.90.ebuild b/kde-apps/kde4-l10n/kde4-l10n-15.07.90.ebuild
index 13ac170..b530b68 100644
--- a/kde-apps/kde4-l10n/kde4-l10n-15.07.90.ebuild
+++ b/kde-apps/kde4-l10n/kde4-l10n-15.07.90.ebuild
@@ -15,7 +15,7 @@ DEPEND="
sys-devel/gettext
"
RDEPEND="
- !<kde-apps/kde-l10n-15.04.0-r1
+ !<kde-apps/kde-l10n-${PV}
!kde-base/kdepim-l10n
"
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-apps/kde4-l10n/
@ 2015-08-25 21:35 Johannes Huber
0 siblings, 0 replies; 16+ messages in thread
From: Johannes Huber @ 2015-08-25 21:35 UTC (permalink / raw
To: gentoo-commits
commit: 0990d790fa1278b32013ce928134062b0824d7ae
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Tue Aug 25 17:51:30 2015 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Tue Aug 25 21:35:25 2015 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=0990d790
kde-apps/kde4-l10n: Fix USE=-minimal
Package-Manager: portage-2.2.20.1
Signed-off-by: Johannes Huber <johu <AT> gentoo.org>
kde-apps/kde4-l10n/kde4-l10n-15.08.0.ebuild | 22 +++++++++++++++-------
1 file changed, 15 insertions(+), 7 deletions(-)
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 dfb39da..4daf8c6 100644
--- a/kde-apps/kde4-l10n/kde4-l10n-15.08.0.ebuild
+++ b/kde-apps/kde4-l10n/kde4-l10n-15.08.0.ebuild
@@ -67,18 +67,19 @@ src_unpack() {
}
src_prepare() {
- local LNG DIR
+ local LNG DIR SDIR
# add all linguas to cmake
if [[ -n ${A} ]]; then
for LNG in ${LINGUAS}; do
DIR="${KMNAME}-${LNG}-${PV}"
+ 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 that get installed with plasma 5 and kde apps 5 packages
+ # Drop translations installed with plasma 5 and kde-apps 5 packages
if use minimal; then
einfo "Removing paths from ${LNG}"
if [[ -d "${KMNAME}-${LNG}-${LV}" ]] ; then
@@ -87,23 +88,30 @@ src_prepare() {
# Remove dirs
while read path; do
- if [[ -e "${S}"/${DIR}/4/${LNG}/${path%\ *}/CMakeLists.txt ]] ; then
+ if [[ -e "${SDIR}"/${path%\ *}/CMakeLists.txt ]] ; then
sed -e "/${path#*\ }/ s/^/#/"\
- -i "${S}"/${DIR}/4/${LNG}/${path%\ *}/CMakeLists.txt
+ -i "${SDIR}"/${path%\ *}/CMakeLists.txt
fi
done < <(grep -v "^#" "${REMOVE_DIRS}")
# Remove messages
for path in $(grep -v "^#" "${REMOVE_MSGS}") ; do
- rm -f "${S}"/${DIR}/4/${LNG}/messages/${path}
+ rm -f "${SDIR}"/messages/${path}
# Quirk for LINGUAS=sr variants
if [[ ${LNG} = "sr" ]] ; then
- rm -f "${S}"/${DIR}/4/${LNG}/${LNG}\@*/messages/${path} || die
+ rm -f "${SDIR}"/${LNG}\@*/messages/${path} || die
fi
done
-
else
if [[ -d "${KMNAME}-${LNG}-${LV}" ]] ; then
+ # Create missing kdepim directories
+ local subdirs="kdepim kdepimlibs kdepim-runtime"
+ for path in ${subdirs}; do
+ mkdir -p "${SDIR}"/messages/${path} || die
+ echo "add_subdirectory(${path})" >> \
+ "${SDIR}"/messages/CMakeLists.txt
+ done
+ unset subdirs
# Merge legacy localisation
for path in $(find "${KMNAME}-${LNG}-${LV}" -name "*.po"); do
cp -rn "${path}" "${path/${LV}/${PV}/4/${LNG}}" || die
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-apps/kde4-l10n/
@ 2015-09-19 14:05 Manuel Rüger
0 siblings, 0 replies; 16+ messages in thread
From: Manuel Rüger @ 2015-09-19 14:05 UTC (permalink / raw
To: gentoo-commits
commit: 07a7c23b7d497d5e0566570fc655063140774b40
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Wed Sep 16 18:47:58 2015 +0000
Commit: Manuel Rüger <mrueg <AT> gentoo <DOT> org>
CommitDate: Sat Sep 19 14:05:25 2015 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=07a7c23b
kde-apps/kde4-l10n: Finally fix USE=-minimal
Be more verbose about what is being copied or removed.
Merge everything from LEGACY_LANGS, not just messages.
Take care of nonexistent directories in destination paths.
Fixes https://bugs.gentoo.org/show_bug.cgi?id=560336
Package-Manager: portage-2.2.20.1
kde-apps/kde4-l10n/kde4-l10n-15.08.1.ebuild | 44 ++++++++++++++++++++---------
1 file changed, 30 insertions(+), 14 deletions(-)
diff --git a/kde-apps/kde4-l10n/kde4-l10n-15.08.1.ebuild b/kde-apps/kde4-l10n/kde4-l10n-15.08.1.ebuild
index ef80763..49d9885 100644
--- a/kde-apps/kde4-l10n/kde4-l10n-15.08.1.ebuild
+++ b/kde-apps/kde4-l10n/kde4-l10n-15.08.1.ebuild
@@ -66,11 +66,12 @@ src_unpack() {
}
src_prepare() {
- local LNG DIR SDIR
+ 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
@@ -80,12 +81,12 @@ src_prepare() {
# Drop translations installed with plasma 5 and kde-apps 5 packages
if use minimal; then
- einfo "Removing paths from ${LNG}"
- if [[ -d "${KMNAME}-${LNG}-${LV}" ]] ; then
- rm -rf "${KMNAME}-${LNG}-${LV}"
+ einfo "${LNG}: Removing file conflicts"
+ if [[ -d "${LDIR}" ]] ; then
+ rm -rf "${LDIR}"
fi
- # Remove dirs
+ einfo " directories..."
while read path; do
if [[ -n ${path} && -e "${SDIR}"/${path%\ *}/CMakeLists.txt ]] ; then
sed -e ":${path#*\ }: s:^:#:"\
@@ -93,7 +94,7 @@ src_prepare() {
fi
done < <(grep -v "^#" "${REMOVE_DIRS}")
- # Remove messages
+ einfo " messages..."
for path in $(grep -v "^#" "${REMOVE_MSGS}") ; do
rm -f "${SDIR}"/messages/${path}
# Quirk for LINGUAS=sr variants
@@ -102,16 +103,31 @@ src_prepare() {
fi
done
else
- if [[ -d "${KMNAME}-${LNG}-${LV}" ]] ; then
- # Do not try to copy kdepim localisation
- for path in kdepim kdepimlibs kdepim-runtime; do
- rm -rf "${KMNAME}-${LNG}-${LV}/messages/${path}" || die
+ 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
- # Merge legacy localisation
- for path in $(find "${KMNAME}-${LNG}-${LV}" -name "*.po"); do
- cp -rn "${path}" "${path/${LV}/${PV}/4/${LNG}}" || die
+ 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
- rm -rf "${KMNAME}-${LNG}-${LV}"
+ # 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
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-apps/kde4-l10n/
@ 2015-12-06 15:22 Alexey Shvetsov
0 siblings, 0 replies; 16+ messages in thread
From: Alexey Shvetsov @ 2015-12-06 15:22 UTC (permalink / raw
To: gentoo-commits
commit: 208c917ea7c81104dbd562b0d4bda3a87bbbb550
Author: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 6 15:19:42 2015 +0000
Commit: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Sun Dec 6 15:19:42 2015 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=208c917e
kde-apps/kde4-l10n: Add version for 15.11.90
Package-Manager: portage-2.2.26
kde-apps/kde4-l10n/kde4-l10n-15.11.90.ebuild | 157 +++++++++++++++++++++++++++
1 file changed, 157 insertions(+)
diff --git a/kde-apps/kde4-l10n/kde4-l10n-15.11.90.ebuild b/kde-apps/kde4-l10n/kde4-l10n-15.11.90.ebuild
new file mode 100644
index 0000000..45b6354
--- /dev/null
+++ b/kde-apps/kde4-l10n/kde4-l10n-15.11.90.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2015 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.07.90-remove-dirs"
+REMOVE_MSGS="${FILESDIR}/${PN}-15.08.3-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
+}
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-apps/kde4-l10n/
@ 2016-04-09 15:12 Michael Palimaka
0 siblings, 0 replies; 16+ messages in thread
From: Michael Palimaka @ 2016-04-09 15:12 UTC (permalink / raw
To: gentoo-commits
commit: 931d6a9e8afd45422069cac3fdba223a455831db
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sat Apr 9 14:53:37 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Apr 9 15:12:06 2016 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=931d6a9e
kde-apps/kde4-l10n: Add USE=test to provide more verbosity
The resulting list of LINGUAS that are still conflicting can be forwarded
to upstream in order to cut down on it.
Package-Manager: portage-2.2.27
kde-apps/kde4-l10n/kde4-l10n-16.03.90.ebuild | 43 ++++++++++++++++++++++------
1 file changed, 34 insertions(+), 9 deletions(-)
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 79fa0b3..32c7f80 100644
--- a/kde-apps/kde4-l10n/kde4-l10n-16.03.90.ebuild
+++ b/kde-apps/kde4-l10n/kde4-l10n-16.03.90.ebuild
@@ -33,7 +33,7 @@ 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"
-IUSE="minimal $(printf 'linguas_%s ' ${MY_LANGS})"
+IUSE="minimal test $(printf 'linguas_%s ' ${MY_LANGS})"
URI_BASE="${SRC_URI/-${PV}.tar.xz/}"
LURI_BASE="mirror://kde/stable/${LV}/src/${KMNAME}"
@@ -90,23 +90,50 @@ EOF
if use minimal; then
einfo "Removing file collisions with Plasma 5 and Applications"
+ use test && einfo "Tests enabled: Listing LINGUAS causing file collisions"
- einfo " directories..."
+ einfo "Directories..."
while read path; do
+ if use test ; then # build a report w/ LINGUAS="*" to submit @upstream
+ local lngs
+ for lng in ${LINGUAS}; do
+ SDIR="${S}/${KMNAME}-${lng}-${PV}/4/${lng}"
+ if [[ -d "${SDIR}" ]] ; then
+ if [[ -d "${SDIR}"/${path%\ *}/${path#*\ } ]] ; then
+ lngs+=" ${lng}"
+ fi
+ fi
+ done
+ [[ -n ${lngs} ]] && einfo "${path%\ *}/${path#*\ }${lngs}"
+ unset lngs
+ fi
if ls -U ./*/4/*/${path%\ *}/${path#*\ } > /dev/null 2>&1; then
sed -i -e ":${path#*\ }: s:^:#:" ./*/4/*/${path%\ *}/CMakeLists.txt || \
die "Failed to comment out ${path}"
else
- einfo " F: ${path}" # run with LINGUAS="*" to cut down list
+ einfo "F: ${path}" # run with LINGUAS="*" to cut down list
fi
done < <(grep -ve "^$\|^\s*\#" "${REMOVE_DIRS}")
-
- einfo " messages..."
+ einfo
+ einfo "Messages..."
while read path; do
+ if use test ; then # build a report w/ LINGUAS="*" to submit @upstream
+ local lngs
+ for lng in ${LINGUAS}; do
+ SDIR="${S}/${KMNAME}-${lng}-${PV}/4/${lng}"
+ if [[ -d "${SDIR}" ]] ; then
+ if [[ -e "${SDIR}"/messages/${path} ]] ; then
+ lngs+=" ${lng}"
+ fi
+ 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 LINGUAS="*" to cut down list
+ einfo "F: ${path}" # run with LINGUAS="*" to cut down list
fi
done < <(grep -ve "^$\|^\s*\#" "${REMOVE_MSGS}")
else
@@ -154,9 +181,7 @@ src_compile() {
[[ -n ${A} ]] && kde4-base_src_compile
}
-src_test() {
- [[ -n ${A} ]] && kde4-base_src_test
-}
+src_test() { :; }
src_install() {
[[ -n ${A} ]] && kde4-base_src_install
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-apps/kde4-l10n/
@ 2016-05-18 13:25 Johannes Huber
0 siblings, 0 replies; 16+ messages in thread
From: Johannes Huber @ 2016-05-18 13:25 UTC (permalink / raw
To: gentoo-commits
commit: 3d30bedc41bf005aa758a7c77e8f69d96fed432e
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sun May 15 08:20:09 2016 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed May 18 13:25:27 2016 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=3d30bedc
kde-apps/kde4-l10n: Turn blocker into dependency, set minimal by default
It is not unreasonable to think of kde4-l10n[minimal] as incomplete
without having kde-l10n installed. At the same time this helps portage
figure out the dependency instead of showing a conflict.
Eases use of non-plasma profiles.
This drops keywords: ~arm ~ppc ~ppc64 ~x86-fbsd ~amd64-linux ~x86-linux
Package-Manager: portage-2.2.28
Signed-off-by: Johannes Huber <johu <AT> gentoo.org>
kde-apps/kde4-l10n/kde4-l10n-16.04.1.ebuild | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/kde-apps/kde4-l10n/kde4-l10n-16.04.1.ebuild b/kde-apps/kde4-l10n/kde4-l10n-16.04.1.ebuild
index 65c9eef..71998b3 100644
--- a/kde-apps/kde4-l10n/kde4-l10n-16.04.1.ebuild
+++ b/kde-apps/kde4-l10n/kde4-l10n-16.04.1.ebuild
@@ -11,13 +11,14 @@ inherit kde4-base
DESCRIPTION="KDE internationalization package"
HOMEPAGE="http://l10n.kde.org"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
DEPEND="
sys-devel/gettext
"
RDEPEND="
- !<kde-apps/kde-l10n-${PV}
+ !minimal? ( !kde-apps/kde-l10n )
+ minimal? ( >=kde-apps/kde-l10n-${PV} )
"
REMOVE_DIRS="${FILESDIR}/${PN}-16.03.91-remove-dirs"
@@ -33,7 +34,7 @@ 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"
-IUSE="minimal test $(printf 'linguas_%s ' ${MY_LANGS})"
+IUSE="+minimal test $(printf 'linguas_%s ' ${MY_LANGS})"
URI_BASE="${SRC_URI/-${PV}.tar.xz/}"
LURI_BASE="mirror://kde/stable/${LV}/src/${KMNAME}"
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-apps/kde4-l10n/
@ 2016-07-08 17:29 Michael Palimaka
0 siblings, 0 replies; 16+ messages in thread
From: Michael Palimaka @ 2016-07-08 17:29 UTC (permalink / raw
To: gentoo-commits
commit: 539a80042ba35bc8f79f7434a261ad987404795e
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Thu Jul 7 20:43:33 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Jul 8 17:29:34 2016 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=539a8004
kde-apps/kde4-l10n: Make USE=minimal a no-op
Package-Manager: portage-2.2.28
kde-apps/kde4-l10n/kde4-l10n-16.04.3.ebuild | 140 ++++++++++------------------
1 file changed, 48 insertions(+), 92 deletions(-)
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 29ff762..57b27d6 100644
--- a/kde-apps/kde4-l10n/kde4-l10n-16.04.3.ebuild
+++ b/kde-apps/kde4-l10n/kde4-l10n-16.04.3.ebuild
@@ -17,33 +17,24 @@ DEPEND="
sys-devel/gettext
"
RDEPEND="
- !minimal? ( !kde-apps/kde-l10n )
- minimal? ( >=kde-apps/kde-l10n-${PV} )
+ >=kde-apps/kde-l10n-${PV}
"
REMOVE_DIRS="${FILESDIR}/${PN}-16.04.1-remove-dirs"
REMOVE_MSGS="${FILESDIR}/${PN}-16.03.91-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 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"
+# 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//[@_]/-})"
URI_BASE="${SRC_URI/-${PV}.tar.xz/}"
LURI_BASE="mirror://kde/stable/${LV}/src/${KMNAME}"
SRC_URI=""
-for MY_LANG in ${LEGACY_LANGS} ; do
- SRC_URI="${SRC_URI} l10n_${MY_LANG/[@_]/-}? ( ${LURI_BASE}/${KMNAME}-${MY_LANG}-${LV}.tar.xz )"
-done
-
for MY_LANG in ${MY_LANGS} ; do
SRC_URI="${SRC_URI} l10n_${MY_LANG/[@_]/-}? ( ${URI_BASE}/${KMNAME}-${MY_LANG}-${PV}.tar.xz )"
done
@@ -64,10 +55,8 @@ pkg_setup() {
src_unpack() {
for my_tar in ${A}; do
- [[ ${my_tar} = *${PV}* ]] && local subdir="/4"
- use minimal && [[ ${my_tar} = *${LV}* ]] && continue
tar -xpf "${DISTDIR}/${my_tar}" --xz \
- "${my_tar/.tar.xz/}/CMakeLists.txt" "${my_tar/.tar.xz/}${subdir}" 2> /dev/null ||
+ "${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
}
@@ -77,7 +66,7 @@ src_prepare() {
[[ -n ${A} ]] || return
# L10N=sr variants are subdirs within sr/ ...
- if use minimal && [[ -d "${KMNAME}-sr-${PV}" ]] ; then
+ 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"
@@ -107,83 +96,50 @@ EOF
find -maxdepth 2 -type f -name CMakeLists.txt -exec \
sed -i -e "/add_subdirectory(5)/ s/^/#DONT/" {} + || die
- if use minimal; then
- einfo "Removing file collisions with Plasma 5 and Applications"
- 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
- 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 ${MY_LANGS}; 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}")
- else
- local LNG LDIR
- for LNG in ${LEGACY_LANGS}; do
- LDIR="${KMNAME}-${LNG}-${LV}"
- if [[ -d "${KMNAME}-${LNG}-${PV}" && -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 "${S}/${KMNAME}-${LNG}-${PV}/4/${LNG}" -name CMakeLists.txt -type f -exec \
- sed -i -e "s:^ *add_subdirectory( *${path} *):# no ${path}:g" {} +
- done
- rm -rf "${LDIR}"
- fi
- done
- fi
+ einfo "Removing file collisions with Plasma 5 and Applications"
+ 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
+ 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 ${MY_LANGS}; 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] 16+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-apps/kde4-l10n/
@ 2016-07-13 18:23 Johannes Huber
0 siblings, 0 replies; 16+ messages in thread
From: Johannes Huber @ 2016-07-13 18:23 UTC (permalink / raw
To: gentoo-commits
commit: e7c3bc790dcb09424131f830d1bb2302f8c9c7c5
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sun Jul 10 18:08:19 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=e7c3bc79
kde-apps/kde4-l10n: Switch to kde5.eclass to remove a lot of code
This adds 3 new sr variants to L10N.
Still needs IUSE=aqua to avoid blocker
Package-Manager: portage-2.2.28
Signed-off-by: Johannes Huber <johu <AT> gentoo.org>
kde-apps/kde4-l10n/kde4-l10n-16.04.3.ebuild | 123 ++++------------------------
1 file changed, 16 insertions(+), 107 deletions(-)
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 4e5b493..3e41dcc 100644
--- a/kde-apps/kde4-l10n/kde4-l10n-16.04.3.ebuild
+++ b/kde-apps/kde4-l10n/kde4-l10n-16.04.3.ebuild
@@ -4,16 +4,23 @@
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 kde4-base
+inherit kde5
DESCRIPTION="KDE legacy internationalization package"
-HOMEPAGE="http://l10n.kde.org"
+SLOT="4"
KEYWORDS="~amd64 ~arm ~x86"
DEPEND="
+ kde-base/kdelibs:4
sys-devel/gettext
"
RDEPEND="
@@ -23,46 +30,8 @@ RDEPEND="
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' ' '
-# 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 ' ${KDE_L10N[@]})"
-
-URI_BASE="${SRC_URI/-${PV}.tar.xz/}"
-SRC_URI=""
-
-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}"
+IUSE="aqua +minimal test" # TODO: Drop aqua as soon as possible
pkg_setup() {
if [[ -z ${A} ]]; then
@@ -73,44 +42,13 @@ pkg_setup() {
elog "${KDE_L10N[@]}"
elog
fi
- [[ -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
+ [[ -n ${A} ]] && kde5_pkg_setup
}
src_prepare() {
- default
+ kde5_src_prepare
[[ -n ${A} ]] || return
- # 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
- cat <<-EOF > CMakeLists.txt || die
-project(kde4-l10n)
-cmake_minimum_required(VERSION 2.8.12)
-$(printf "add_subdirectory( %s )\n" `find . -mindepth 1 -maxdepth 1 -type d -name "*${PV}*"`)
-EOF
-
- # Drop KF5-based part
- find -maxdepth 2 -type f -name CMakeLists.txt -exec \
- 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!"
@@ -161,47 +99,18 @@ EOF
}
src_configure() {
- mycmakeargs=(
+ local mycmakeargs=(
-DBUILD_docs=$(usex handbook)
)
- [[ -n ${A} ]] && kde4-base_src_configure
+ [[ -n ${A} ]] && kde5_src_configure
}
src_compile() {
- [[ -n ${A} ]] && kde4-base_src_compile
+ [[ -n ${A} ]] && kde5_src_compile
}
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
+ [[ -n ${A} ]] && kde5_src_install
}
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-apps/kde4-l10n/
@ 2016-07-23 12:03 Johannes Huber
0 siblings, 0 replies; 16+ messages in thread
From: Johannes Huber @ 2016-07-23 12:03 UTC (permalink / raw
To: gentoo-commits
commit: 62fc1ab83ee06aed75198064489113b53c991ca6
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 23 12:01:58 2016 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat Jul 23 12:01:58 2016 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=62fc1ab8
kde-apps/kde4-l10n: Drop noop minimal use flag
Package-Manager: portage-2.3.0
kde-apps/kde4-l10n/kde4-l10n-16.07.80.ebuild | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
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 3e41dcc..4f21894 100644
--- a/kde-apps/kde4-l10n/kde4-l10n-16.07.80.ebuild
+++ b/kde-apps/kde4-l10n/kde4-l10n-16.07.80.ebuild
@@ -30,8 +30,7 @@ RDEPEND="
REMOVE_DIRS="${FILESDIR}/${PN}-16.04.2-remove-dirs"
REMOVE_MSGS="${FILESDIR}/${PN}-16.03.91-remove-messages"
-# TODO: Drop no-op +minimal in 16.08.x - necessary kde5.eclass change happened after KF-5.23/Plasma-5.6.5
-IUSE="aqua +minimal test" # TODO: Drop aqua as soon as possible
+IUSE="aqua test" # TODO: Drop aqua as soon as possible
pkg_setup() {
if [[ -z ${A} ]]; then
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-apps/kde4-l10n/
@ 2017-07-25 16:55 Andreas Sturmlechner
0 siblings, 0 replies; 16+ messages in thread
From: Andreas Sturmlechner @ 2017-07-25 16:55 UTC (permalink / raw
To: gentoo-commits
commit: afa81b64c3bdffa8b0e184611ba06d428ebb0aee
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 25 16:55:07 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jul 25 16:55:07 2017 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=afa81b64
kde-apps/kde4-l10n: Re-add missing blocker
It was lost during kde5 -> kde4-base.eclass migration.
Package-Manager: Portage-2.3.6, Repoman-2.3.1
kde-apps/kde4-l10n/kde4-l10n-17.07.80.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/kde-apps/kde4-l10n/kde4-l10n-17.07.80.ebuild b/kde-apps/kde4-l10n/kde4-l10n-17.07.80.ebuild
index ecd927013b..ac3f3b36ab 100644
--- a/kde-apps/kde4-l10n/kde4-l10n-17.07.80.ebuild
+++ b/kde-apps/kde4-l10n/kde4-l10n-17.07.80.ebuild
@@ -49,6 +49,7 @@ DEPEND="
"
RDEPEND="
!<kde-apps/akonadi-search-17.04.1:5
+ !kde-apps/kde-l10n:5
!<kde-apps/khelpcenter-17.04.1:5
!<kde-apps/kio-extras-17.04.1:5
!<kde-frameworks/baloo-5.34.0:5
^ permalink raw reply related [flat|nested] 16+ messages in thread
end of thread, other threads:[~2017-07-25 16:55 UTC | newest]
Thread overview: 16+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-07-23 12:03 [gentoo-commits] proj/kde:master commit in: kde-apps/kde4-l10n/ Johannes Huber
-- strict thread matches above, loose matches on Subject: below --
2017-07-25 16:55 Andreas Sturmlechner
2016-07-13 18:23 Johannes Huber
2016-07-08 17:29 Michael Palimaka
2016-05-18 13:25 Johannes Huber
2016-04-09 15:12 Michael Palimaka
2015-12-06 15:22 Alexey Shvetsov
2015-09-19 14:05 Manuel Rüger
2015-08-25 21:35 Johannes Huber
2015-08-08 12:28 Johannes Huber
2015-06-27 13:53 Manuel Rüger
2015-06-14 15:24 Michael Palimaka
2015-05-31 19:09 Manuel Rüger
2015-05-27 12:07 Michael Palimaka
2015-05-23 17:16 Michael Palimaka
2015-05-23 17:16 Michael Palimaka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox