| 1 |
zlin 08/02/21 10:33:12 |
| 2 |
|
| 3 |
Modified: kde-meta.eclass |
| 4 |
Log: |
| 5 |
Koffice split ebuilds tried to set blockers using SLOT or KDEMAJORVER.KDEMINORVER before SLOT gets set. Instead it now uses SLOT=0 when SLOT is unset or KOFFICE{MAJOR,MINOR}VER derived from ${PV}. |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.85 eclass/kde-meta.eclass |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde-meta.eclass?rev=1.85&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde-meta.eclass?rev=1.85&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde-meta.eclass?r1=1.84&r2=1.85 |
| 13 |
|
| 14 |
Index: kde-meta.eclass |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/kde-meta.eclass,v |
| 17 |
retrieving revision 1.84 |
| 18 |
retrieving revision 1.85 |
| 19 |
diff -u -r1.84 -r1.85 |
| 20 |
--- kde-meta.eclass 20 Feb 2008 20:59:43 -0000 1.84 |
| 21 |
+++ kde-meta.eclass 21 Feb 2008 10:33:11 -0000 1.85 |
| 22 |
@@ -1,6 +1,6 @@ |
| 23 |
# Copyright 1999-2008 Gentoo Foundation |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde-meta.eclass,v 1.84 2008/02/20 20:59:43 philantrop Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde-meta.eclass,v 1.85 2008/02/21 10:33:11 zlin Exp $ |
| 27 |
|
| 28 |
# @ECLASS: kde-meta.eclass |
| 29 |
# @MAINTAINER: |
| 30 |
@@ -87,14 +87,28 @@ |
| 31 |
RDEPEND="${RDEPEND} !=$(get-parent-package ${CATEGORY}/${PN})-${SLOT}*" |
| 32 |
else |
| 33 |
case ${EAPI:-0} in |
| 34 |
+ 0) |
| 35 |
# EAPIs without SLOT dependencies. |
| 36 |
- 0) DEPEND="${DEPEND} !=$(get-parent-package ${CATEGORY}/${PN})-${KDEMAJORVER}.${KDEMINORVER}*" |
| 37 |
- RDEPEND="${RDEPEND} !=$(get-parent-package ${CATEGORY}/${PN})-${KDEMAJORVER}.${KDEMINORVER}*" |
| 38 |
- ;; |
| 39 |
+ IFSBACKUP="$IFS" |
| 40 |
+ IFS=".-_" |
| 41 |
+ for x in ${PV}; do |
| 42 |
+ if [[ -z "$KOFFICEMAJORVER" ]]; then KOFFICEMAJORVER=$x |
| 43 |
+ else if [[ -z "$KOFFICEMINORVER" ]]; then KOFFICEMINORVER=$x |
| 44 |
+ else if [[ -z "$KOFFICEREVISION" ]]; then KOFFICEREVISION=$x |
| 45 |
+ fi; fi; fi |
| 46 |
+ done |
| 47 |
+ [[ -z "$KOFFICEMINORVER" ]] && KOFFICEMINORVER="0" |
| 48 |
+ [[ -z "$KOFFICEREVISION" ]] && KOFFICEREVISION="0" |
| 49 |
+ IFS="$IFSBACKUP" |
| 50 |
+ DEPEND="${DEPEND} !=$(get-parent-package ${CATEGORY}/${PN})-${KOFFICEMAJORVER}.${KOFFICEMINORVER}*" |
| 51 |
+ RDEPEND="${RDEPEND} !=$(get-parent-package ${CATEGORY}/${PN})-${KOFFICEMAJORVER}.${KOFFICEMINORVER}*" |
| 52 |
+ ;; |
| 53 |
# EAPIs with SLOT dependencies. |
| 54 |
- *) DEPEND="${DEPEND} !$(get-parent-package ${CATEGORY}/${PN}):${SLOT}" |
| 55 |
- RDEPEND="${RDEPEND} !$(get-parent-package ${CATEGORY}/${PN}):${SLOT}" |
| 56 |
- ;; |
| 57 |
+ *) |
| 58 |
+ [[ -z ${SLOT} ]] && SLOT="0" |
| 59 |
+ DEPEND="${DEPEND} !$(get-parent-package ${CATEGORY}/${PN}):${SLOT}" |
| 60 |
+ RDEPEND="${RDEPEND} !$(get-parent-package ${CATEGORY}/${PN}):${SLOT}" |
| 61 |
+ ;; |
| 62 |
esac |
| 63 |
fi |
| 64 |
|
| 65 |
|
| 66 |
|
| 67 |
|
| 68 |
-- |
| 69 |
gentoo-commits@l.g.o mailing list |
Archives