| 1 |
commit: 34c6ac07f854630dc02fa205e749fce418ac282e |
| 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 24 13:38:24 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=34c6ac07 |
| 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 | 21 +++++++++++++++++++-- |
| 13 |
1 file changed, 19 insertions(+), 2 deletions(-) |
| 14 |
|
| 15 |
diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass |
| 16 |
index 01d0f97..113b8fd 100644 |
| 17 |
--- a/eclass/kde5.eclass |
| 18 |
+++ b/eclass/kde5.eclass |
| 19 |
@@ -232,10 +232,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 |
_kde_is_unreleased() { |
| 37 |
local pair |
| 38 |
for pair in "${KDE_UNRELEASED[@]}" ; do |
| 39 |
@@ -302,14 +311,22 @@ _calculate_src_uri() { |
| 40 |
esac |
| 41 |
|
| 42 |
if [[ -z ${SRC_URI} && -n ${KDEBASE} ]] ; then |
| 43 |
+ local _kdebase |
| 44 |
+ case ${PN} in |
| 45 |
+ kdevelop-pg-qt) |
| 46 |
+ _kdebase=${PN} ;; |
| 47 |
+ *) |
| 48 |
+ _kdebase=${KDEBASE} ;; |
| 49 |
+ esac |
| 50 |
case ${PV} in |
| 51 |
*.*.[6-9]? ) |
| 52 |
- SRC_URI="mirror://kde/unstable/${KDEBASE}/${PV}/src/${_kmname}-${PV}.tar.xz" |
| 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}.tar.xz" ;; |
| 58 |
+ SRC_URI="mirror://kde/stable/${_kdebase}/${PV}/src/${_kmname}-${PV%.0}.tar.xz" ;; |
| 59 |
esac |
| 60 |
+ unset _kdebase |
| 61 |
fi |
| 62 |
|
| 63 |
if [[ ${KDEBASE} = kdel10n ]] ; then |
Archives