* [gentoo-commits] gentoo-x86 commit in eclass: kde4-base.eclass kde4-functions.eclass
@ 2011-01-28 5:05 Theo Chatzimichos (tampakrap)
0 siblings, 0 replies; 10+ messages in thread
From: Theo Chatzimichos (tampakrap) @ 2011-01-28 5:05 UTC (permalink / raw
To: gentoo-commits
tampakrap 11/01/28 05:05:13
Modified: kde4-base.eclass kde4-functions.eclass
Log:
Add KDEPIM 4.4.10 support
Revision Changes Path
1.84 eclass/kde4-base.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.84&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.84&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?r1=1.83&r2=1.84
Index: kde4-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- kde4-base.eclass 11 Jan 2011 13:15:46 -0000 1.83
+++ kde4-base.eclass 28 Jan 2011 05:05:13 -0000 1.84
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.83 2011/01/11 13:15:46 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.84 2011/01/28 05:05:13 tampakrap Exp $
# @ECLASS: kde4-base.eclass
# @MAINTAINER:
@@ -545,7 +545,7 @@
# Unstable KDE SC releases
SRC_URI="mirror://kde/unstable/${PV}/src/${_kmname_pv}.tar.bz2"
;;
- 4.4.6 | 4.4.7 | 4.4.8 | 4.4.9)
+ 4.4.6 | 4.4.7 | 4.4.8 | 4.4.9 | 4.4.10)
# Only kdepim here
SRC_URI="mirror://kde/stable/kdepim-${PV}/src/${_kmname_pv}.tar.bz2"
;;
1.43 eclass/kde4-functions.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-functions.eclass?rev=1.43&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-functions.eclass?rev=1.43&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-functions.eclass?r1=1.42&r2=1.43
Index: kde4-functions.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- kde4-functions.eclass 3 Jan 2011 20:36:17 -0000 1.42
+++ kde4-functions.eclass 28 Jan 2011 05:05:13 -0000 1.43
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v 1.42 2011/01/03 20:36:17 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v 1.43 2011/01/28 05:05:13 tampakrap Exp $
inherit versionator
@@ -376,7 +376,7 @@
if [[ ${KDEBASE} = kde-base ]]; then
# FIXME remove hack when >kdepim-4.4.5 is gone
local FIXME_PV
- 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 || ${1} = oxygen-icons ]]; then
+ if [[ ${KMNAME} = kdepim || ${PN} = kdepim-runtime ]] && [[ ${PV} = 4.4.6* || ${PV} = 4.4.7* || ${PV} = 4.4.8* || ${PV} = 4.4.9* || ${PV} = 4.4.10* ]] && [[ ${1} = kdelibs || ${1} = kdepimlibs || ${1} = oxygen-icons ]]; then
FIXME_PV=4.4.5
# FIXME remove hack when kdepim-4.6beta is gone
elif [[ ${KMNAME} = kdepim || ${PN} = kdepim-runtime ]] && [[ ${PV} = 4.5.93* ]] && [[ ${1} = kdelibs || ${1} = kdepimlibs || ${1} = oxygen-icons ]]; then
^ permalink raw reply [flat|nested] 10+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: kde4-base.eclass kde4-functions.eclass
@ 2011-01-03 20:36 Andreas HAttel (dilfridge)
0 siblings, 0 replies; 10+ messages in thread
From: Andreas HAttel (dilfridge) @ 2011-01-03 20:36 UTC (permalink / raw
To: gentoo-commits
dilfridge 11/01/03 20:36:17
Modified: kde4-base.eclass kde4-functions.eclass
Log:
Add RDEPEND on oxygen-icons to all ebuilds using kde4-base.eclass. Ack'ed by tampakrap.
Revision Changes Path
1.82 eclass/kde4-base.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.82&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.82&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?r1=1.81&r2=1.82
Index: kde4-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- kde4-base.eclass 29 Dec 2010 17:06:51 -0000 1.81
+++ kde4-base.eclass 3 Jan 2011 20:36:17 -0000 1.82
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.81 2010/12/29 17:06:51 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.82 2011/01/03 20:36:17 dilfridge Exp $
# @ECLASS: kde4-base.eclass
# @MAINTAINER:
@@ -379,6 +379,10 @@
"
kderdepend=""
+if [[ ${PN} != oxygen-icons ]]; then
+ kderdepend+=" $(add_kdebase_dep oxygen-icons)"
+fi
+
kdehandbookdepend="
app-text/docbook-xml-dtd:4.2
app-text/docbook-xsl-stylesheets
1.42 eclass/kde4-functions.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-functions.eclass?rev=1.42&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-functions.eclass?rev=1.42&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-functions.eclass?r1=1.41&r2=1.42
Index: kde4-functions.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- kde4-functions.eclass 29 Dec 2010 17:56:34 -0000 1.41
+++ kde4-functions.eclass 3 Jan 2011 20:36:17 -0000 1.42
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v 1.41 2010/12/29 17:56:34 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v 1.42 2011/01/03 20:36:17 dilfridge Exp $
inherit versionator
@@ -376,10 +376,10 @@
if [[ ${KDEBASE} = kde-base ]]; then
# FIXME remove hack when >kdepim-4.4.5 is gone
local FIXME_PV
- 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
+ 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 || ${1} = oxygen-icons ]]; then
FIXME_PV=4.4.5
# FIXME remove hack when kdepim-4.6beta is gone
- elif [[ ${KMNAME} = kdepim || ${PN} = kdepim-runtime ]] && [[ ${PV} = 4.5.93* ]] && [[ ${1} = kdelibs || ${1} = kdepimlibs ]]; then
+ elif [[ ${KMNAME} = kdepim || ${PN} = kdepim-runtime ]] && [[ ${PV} = 4.5.93* ]] && [[ ${1} = kdelibs || ${1} = kdepimlibs || ${1} = oxygen-icons ]]; then
FIXME_PV=4.5.90
else
FIXME_PV=${PV}
^ permalink raw reply [flat|nested] 10+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: kde4-base.eclass kde4-functions.eclass
@ 2010-12-29 16:45 Theo Chatzimichos (tampakrap)
0 siblings, 0 replies; 10+ messages in thread
From: Theo Chatzimichos (tampakrap) @ 2010-12-29 16:45 UTC (permalink / raw
To: gentoo-commits
tampakrap 10/12/29 16:45:19
Modified: kde4-base.eclass kde4-functions.eclass
Log:
Add eclass support for KDEPIM 4.4.9
Revision Changes Path
1.80 eclass/kde4-base.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.80&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.80&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?r1=1.79&r2=1.80
Index: kde4-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- kde4-base.eclass 6 Dec 2010 10:17:04 -0000 1.79
+++ kde4-base.eclass 29 Dec 2010 16:45:19 -0000 1.80
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.79 2010/12/06 10:17:04 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.80 2010/12/29 16:45:19 tampakrap Exp $
# @ECLASS: kde4-base.eclass
# @MAINTAINER:
@@ -537,7 +537,7 @@
# Unstable KDE SC releases
SRC_URI="mirror://kde/unstable/${PV}/src/${_kmname_pv}.tar.bz2"
;;
- 4.4.6 | 4.4.7 | 4.4.8)
+ 4.4.6 | 4.4.7 | 4.4.8 | 4.4.9)
# Only kdepim here
SRC_URI="mirror://kde/stable/kdepim-${PV}/src/${_kmname_pv}.tar.bz2"
;;
1.39 eclass/kde4-functions.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-functions.eclass?rev=1.39&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-functions.eclass?rev=1.39&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-functions.eclass?r1=1.38&r2=1.39
Index: kde4-functions.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- kde4-functions.eclass 6 Dec 2010 10:17:04 -0000 1.38
+++ kde4-functions.eclass 29 Dec 2010 16:45:19 -0000 1.39
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v 1.38 2010/12/06 10:17:04 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v 1.39 2010/12/29 16:45:19 tampakrap Exp $
inherit versionator
@@ -374,9 +374,9 @@
local use=${2:+,${2}}
if [[ ${KDEBASE} = kde-base ]]; then
- # FIXME remove hack when kdepim-4.4.{6,7} is gone
+ # FIXME remove hack when >kdepim-4.4.5 is gone
local FIXME_PV
- if [[ ${KMNAME} = kdepim || ${PN} = kdepim-runtime ]] && [[ ${PV} = 4.4.6* || ${PV} = 4.4.7* || ${PV} = 4.4.8* ]] && [[ ${1} = kdelibs || ${1} = kdepimlibs ]]; then
+ 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
FIXME_PV=4.4.5
else
FIXME_PV=${PV}
^ permalink raw reply [flat|nested] 10+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: kde4-base.eclass kde4-functions.eclass
@ 2010-12-06 10:17 Theo Chatzimichos (tampakrap)
0 siblings, 0 replies; 10+ messages in thread
From: Theo Chatzimichos (tampakrap) @ 2010-12-06 10:17 UTC (permalink / raw
To: gentoo-commits
tampakrap 10/12/06 10:17:04
Modified: kde4-base.eclass kde4-functions.eclass
Log:
Add support for KDEPIM 4.4.8 in kde eclasses
Revision Changes Path
1.79 eclass/kde4-base.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.79&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.79&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?r1=1.78&r2=1.79
Index: kde4-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- kde4-base.eclass 2 Dec 2010 21:49:54 -0000 1.78
+++ kde4-base.eclass 6 Dec 2010 10:17:04 -0000 1.79
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.78 2010/12/02 21:49:54 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.79 2010/12/06 10:17:04 tampakrap Exp $
# @ECLASS: kde4-base.eclass
# @MAINTAINER:
@@ -537,7 +537,7 @@
# Unstable KDE SC releases
SRC_URI="mirror://kde/unstable/${PV}/src/${_kmname_pv}.tar.bz2"
;;
- 4.4.6 | 4.4.7)
+ 4.4.6 | 4.4.7 | 4.4.8)
# Only kdepim here
SRC_URI="mirror://kde/stable/kdepim-${PV}/src/${_kmname_pv}.tar.bz2"
;;
1.38 eclass/kde4-functions.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-functions.eclass?rev=1.38&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-functions.eclass?rev=1.38&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-functions.eclass?r1=1.37&r2=1.38
Index: kde4-functions.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- kde4-functions.eclass 2 Dec 2010 21:49:54 -0000 1.37
+++ kde4-functions.eclass 6 Dec 2010 10:17:04 -0000 1.38
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v 1.37 2010/12/02 21:49:54 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v 1.38 2010/12/06 10:17:04 tampakrap Exp $
inherit versionator
@@ -376,7 +376,7 @@
if [[ ${KDEBASE} = kde-base ]]; then
# FIXME remove hack when kdepim-4.4.{6,7} is gone
local FIXME_PV
- if [[ ${KMNAME} = kdepim || ${PN} = kdepim-runtime ]] && [[ ${PV} = 4.4.6* || ${PV} = 4.4.7* ]] && [[ ${1} = kdelibs || ${1} = kdepimlibs ]]; then
+ if [[ ${KMNAME} = kdepim || ${PN} = kdepim-runtime ]] && [[ ${PV} = 4.4.6* || ${PV} = 4.4.7* || ${PV} = 4.4.8* ]] && [[ ${1} = kdelibs || ${1} = kdepimlibs ]]; then
FIXME_PV=4.4.5
else
FIXME_PV=${PV}
^ permalink raw reply [flat|nested] 10+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: kde4-base.eclass kde4-functions.eclass
@ 2010-10-24 15:56 Theo Chatzimichos (tampakrap)
0 siblings, 0 replies; 10+ messages in thread
From: Theo Chatzimichos (tampakrap) @ 2010-10-24 15:56 UTC (permalink / raw
To: gentoo-commits
tampakrap 10/10/24 15:56:03
Modified: kde4-base.eclass kde4-functions.eclass
Log:
Add KDEPIM 4.4.7 support
Revision Changes Path
1.75 eclass/kde4-base.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.75&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.75&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?r1=1.74&r2=1.75
Index: kde4-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- kde4-base.eclass 14 Sep 2010 12:39:51 -0000 1.74
+++ kde4-base.eclass 24 Oct 2010 15:56:03 -0000 1.75
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.74 2010/09/14 12:39:51 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.75 2010/10/24 15:56:03 tampakrap Exp $
# @ECLASS: kde4-base.eclass
# @MAINTAINER:
@@ -479,7 +479,7 @@
# Unstable KDE SC releases
SRC_URI="mirror://kde/unstable/${PV}/src/${_kmname_pv}.tar.bz2"
;;
- 4.4.6)
+ 4.4.6 | 4.4.7)
# Only kdepim here
SRC_URI="mirror://kde/stable/kdepim-${PV}/src/${_kmname_pv}.tar.bz2"
;;
1.36 eclass/kde4-functions.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-functions.eclass?rev=1.36&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-functions.eclass?rev=1.36&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-functions.eclass?r1=1.35&r2=1.36
Index: kde4-functions.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- kde4-functions.eclass 11 Sep 2010 04:25:23 -0000 1.35
+++ kde4-functions.eclass 24 Oct 2010 15:56:03 -0000 1.36
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v 1.35 2010/09/11 04:25:23 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v 1.36 2010/10/24 15:56:03 tampakrap Exp $
inherit versionator
@@ -518,9 +518,9 @@
local use=${2:+,${2}}
if [[ ${KDEBASE} = kde-base ]]; then
- # FIXME remove hack when kdepim-4.4.6 is gone
+ # FIXME remove hack when kdepim-4.4.{6,7} is gone
local FIXME_PV
- if [[ ${KMNAME} = kdepim || ${PN} = kdepim-runtime ]] && [[ ${PV} = 4.4.6* ]] && [[ ${1} = kdelibs || ${1} = kdepimlibs ]]; then
+ if [[ ${KMNAME} = kdepim || ${PN} = kdepim-runtime ]] && [[ ${PV} = 4.4.6* || ${PV} = 4.4.7* ]] && [[ ${1} = kdelibs || ${1} = kdepimlibs ]]; then
FIXME_PV=4.4.5
else
FIXME_PV=${PV}
^ permalink raw reply [flat|nested] 10+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: kde4-base.eclass kde4-functions.eclass
@ 2010-09-09 17:02 Maciej Mrozowski (reavertm)
0 siblings, 0 replies; 10+ messages in thread
From: Maciej Mrozowski (reavertm) @ 2010-09-09 17:02 UTC (permalink / raw
To: gentoo-commits
reavertm 10/09/09 17:02:30
Modified: kde4-base.eclass kde4-functions.eclass
Log:
Sync some changes from overlay:
- KDE_HANDBOOK=1 instead of IUSE=handbook
- add_kdebase_dep can be used outside of kde-base now
Revision Changes Path
1.69 eclass/kde4-base.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.69&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.69&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?r1=1.68&r2=1.69
Index: kde4-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- kde4-base.eclass 13 Aug 2010 05:05:40 -0000 1.68
+++ kde4-base.eclass 9 Sep 2010 17:02:30 -0000 1.69
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.68 2010/08/13 05:05:40 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.69 2010/09/09 17:02:30 reavertm Exp $
# @ECLASS: kde4-base.eclass
# @MAINTAINER:
@@ -113,21 +113,6 @@
unset buildsystem_eclass
unset export_fns
-case ${KDEBASE} in
- kde-base)
- HOMEPAGE="http://www.kde.org/"
- LICENSE="GPL-2"
- ;;
- koffice)
- HOMEPAGE="http://www.koffice.org/"
- LICENSE="GPL-2"
- ;;
- kdevelop)
- HOMEPAGE="http://www.kdevelop.org/"
- LICENSE="GPL-2"
- ;;
-esac
-
# @ECLASS-VARIABLE: OPENGL_REQUIRED
# @DESCRIPTION:
# Is qt-opengl required? Possible values are 'always', 'optional' and 'never'.
@@ -160,9 +145,17 @@
# Note that for kde-base packages this variable is fixed to 'always'.
KDE_REQUIRED="${KDE_REQUIRED:-always}"
+# @ECLASS-VARIABLE: KDE_HANDBOOK
+# @DESCRIPTION:
+# Set to enable handbook in application. It adds +handbook to IUSE, handbook dirs
+# to KMEXTRA and ensures buildtime and runtime dependencies.
+[[ -n ${KDE_HANDBOOK} ]] && IUSE+=" +handbook"
+
# Setup packages inheriting this eclass
case ${KDEBASE} in
kde-base)
+ HOMEPAGE="http://www.kde.org/"
+ LICENSE="GPL-2"
if [[ $BUILD_TYPE = live ]]; then
# Disable tests for live ebuilds
RESTRICT+=" test"
@@ -183,6 +176,14 @@
# Block installation of other SLOTS unless kdeprefix
RDEPEND+=" $(block_other_slots)"
;;
+ koffice)
+ HOMEPAGE="http://www.koffice.org/"
+ LICENSE="GPL-2"
+ ;;
+ kdevelop)
+ HOMEPAGE="http://www.kdevelop.org/"
+ LICENSE="GPL-2"
+ ;;
esac
# @ECLASS-VARIABLE: QT_MINIMAL
@@ -322,6 +323,30 @@
x11-proto/xf86vidmodeproto
)
"
+
+# Handbook handling - dependencies
+if [[ -n ${KDE_HANDBOOK} ]]; then
+ kdedepend+="
+ handbook? (
+ app-text/docbook-xml-dtd:4.2
+ app-text/docbook-xsl-stylesheets
+ )
+ "
+ if [[ ${PN} != kdelibs ]]; then
+ if [[ ${KDEBASE} = kde-base ]]; then
+ PDEPEND+=" handbook? ( $(add_kdebase_dep kdelibs 'handbook') )"
+ else
+ PDEPEND+=" handbook? ( >=kde-base/kdelibs-${KDE_MINIMAL}[handbook] )"
+ fi
+ elif [[ ${PN} != khelpcenter ]]; then
+ if [[ ${KDEBASE} = kde-base ]]; then
+ PDEPEND+=" handbook? ( $(add_kdebase_dep khelpcenter 'handbook') )"
+ else
+ PDEPEND+=" handbook? ( >=kde-base/khelpcenter-${KDE_MINIMAL}[handbook] )"
+ fi
+ fi
+fi
+
case ${KDE_REQUIRED} in
always)
IUSE+=" aqua"
@@ -341,6 +366,7 @@
debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: COMMONDEPEND is ${COMMONDEPEND}"
debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: DEPEND (only) is ${DEPEND}"
debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: RDEPEND (only) is ${RDEPEND}"
+debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: PDEPEND is ${PDEPEND}"
# Accumulate dependencies set by this eclass
DEPEND+=" ${COMMONDEPEND}"
1.34 eclass/kde4-functions.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-functions.eclass?rev=1.34&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-functions.eclass?rev=1.34&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-functions.eclass?r1=1.33&r2=1.34
Index: kde4-functions.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- kde4-functions.eclass 9 Aug 2010 15:59:04 -0000 1.33
+++ kde4-functions.eclass 9 Sep 2010 17:02:30 -0000 1.34
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v 1.33 2010/08/09 15:59:04 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v 1.34 2010/09/09 17:02:30 reavertm Exp $
inherit versionator
@@ -517,6 +517,14 @@
local use=${2:+,${2}}
- echo " !kdeprefix? ( >=kde-base/${1}-${PV}[aqua=,-kdeprefix${use}] )"
- echo " kdeprefix? ( >=kde-base/${1}-${PV}:${SLOT}[aqua=,kdeprefix${use}] )"
+ if [[ ${KDEBASE} = kde-base ]]; then
+ echo " !kdeprefix? ( >=kde-base/${1}-${PV}[aqua=,-kdeprefix${use}] )"
+ echo " kdeprefix? ( >=kde-base/${1}-${PV}:${SLOT}[aqua=,kdeprefix${use}] )"
+ else
+ if [[ ${KDE_MINIMAL} = live ]]; then
+ echo " kde-base/${1}:${KDE_MINIMAL}[aqua=${use}]"
+ else
+ echo " >=kde-base/${1}-${KDE_MINIMAL}[aqua=${use}]"
+ fi
+ fi
}
^ permalink raw reply [flat|nested] 10+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: kde4-base.eclass kde4-functions.eclass
@ 2009-09-01 9:32 Tomas Chvatal (scarabeus)
0 siblings, 0 replies; 10+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2009-09-01 9:32 UTC (permalink / raw
To: gentoo-commits
scarabeus 09/09/01 09:32:08
Modified: kde4-base.eclass kde4-functions.eclass
Log:
Sync kde4 eclasses with overlay ones in preparation for 4.3.1.
One thing differ from overlay ones. KDE_MINIMAL sets still 4.2 instead of 4.3 because some archies did not keyword all kde-base YET!
Revision Changes Path
1.45 eclass/kde4-base.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-base.eclass?rev=1.45&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-base.eclass?rev=1.45&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-base.eclass?r1=1.44&r2=1.45
Index: kde4-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- kde4-base.eclass 20 Aug 2009 09:18:01 -0000 1.44
+++ kde4-base.eclass 1 Sep 2009 09:32:08 -0000 1.45
@@ -1,6 +1,6 @@
# Copyright 2007-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.44 2009/08/20 09:18:01 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.45 2009/09/01 09:32:08 scarabeus Exp $
# @ECLASS: kde4-base.eclass
# @MAINTAINER:
@@ -88,7 +88,7 @@
# @ECLASS-VARIABLE: KDE_MINIMAL
# @DESCRIPTION:
# This variable is used when KDE_REQUIRED is set, to specify required KDE minimal
-# version for apps to work. Currently defaults to 4.2
+# version for apps to work. Currently defaults to 4.3
# One may override this variable to raise version requirements.
# For possible values look at KDE_SLOTS and KDE_LIVE_SLOTS variables.
# Note that it is fixed to ${SLOT} for kde-base packages.
@@ -193,6 +193,7 @@
9999*) SLOT="live" ;; # regular live
*) die "Unsupported ${PV}" ;;
esac
+ KDE_MINIMAL="${SLOT}"
_kdedir="${SLOT}"
_pv="-${PV}:${SLOT}"
_pvn="-${PV}"
@@ -229,15 +230,25 @@
)
"
if [[ ${PN} != kdelibs ]]; then
+ [[ ${PN} != libknotificationitem ]] && slot_is_at_least 4.3 ${KDE_MINIMAL} && local libknotificationitem_required=1
if [[ ${KDEBASE} = kde-base ]]; then
kdecommondepend+="
kdeprefix? ( >=kde-base/kdelibs${_pv}[kdeprefix] )
!kdeprefix? ( >=kde-base/kdelibs${_pvn}[-kdeprefix] )
"
+ [[ -n ${libknotificationitem_required} ]] && \
+ kdecommondepend+="
+ kdeprefix? ( >=kde-base/libknotificationitem${_pv}[kdeprefix] )
+ !kdeprefix? ( >=kde-base/libknotificationitem${_pvn}[-kdeprefix] )
+ "
else
kdecommondepend+="
>=kde-base/kdelibs${_pv}
"
+ [[ -n ${libknotificationitem_required} ]] && \
+ kdecommondepend+="
+ >=kde-base/libknotificationitem${_pv}
+ "
fi
fi
unset _pv _pvn
@@ -538,6 +549,7 @@
# Shadow existing /usr installations
unset KDEDIRS
+ # Handle kdeprefix-ed KDE
if [[ ${KDEDIR} != "${EROOT}usr" ]]; then
# Override some environment variables - only when kdeprefix is different,
# to not break ccache/distcc
@@ -546,13 +558,14 @@
# Append full RPATH
cmakeargs+=" -DCMAKE_SKIP_RPATH=OFF"
- fi
- if has kdeprefix ${IUSE//+} && use kdeprefix; then
- # Set cmake prefixes to allow buildsystem to localize valid KDE installation
+ # Set cmake prefixes to allow buildsystem to locate valid KDE installation
# when more are present
cmakeargs+=" -DCMAKE_SYSTEM_PREFIX_PATH=${KDEDIR}"
- else
+ fi
+
+ # Handle kdeprefix in application itself
+ if ! has kdeprefix ${IUSE//+} || ! use kdeprefix; then
# If prefix is /usr, sysconf needs to be /etc, not /usr/etc
cmakeargs+=" -DSYSCONF_INSTALL_DIR=${EROOT}etc"
fi
1.24 eclass/kde4-functions.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-functions.eclass?rev=1.24&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-functions.eclass?rev=1.24&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-functions.eclass?r1=1.23&r2=1.24
Index: kde4-functions.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- kde4-functions.eclass 20 Aug 2009 09:18:01 -0000 1.23
+++ kde4-functions.eclass 1 Sep 2009 09:32:08 -0000 1.24
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v 1.23 2009/08/20 09:18:01 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v 1.24 2009/09/01 09:32:08 scarabeus Exp $
# Prefix compat:
: ${EROOT:=${ROOT}}
@@ -44,13 +44,23 @@
# @DESCRIPTION:
# The slots used by all KDE versions later than 4.0. The live KDE releases use
# KDE_LIVE_SLOTS instead. Values should be ordered.
-KDE_SLOTS=( "kde-4" "4.1" "4.2" "4.3" "4.4" )
+KDE_SLOTS=( "4.1" "4.2" "4.3" "4.4" )
# @ECLASS-VARIABLE: KDE_LIVE_SLOTS
# @DESCRIPTION:
# The slots used by KDE live versions. Values should be ordered.
KDE_LIVE_SLOTS=( "live" )
+# @FUNCTION: slot_is_at_least
+# @USAGE: <want> <have>
+# @DESCRIPTION:
+# Version aware slot comparator.
+# Current implementation relies on the fact, that slots can be compared like
+# string literals (and let's keep it this way).
+slot_is_at_least() {
+ [[ "${2}" > "${1}" || "${2}" = "${1}" ]]
+}
+
# @FUNCTION: buildsycoca
# @DESCRIPTION:
# Function to rebuild the KDE System Configuration Cache.
@@ -360,10 +370,9 @@
# Create blocks for the current package in other slots when
# installed with USE=-kdeprefix
block_other_slots() {
- local slot
-
debug-print-function ${FUNCNAME} "$@"
+ local slot
for slot in ${KDE_SLOTS[@]} ${KDE_LIVE_SLOTS[@]}; do
# Block non kdeprefix ${PN} on other slots
if [[ ${SLOT} != ${slot} ]]; then
@@ -379,11 +388,10 @@
# Parameters are package and version to block.
# add_blocker kde-base/kdelibs 4.2.4
add_blocker() {
- local slot
-
debug-print-function ${FUNCNAME} "$@"
[[ ${1} = "" || ${2} = "" ]] && die "Missing parameter"
+ local slot
for slot in ${KDE_SLOTS[@]} ${KDE_LIVE_SLOTS[@]}; do
# on -kdeprefix we block every slot
RDEPEND+=" !kdeprefix? ( !<=${1}-${2}:${slot}[-kdeprefix] )"
^ permalink raw reply [flat|nested] 10+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: kde4-base.eclass kde4-functions.eclass
@ 2009-02-10 20:07 Tomas Chvatal (scarabeus)
0 siblings, 0 replies; 10+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2009-02-10 20:07 UTC (permalink / raw
To: gentoo-commits
scarabeus 09/02/10 20:07:24
Modified: kde4-base.eclass kde4-functions.eclass
Log:
Make NEED_KDE=none packages pick correct kdedir :] Fixed thanks to Tomáš Caithaml and pva for helping with this. Per bug #257616.
Revision Changes Path
1.29 eclass/kde4-base.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-base.eclass?rev=1.29&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-base.eclass?rev=1.29&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-base.eclass?r1=1.28&r2=1.29
Index: kde4-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- kde4-base.eclass 2 Feb 2009 21:35:08 -0000 1.28
+++ kde4-base.eclass 10 Feb 2009 20:07:24 -0000 1.29
@@ -1,6 +1,6 @@
# Copyright 2007-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.28 2009/02/02 21:35:08 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.29 2009/02/10 20:07:24 scarabeus Exp $
# @ECLASS: kde4-base.eclass
# @MAINTAINER:
@@ -439,17 +439,15 @@
# Search for best suitable kde installation for misc kde package.
# Computation based on NEED_KDE and KDE_MINIMAL
- get_latest_kdedir
+ [[ ${NEED_KDE} = latest || ${NEED_KDE} = none ]] && get_latest_kdedir
- if [[ $NEED_KDE != none ]]; then
- # Set PREFIX
- if use kdeprefix; then
- KDEDIR="/usr/kde/${_kdedir}"
- KDEDIRS="/usr/local/:/usr:${KDEDIR}"
- else
- KDEDIR="/usr"
- KDEDIRS="/usr/local/:/usr"
- fi
+ # Set PREFIX
+ if use kdeprefix; then
+ KDEDIR="/usr/kde/${_kdedir}"
+ KDEDIRS="/usr/local/:/usr:${KDEDIR}"
+ else
+ KDEDIR="/usr"
+ KDEDIRS="/usr/local/:/usr"
fi
# Set the prefix based on KDEDIR
# Make it a consequence of kdeprefix
1.12 eclass/kde4-functions.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-functions.eclass?rev=1.12&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-functions.eclass?rev=1.12&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-functions.eclass?r1=1.11&r2=1.12
Index: kde4-functions.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- kde4-functions.eclass 12 Jan 2009 19:40:34 -0000 1.11
+++ kde4-functions.eclass 10 Feb 2009 20:07:24 -0000 1.12
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v 1.11 2009/01/12 19:40:34 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v 1.12 2009/02/10 20:07:24 scarabeus Exp $
# @ECLASS: kde4-functions.eclass
# @MAINTAINER:
@@ -226,45 +226,43 @@
# We can check for kdelibs because it is the most basic package; no KDE package
# working without it. This might be changed in future.
get_latest_kdedir() {
- if [[ $NEED_KDE = latest && $KDEBASE != kde-base ]]; then
- case ${KDE_WANTED} in
- # note this will need to be updated as stable moves and so on
- live)
- _versions="9999 4.1.69 4.1.0"
- ;;
- snapshot)
- _versions="4.1.69 4.1.0 9999"
+ case ${KDE_WANTED} in
+ # note this will need to be updated as stable moves and so on
+ live)
+ _versions="9999 4.1.69 4.1.0"
+ ;;
+ snapshot)
+ _versions="4.1.69 4.1.0 9999"
+ ;;
+ testing)
+ _versions="4.1.0 4.1.69 9999"
+ ;;
+ stable)
+ _versions="4.1.0 4.1.69 9999"
+ ;;
+ *) die "KDE_WANTED=${KDE_WANTED} not supported here." ;;
+ esac
+ # check if exists and fallback as we go
+ for X in ${_versions}; do
+ if has_version ">=kde-base/kdelibs-${X}"; then
+ # figure out which X we are in and set it into _kdedir
+ case ${X} in
+ # also keep track here same for kde_wanted
+ 9999)
+ _kdedir="live"
+ break
;;
- testing)
- _versions="4.1.0 4.1.69 9999"
+ 4.1.69)
+ _kdedir="4.2"
+ break
;;
- stable)
- _versions="4.1.0 4.1.69 9999"
+ 4.1.0)
+ _kdedir="4.1"
+ break
;;
- *) die "KDE_WANTED=${KDE_WANTED} not supported here." ;;
- esac
- # check if exists and fallback as we go
- for X in ${_versions}; do
- if has_version ">=kde-base/kdelibs-${X}"; then
- # figure out which X we are in and set it into _kdedir
- case ${X} in
- # also keep track here same for kde_wanted
- 9999)
- _kdedir="live"
- break
- ;;
- 4.1.69)
- _kdedir="4.2"
- break
- ;;
- 4.1.0)
- _kdedir="4.1"
- break
- ;;
- esac
- fi
- done
- fi
+ esac
+ fi
+ done
}
# @FUNCTION: migrate_store_dir
^ permalink raw reply [flat|nested] 10+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: kde4-base.eclass kde4-functions.eclass
@ 2008-05-17 14:09 Bo Oersted Andresen (zlin)
0 siblings, 0 replies; 10+ messages in thread
From: Bo Oersted Andresen (zlin) @ 2008-05-17 14:09 UTC (permalink / raw
To: gentoo-commits
zlin 08/05/17 14:09:04
Modified: kde4-base.eclass kde4-functions.eclass
Log:
Actually convert to an array... Bug #216863.
Revision Changes Path
1.12 eclass/kde4-base.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-base.eclass?rev=1.12&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-base.eclass?rev=1.12&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-base.eclass?r1=1.11&r2=1.12
Index: kde4-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- kde4-base.eclass 15 May 2008 19:49:32 -0000 1.11
+++ kde4-base.eclass 17 May 2008 14:09:03 -0000 1.12
@@ -1,6 +1,6 @@
# Copyright 2007-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.11 2008/05/15 19:49:32 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.12 2008/05/17 14:09:03 zlin Exp $
# @ECLASS: kde4-base.eclass
# @MAINTAINER:
@@ -299,7 +299,7 @@
[[ -z ${line} ]] && continue
kde4_built_with_use_check+=("${line}")
done <<< "${KDE4_BUILT_WITH_USE_CHECK}"
- KDE4_BUILT_WITH_USE_CHECK="${kde4_built_with_use_check[@]}"
+ KDE4_BUILT_WITH_USE_CHECK=("${kde4_built_with_use_check[@]}")
fi
# KDE4 applications require qt4 compiled with USE="accessibility dbus gif jpeg png qt3support ssl zlib".
1.7 eclass/kde4-functions.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-functions.eclass?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-functions.eclass?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-functions.eclass?r1=1.6&r2=1.7
Index: kde4-functions.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- kde4-functions.eclass 15 May 2008 19:49:32 -0000 1.6
+++ kde4-functions.eclass 17 May 2008 14:09:03 -0000 1.7
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v 1.6 2008/05/15 19:49:32 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v 1.7 2008/05/17 14:09:03 zlin Exp $
# @ECLASS: kde4-functions.eclass
# @MAINTAINER:
@@ -504,7 +504,7 @@
kde4-functions_check_use() {
# I like to keep flags sorted
QT4_BUILT_WITH_USE_CHECK=$(echo "${QT4_BUILT_WITH_USE_CHECK}" | \
- tr '[:space:]' '\n' | sort | xargs)
+ tr '[:space:]' '\n' | sort | uniq | xargs)
local line missing
if [[ -n ${KDE4_BUILT_WITH_USE_CHECK[@]} && $(declare -p KDE4_BUILT_WITH_USE_CHECK) = 'declare -a '* ]]; then
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 10+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: kde4-base.eclass kde4-functions.eclass
@ 2008-04-04 22:15 Bo Oersted Andresen (zlin)
0 siblings, 0 replies; 10+ messages in thread
From: Bo Oersted Andresen (zlin) @ 2008-04-04 22:15 UTC (permalink / raw
To: gentoo-commits
zlin 08/04/04 22:15:24
Modified: kde4-base.eclass kde4-functions.eclass
Log:
Add support for making PATCHES an array for proper quoting. Add KDE_LINGUAS support to kde4-functions.eclass and use it in kde4-base.eclass in the unpack phase.
Revision Changes Path
1.8 eclass/kde4-base.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-base.eclass?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-base.eclass?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-base.eclass?r1=1.7&r2=1.8
Index: kde4-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- kde4-base.eclass 3 Apr 2008 18:12:48 -0000 1.7
+++ kde4-base.eclass 4 Apr 2008 22:15:24 -0000 1.8
@@ -1,6 +1,6 @@
# Copyright 2007-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.7 2008/04/03 18:12:48 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.8 2008/04/04 22:15:24 zlin Exp $
# @ECLASS: kde4-base.eclass
# @MAINTAINER:
@@ -350,7 +350,8 @@
# Apply ${PN}-${PV}-*{diff,patch}
# @CODE
#
-# If ${PATCHES} is non-zero all patches in it gets applied.
+# If ${PATCHES} is non-zero all patches in it get applied. If there is more
+# than one patch please make ${PATCHES} an array for proper quoting.
kde4-base_apply_patches() {
local _patchdir _packages _p
_patchdir="${WORKDIR}/patches/"
@@ -361,14 +362,23 @@
else
_packages="${PN}"
fi
- for _p in ${_packages}; do
- PATCHES="${PATCHES} $(ls ${_patchdir}/${_p}-${PV}-*{diff,patch} 2>/dev/null)"
- if [[ -n "${KDEBASE}" ]]; then
- PATCHES="${PATCHES} $(ls ${_patchdir}/${_p}-${SLOT}-*{diff,patch} 2>/dev/null)"
- fi
- done
+ if [[ ${#PATCHES[@]} -gt 1 ]]; then
+ for _p in ${_packages}; do
+ PATCHES=( "${PATCHES[@]}" $(ls ${_patchdir}/${_p}-${PV}-*{diff,patch} 2>/dev/null) )
+ if [[ -n "${KDEBASE}" ]]; then
+ PATCHES=( "${PATCHES[@]}" $(ls ${_patchdir}/${_p}-${SLOT}-*{diff,patch} 2>/dev/null) )
+ fi
+ done
+ else
+ for _p in ${_packages}; do
+ PATCHES="${PATCHES} $(ls ${_patchdir}/${_p}-${PV}-*{diff,patch} 2>/dev/null)"
+ if [[ -n "${KDEBASE}" ]]; then
+ PATCHES="${PATCHES} $(ls ${_patchdir}/${_p}-${SLOT}-*{diff,patch} 2>/dev/null)"
+ fi
+ done
+ fi
fi
- [[ -n ${PATCHES} ]] && base_src_unpack autopatch
+ [[ -n ${PATCHES[@]} ]] && base_src_unpack autopatch
}
# @FUNCTION: kde4-base_src_unpack
@@ -380,6 +390,9 @@
#
# In addition it calls kde4-base_apply_patches when no arguments are passed to
# this function.
+#
+# It also handles translations if KDE_LINGUAS is defined. See KDE_LINGUAS and
+# enable_selected_linguas() in kde4-functions.eclass(5) for further details.
kde4-base_src_unpack() {
debug-print-function $FUNCNAME "$@"
@@ -404,6 +417,11 @@
ln -s "${WORKDIR}/cmake" "${KDE_S}/cmake" || die "Unable to symlink the new cmake/ directory"
eend 0
fi
+
+ # Only enable selected languages, used for KDE extragear apps.
+ if [[ -n ${KDE_LINGUAS} ]]; then
+ enable_selected_linguas
+ fi
}
# @FUNCTION: kde4-base_src_compile
1.5 eclass/kde4-functions.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-functions.eclass?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-functions.eclass?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-functions.eclass?r1=1.4&r2=1.5
Index: kde4-functions.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- kde4-functions.eclass 13 Mar 2008 17:57:51 -0000 1.4
+++ kde4-functions.eclass 4 Apr 2008 22:15:24 -0000 1.5
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v 1.4 2008/03/13 17:57:51 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v 1.5 2008/04/04 22:15:24 zlin Exp $
# @ECLASS: kde4-functions.eclass
# @MAINTAINER:
@@ -401,6 +401,35 @@
die "${LINENO}: Initial sed died"
}
+# @ECLASS-VARIABLE: KDE_LINGUAS
+# @DESCRIPTION:
+# This is a whitespace-separated list of translations that this ebuild supports.
+# These translations automatically get added to IUSE. Therefore ebuilds must set
+# this variable before inheriting any eclasses. To only enable selected
+# translations ebuilds must call enable_selected_linguas(). kde4-base.eclass does
+# this for you.
+#
+# Example: KDE_LINGUAS="en_GB de nl"
+for _lingua in ${KDE_LINGUAS}; do
+ IUSE="${IUSE} linguas_${_lingua}"
+done
+
+# @FUNCTION: enable_selected_linguas
+# @DESCRIPTION:
+# Enable translations based on LINGUAS settings and what translations are
+# supported (see KDE_LINGUAS). By default translations are found in "${S}"/po
+# but this default can be overridden by defining KDE_LINGUAS_DIR.
+enable_selected_linguas() {
+ local lingua
+ comment_all_add_subdirectory "${KDE_LINGUAS_DIR:-${S}/po}"
+ for lingua in ${KDE_LINGUAS}; do
+ if use linguas_${lingua}; then
+ sed -e "/add_subdirectory(\s*${lingua}\s*)\s*$/ s/^#DONOTCOMPILE //" \
+ -i "${KDE_LINGUAS_DIR:-${S}/po}"/CMakeLists.txt || die "Sed to uncomment linguas_${lingua} failed."
+ fi
+ done
+}
+
# @ECLASS-VARIABLE: QT4_BUILT_WITH_USE_CHECK
# @DESCRIPTION:
# A list of USE flags that x11-libs/qt:4 needs to be built with.
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2011-01-28 5:05 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-01-28 5:05 [gentoo-commits] gentoo-x86 commit in eclass: kde4-base.eclass kde4-functions.eclass Theo Chatzimichos (tampakrap)
-- strict thread matches above, loose matches on Subject: below --
2011-01-03 20:36 Andreas HAttel (dilfridge)
2010-12-29 16:45 Theo Chatzimichos (tampakrap)
2010-12-06 10:17 Theo Chatzimichos (tampakrap)
2010-10-24 15:56 Theo Chatzimichos (tampakrap)
2010-09-09 17:02 Maciej Mrozowski (reavertm)
2009-09-01 9:32 Tomas Chvatal (scarabeus)
2009-02-10 20:07 Tomas Chvatal (scarabeus)
2008-05-17 14:09 Bo Oersted Andresen (zlin)
2008-04-04 22:15 Bo Oersted Andresen (zlin)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox