From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 72416138CD1 for ; Wed, 27 May 2015 12:07:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4FA29E088B; Wed, 27 May 2015 12:07:43 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 92B40E088B for ; Wed, 27 May 2015 12:07:42 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9BA64340DA5 for ; Wed, 27 May 2015 12:07:41 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1FEF2A0E for ; Wed, 27 May 2015 12:07:40 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1432728424.867f4b6b4e872a64a6ea40c9bf7e4e65b1dffba7.kensington@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/kde4-l10n/, kde-apps/kde4-l10n/files/ X-VCS-Repository: proj/kde X-VCS-Files: kde-apps/kde4-l10n/files/kde4-l10n-15.04.1-remove-dirs kde-apps/kde4-l10n/kde4-l10n-15.04.1.ebuild X-VCS-Directories: kde-apps/kde4-l10n/ kde-apps/kde4-l10n/files/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: 867f4b6b4e872a64a6ea40c9bf7e4e65b1dffba7 X-VCS-Branch: master Date: Wed, 27 May 2015 12:07:40 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 219d2ad6-0603-4585-8410-020135b77d5f X-Archives-Hash: 1cf4d2e9f5f4c6578ac383642db50527 commit: 867f4b6b4e872a64a6ea40c9bf7e4e65b1dffba7 Author: Andreas Sturmlechner gmail com> AuthorDate: Mon May 25 15:22:30 2015 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Wed May 27 12:07:04 2015 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=867f4b6b [kde-apps/kde4-l10n] Outsource subdir paths into FILESDIR Fix file collisions w/ kde-apps/kde-l10n LINGUAS="ca it nn" See also bug 550346 Package-Manager: portage-2.2.18 .../kde4-l10n/files/kde4-l10n-15.04.1-remove-dirs | 47 ++++++++++++++++++++++ kde-apps/kde4-l10n/kde4-l10n-15.04.1.ebuild | 42 ++++--------------- 2 files changed, 55 insertions(+), 34 deletions(-) diff --git a/kde-apps/kde4-l10n/files/kde4-l10n-15.04.1-remove-dirs b/kde-apps/kde4-l10n/files/kde4-l10n-15.04.1-remove-dirs new file mode 100644 index 0000000..57f687a --- /dev/null +++ b/kde-apps/kde4-l10n/files/kde4-l10n-15.04.1-remove-dirs @@ -0,0 +1,47 @@ +# 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 parley +docs/kdeedu step +docs/kdegames bomber +docs/kdegraphics gwenview +docs/kdegraphics kruler +docs/kdesdk kapptemplate +docs/kdesdk okteta +# 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/kde4-l10n-15.04.1.ebuild b/kde-apps/kde4-l10n/kde4-l10n-15.04.1.ebuild index f75b8af..9833f20 100644 --- a/kde-apps/kde4-l10n/kde4-l10n-15.04.1.ebuild +++ b/kde-apps/kde4-l10n/kde4-l10n-15.04.1.ebuild @@ -23,6 +23,7 @@ RDEPEND=" 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" @@ -82,46 +83,19 @@ src_prepare() { if use minimal; then einfo "Removing paths from ${LNG}" - # 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 + # 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 - # 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 - else if [[ -d "${KMNAME}-${LNG}-${LV}" ]] ; then # Merge legacy localisation