Gentoo Archives: gentoo-commits

From: Michael Palimaka <kensington@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
Date: Wed, 31 Aug 2016 14:23:57
Message-Id: 1472653406.a5a2468eaece1ac12a613a1efa8db1e23d4501f6.kensington@gentoo
1 commit: a5a2468eaece1ac12a613a1efa8db1e23d4501f6
2 Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
3 AuthorDate: Sun Aug 21 21:24:40 2016 +0000
4 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
5 CommitDate: Wed Aug 31 14:23:26 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5a2468e
7
8 kde5.eclass: Fix SRC_URI, kdevelop missing trailing .0 in first release
9
10 Add kdevelop-pg-qt SRC_URIs
11
12 eclass/kde5.eclass | 32 ++++++++++++++++++++++++++++++++
13 1 file changed, 32 insertions(+)
14
15 diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
16 index 1d093b1..feffa11 100644
17 --- a/eclass/kde5.eclass
18 +++ b/eclass/kde5.eclass
19 @@ -225,6 +225,19 @@ if [[ -n ${KMNAME} && ${KMNAME} != ${PN} && ${KDE_BUILD_TYPE} = release ]]; then
20 S=${WORKDIR}/${KMNAME}-${PV}
21 fi
22
23 +# Drop this when kdepim is finally split upstream
24 +if [[ -n ${KMNAME} && ${KMNAME} != ${PN} && ${KMNAME} = kdepim ]]; then
25 + S="${S}/${PN}"
26 +fi
27 +
28 +if [[ -n ${KDEBASE} && ${KDEBASE} = kdevelop && ${KDE_BUILD_TYPE} = release ]]; then
29 + if [[ -n ${KMNAME} ]]; then
30 + S=${WORKDIR}/${KMNAME}-${PV%.0} # kdevelop missing trailing .0 in first release
31 + else
32 + S=${WORKDIR}/${PN}-${PV%.0} # kdevelop missing trailing .0 in first release
33 + fi
34 +fi
35 +
36 # Determine fetch location for released tarballs
37 _calculate_src_uri() {
38 debug-print-function ${FUNCNAME} "$@"
39 @@ -279,6 +292,25 @@ _calculate_src_uri() {
40 ;;
41 esac
42
43 + if [[ -z ${SRC_URI} && -n ${KDEBASE} ]] ; then
44 + local _kdebase
45 + case ${PN} in
46 + kdevelop-pg-qt)
47 + _kdebase=${PN} ;;
48 + *)
49 + _kdebase=${KDEBASE} ;;
50 + esac
51 + case ${PV} in
52 + *.*.[6-9]? )
53 + SRC_URI="mirror://kde/unstable/${_kdebase}/${PV}/src/${_kmname}-${PV}.tar.xz"
54 + RESTRICT+=" mirror"
55 + ;;
56 + *)
57 + SRC_URI="mirror://kde/stable/${_kdebase}/${PV}/src/${_kmname}-${PV%.0}.tar.xz" ;;
58 + esac
59 + unset _kdebase
60 + fi
61 +
62 if [[ ${KDEBASE} = kdel10n ]] ; then
63 local uri_base="${SRC_URI/${_kmname}-${PV}.tar.xz/}kde-l10n/kde-l10n"
64 SRC_URI=""