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 8D152138CD9 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 D02F3E088F; 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 7D120E088F for ; Wed, 27 May 2015 12:07:43 +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 C4A9E340D2A for ; Wed, 27 May 2015 12:07:42 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EFD749FB for ; Wed, 27 May 2015 12:07:39 +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.b3884925015a347337f384147202650bd841e9ef.kensington@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/kde-l10n/ X-VCS-Repository: proj/kde X-VCS-Files: kde-apps/kde-l10n/kde-l10n-15.04.1.ebuild X-VCS-Directories: kde-apps/kde-l10n/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: b3884925015a347337f384147202650bd841e9ef X-VCS-Branch: master Date: Wed, 27 May 2015 12:07: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: c3bab525-e94c-4bfa-9dc2-cb4335df8dab X-Archives-Hash: a0676a06358bc433ec867761f8290f18 commit: b3884925015a347337f384147202650bd841e9ef Author: Andreas Sturmlechner gmail com> AuthorDate: Mon May 25 13:06:33 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=b3884925 [kde-apps/kde-l10n] Fix LINGUAS=sr Package-Manager: portage-2.2.18 kde-apps/kde-l10n/kde-l10n-15.04.1.ebuild | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/kde-apps/kde-l10n/kde-l10n-15.04.1.ebuild b/kde-apps/kde-l10n/kde-l10n-15.04.1.ebuild index 98eb79e..890095b 100644 --- a/kde-apps/kde-l10n/kde-l10n-15.04.1.ebuild +++ b/kde-apps/kde-l10n/kde-l10n-15.04.1.ebuild @@ -55,14 +55,24 @@ src_prepare() { DIR="${PN}-${LNG}-${PV}" if [[ -d "${DIR}" ]] ; then echo "add_subdirectory( ${DIR} )" >> "${S}"/CMakeLists.txt + # Drop KDE4-based part sed -e '/add_subdirectory(4)/ s/^/#/'\ -i "${S}"/${DIR}/CMakeLists.txt || die + # Handbook optional sed -e '/KF5DocTools/ s/ REQUIRED//'\ -i "${S}"/${DIR}/5/${LNG}/CMakeLists.txt || die - use handbook || sed -e '/add_subdirectory(docs)/ s/^/#/'\ - -i "${S}"/${DIR}/5/${LNG}/CMakeLists.txt || dies + if ! use handbook ; then + sed -e '/add_subdirectory(docs)/ s/^/#/'\ + -i "${S}"/${DIR}/5/${LNG}/CMakeLists.txt || die + fi + + # Fix broken LINGUAS=sr (KDE4 leftover) + if [[ ${LNG} = "sr" ]] ; then + sed -e '/add_subdirectory(lokalize)/ s/^/#/'\ + -i "${S}"/${DIR}/5/${LNG}/data/kdesdk/CMakeLists.txt || die + fi fi done fi