| 1 |
tampakrap 10/12/29 17:56:34 |
| 2 |
|
| 3 |
Modified: kde4-functions.eclass kde4-meta.eclass |
| 4 |
Log: |
| 5 |
Previous commit broke kdepim installations for =! 4.6beta3, fixing |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.41 eclass/kde4-functions.eclass |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-functions.eclass?rev=1.41&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-functions.eclass?rev=1.41&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-functions.eclass?r1=1.40&r2=1.41 |
| 13 |
|
| 14 |
Index: kde4-functions.eclass |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v |
| 17 |
retrieving revision 1.40 |
| 18 |
retrieving revision 1.41 |
| 19 |
diff -u -r1.40 -r1.41 |
| 20 |
--- kde4-functions.eclass 29 Dec 2010 17:06:51 -0000 1.40 |
| 21 |
+++ kde4-functions.eclass 29 Dec 2010 17:56:34 -0000 1.41 |
| 22 |
@@ -1,6 +1,6 @@ |
| 23 |
# Copyright 1999-2010 Gentoo Foundation |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v 1.40 2010/12/29 17:06:51 tampakrap Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v 1.41 2010/12/29 17:56:34 tampakrap Exp $ |
| 27 |
|
| 28 |
inherit versionator |
| 29 |
|
| 30 |
@@ -378,11 +378,8 @@ |
| 31 |
local FIXME_PV |
| 32 |
if [[ ${KMNAME} = kdepim || ${PN} = kdepim-runtime ]] && [[ ${PV} = 4.4.6* || ${PV} = 4.4.7* || ${PV} = 4.4.8* || ${PV} = 4.4.9* ]] && [[ ${1} = kdelibs || ${1} = kdepimlibs ]]; then |
| 33 |
FIXME_PV=4.4.5 |
| 34 |
- else |
| 35 |
- FIXME_PV=${PV} |
| 36 |
- fi |
| 37 |
# FIXME remove hack when kdepim-4.6beta is gone |
| 38 |
- if [[ ${KMNAME} = kdepim || ${PN} = kdepim-runtime ]] && [[ ${PV} = 4.5.93* ]] && [[ ${1} = kdelibs || ${1} = kdepimlibs ]]; then |
| 39 |
+ elif [[ ${KMNAME} = kdepim || ${PN} = kdepim-runtime ]] && [[ ${PV} = 4.5.93* ]] && [[ ${1} = kdelibs || ${1} = kdepimlibs ]]; then |
| 40 |
FIXME_PV=4.5.90 |
| 41 |
else |
| 42 |
FIXME_PV=${PV} |
| 43 |
|
| 44 |
|
| 45 |
|
| 46 |
1.47 eclass/kde4-meta.eclass |
| 47 |
|
| 48 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-meta.eclass?rev=1.47&view=markup |
| 49 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-meta.eclass?rev=1.47&content-type=text/plain |
| 50 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-meta.eclass?r1=1.46&r2=1.47 |
| 51 |
|
| 52 |
Index: kde4-meta.eclass |
| 53 |
=================================================================== |
| 54 |
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v |
| 55 |
retrieving revision 1.46 |
| 56 |
retrieving revision 1.47 |
| 57 |
diff -u -r1.46 -r1.47 |
| 58 |
--- kde4-meta.eclass 29 Dec 2010 17:06:51 -0000 1.46 |
| 59 |
+++ kde4-meta.eclass 29 Dec 2010 17:56:34 -0000 1.47 |
| 60 |
@@ -1,6 +1,6 @@ |
| 61 |
# Copyright 1999-2010 Gentoo Foundation |
| 62 |
# Distributed under the terms of the GNU General Public License v2 |
| 63 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.46 2010/12/29 17:06:51 tampakrap Exp $ |
| 64 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.47 2010/12/29 17:56:34 tampakrap Exp $ |
| 65 |
# |
| 66 |
# @ECLASS: kde4-meta.eclass |
| 67 |
# @MAINTAINER: |
| 68 |
@@ -223,6 +223,8 @@ |
| 69 |
kdepim) |
| 70 |
if [[ ${PV} == 4.5.93 ]] ; then |
| 71 |
tarball="kdepim-4.6beta3.tar.${postfix}" |
| 72 |
+ else |
| 73 |
+ tarball="${KMNAME}-${PV}.tar.${postfix}" |
| 74 |
fi |
| 75 |
;; |
| 76 |
*) |
Archives