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 746B2138206 for ; Sun, 24 Apr 2016 17:52:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 428F621C042; Sun, 24 Apr 2016 17:52:24 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 041CD21C03F for ; Sun, 24 Apr 2016 17:52:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1F335340B79 for ; Sun, 24 Apr 2016 17:52:22 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 52DE4967 for ; Sun, 24 Apr 2016 17:52:18 +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: <1461519043.efc6d7c15a5db37be8afc4f678d66f63d7be1e6a.kensington@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: eclass/ X-VCS-Repository: proj/kde X-VCS-Files: eclass/kde5.eclass X-VCS-Directories: eclass/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: efc6d7c15a5db37be8afc4f678d66f63d7be1e6a X-VCS-Branch: master Date: Sun, 24 Apr 2016 17:52:18 +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: 0d92f20a-2da4-4caf-96f4-c1523937f41c X-Archives-Hash: 35638ced3418a1f2e653a6490890ccde commit: efc6d7c15a5db37be8afc4f678d66f63d7be1e6a Author: Andreas Sturmlechner gmail com> AuthorDate: Sat Apr 23 22:22:39 2016 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Sun Apr 24 17:30:43 2016 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=efc6d7c1 kde5.eclass: Reshuffle kdepim split packaging handling ..into one legacy (16.04) block, keeping kontactplugin stuff for future eclass/kde5.eclass | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass index 8dee37b..fb33249 100644 --- a/eclass/kde5.eclass +++ b/eclass/kde5.eclass @@ -533,8 +533,9 @@ kde5_src_prepare() { fi fi - # kdepim split packaging handling (drop other applications != {PN}) - if [[ ${KMNAME} = "kdepim" && $(basename "${S}") != ${PN} ]] || [[ ${PN} = "kdepim" ]] ; then + # legacy (16.04) kdepim split packaging handling (drop other applications != {PN}) + if [[ ${KMNAME} = "kdepim" && ${PV} = "16.04*" && $(basename "${S}") != ${PN} ]] || \ + [[ ${PN} = "kdepim" ]] ; then # make optional a lot of otherwise required dependencies in root CMakeLists.txt sed -e "/find_package(KF5/ s/ REQUIRED//" \ -e "/find_package(Qt5 / s/ REQUIRED/ OPTIONAL_COMPONENTS/" \ @@ -547,15 +548,20 @@ kde5_src_prepare() { -e "/find_package(Grantlee5/ s/ REQUIRED//" \ -i CMakeLists.txt || die "Failed to make dependencies optional" - # Boost: kdepim (kmail, mailfilteragent) - # MailTransportDBusService: kdepim (kmail) - # Phonon4Qt5: kdepim (kalarm, korgac) if [[ ${PN} != "kdepim" ]] ; then + # Boost: kdepim (kmail, mailfilteragent) + # MailTransportDBusService: kdepim (kmail) + # Phonon4Qt5: kdepim (kalarm, korgac) sed -e "/find_package(Boost/ s/^/#DONT/" \ -e "/set_package_properties(Boost/ s/^/#DONT/" \ -e "/find_package(MailTransportDBusService/ s/^/#DONT/" \ -e "/find_package(Phonon4Qt5/ s/^/#DONT/" \ -i CMakeLists.txt || die "Failed to disable dependencies" + + # only build select handbook + if use_if_iuse handbook && [[ -e doc/CMakeLists.txt ]] ; then + echo "add_subdirectory(${PN})" > doc/CMakeLists.txt + fi fi # remove anything else not listed here @@ -575,23 +581,16 @@ kde5_src_prepare() { fi done popd > /dev/null || die - - # disable build of kontactplugin in kdepim and split kdepim packages - if ! use_if_iuse kontact ; then - for x in $(find ./ -name CMakeLists.txt -exec grep -l "add_subdirectory.*kontactplugin" "{}" ";"); do - einfo "Disabling kontactplugin in: ${x}" - pushd $(dirname "${x}") > /dev/null || die - cmake_comment_add_subdirectory kontactplugin - popd > /dev/null || die - done - fi fi - # only build select handbook - if [[ ${KMNAME} = "kdepim" && $(basename "${S}") != ${PN} ]] ; then - if use_if_iuse handbook && [[ -e doc/CMakeLists.txt ]] ; then - echo "add_subdirectory(${PN})" > doc/CMakeLists.txt - fi + # disable build of kontactplugin in split kdepim packages + if ! use_if_iuse kontact ; then + for x in $(find ./ -name CMakeLists.txt -exec grep -l "add_subdirectory.*kontactplugin" "{}" ";"); do + einfo "Disabling kontactplugin in: ${x}" + pushd $(dirname "${x}") > /dev/null || die + cmake_comment_add_subdirectory kontactplugin + popd > /dev/null || die + done fi }