From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B31F0138330 for ; Wed, 24 Aug 2016 13:38:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9637021C13C; Wed, 24 Aug 2016 13:38:37 +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 B81A421C170 for ; Wed, 24 Aug 2016 13:38:36 +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 96836340924 for ; Wed, 24 Aug 2016 13:38:35 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BA0AD2457 for ; Wed, 24 Aug 2016 13:38:33 +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: <1472045904.34c6ac07f854630dc02fa205e749fce418ac282e.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: 34c6ac07f854630dc02fa205e749fce418ac282e X-VCS-Branch: master Date: Wed, 24 Aug 2016 13:38:33 +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: 40d839e9-7e26-4596-aeab-0d3bfea37d1d X-Archives-Hash: a4ee01d5a07cdd1e8cca8c36d02ac766 commit: 34c6ac07f854630dc02fa205e749fce418ac282e Author: Andreas Sturmlechner gmail com> AuthorDate: Sun Aug 21 21:24:40 2016 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Wed Aug 24 13:38:24 2016 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=34c6ac07 kde5.eclass: Fix SRC_URI, kdevelop missing trailing .0 in first release Add kdevelop-pg-qt SRC_URIs eclass/kde5.eclass | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass index 01d0f97..113b8fd 100644 --- a/eclass/kde5.eclass +++ b/eclass/kde5.eclass @@ -232,10 +232,19 @@ if [[ -n ${KMNAME} && ${KMNAME} != ${PN} && ${KDE_BUILD_TYPE} = release ]]; then S=${WORKDIR}/${KMNAME}-${PV} fi +# Drop this when kdepim is finally split upstream if [[ -n ${KMNAME} && ${KMNAME} != ${PN} && ${KMNAME} = kdepim ]]; then S="${S}/${PN}" fi +if [[ -n ${KDEBASE} && ${KDEBASE} = kdevelop && ${KDE_BUILD_TYPE} = release ]]; then + if [[ -n ${KMNAME} ]]; then + S=${WORKDIR}/${KMNAME}-${PV%.0} # kdevelop missing trailing .0 in first release + else + S=${WORKDIR}/${PN}-${PV%.0} # kdevelop missing trailing .0 in first release + fi +fi + _kde_is_unreleased() { local pair for pair in "${KDE_UNRELEASED[@]}" ; do @@ -302,14 +311,22 @@ _calculate_src_uri() { esac if [[ -z ${SRC_URI} && -n ${KDEBASE} ]] ; then + local _kdebase + case ${PN} in + kdevelop-pg-qt) + _kdebase=${PN} ;; + *) + _kdebase=${KDEBASE} ;; + esac case ${PV} in *.*.[6-9]? ) - SRC_URI="mirror://kde/unstable/${KDEBASE}/${PV}/src/${_kmname}-${PV}.tar.xz" + SRC_URI="mirror://kde/unstable/${_kdebase}/${PV}/src/${_kmname}-${PV}.tar.xz" RESTRICT+=" mirror" ;; *) - SRC_URI="mirror://kde/stable/${KDEBASE}/${PV}/src/${_kmname}-${PV}.tar.xz" ;; + SRC_URI="mirror://kde/stable/${_kdebase}/${PV}/src/${_kmname}-${PV%.0}.tar.xz" ;; esac + unset _kdebase fi if [[ ${KDEBASE} = kdel10n ]] ; then