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 7079A139897 for ; Tue, 25 Aug 2015 21:35:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7AF62E07EA; Tue, 25 Aug 2015 21:35:44 +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 0DCF8E07EA for ; Tue, 25 Aug 2015 21:35:43 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 14578340909 for ; Tue, 25 Aug 2015 21:35:43 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 030DB16D for ; Tue, 25 Aug 2015 21:35:39 +0000 (UTC) From: "Johannes Huber" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Johannes Huber" Message-ID: <1440538525.0990d790fa1278b32013ce928134062b0824d7ae.johu@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/kde4-l10n/ X-VCS-Repository: proj/kde X-VCS-Files: kde-apps/kde4-l10n/kde4-l10n-15.08.0.ebuild X-VCS-Directories: kde-apps/kde4-l10n/ X-VCS-Committer: johu X-VCS-Committer-Name: Johannes Huber X-VCS-Revision: 0990d790fa1278b32013ce928134062b0824d7ae X-VCS-Branch: master Date: Tue, 25 Aug 2015 21:35:39 +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: 6e464b7d-50ec-4b31-ad92-123a06f38b5f X-Archives-Hash: 30a50d673d48407b1d0a282555976bab commit: 0990d790fa1278b32013ce928134062b0824d7ae Author: Andreas Sturmlechner gmail com> AuthorDate: Tue Aug 25 17:51:30 2015 +0000 Commit: Johannes Huber gentoo 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 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