* [gentoo-commits] gentoo-x86 commit in eclass: kde4-base.eclass kde4-meta.eclass
@ 2009-01-03 18:20 Tomas Chvatal (scarabeus)
0 siblings, 0 replies; 8+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2009-01-03 18:20 UTC (permalink / raw
To: gentoo-commits
scarabeus 09/01/03 18:20:00
Modified: kde4-base.eclass kde4-meta.eclass
Log:
Add kde4-{base,meta}_src_prepare functions. Actualy does only one "echo", for enabling transition to new eclass which uses src_prepare heavily.
NOTE: every package you spot in tree using kde4 eclasses and not calling src_prepare will seriously break if we miss them, so if you yourself have such package just add the function call.
Thankies.
Revision Changes Path
1.20 eclass/kde4-base.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-base.eclass?rev=1.20&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-base.eclass?rev=1.20&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-base.eclass?r1=1.19&r2=1.20
Index: kde4-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- kde4-base.eclass 7 Dec 2008 11:39:32 -0000 1.19
+++ kde4-base.eclass 3 Jan 2009 18:20:00 -0000 1.20
@@ -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.19 2008/12/07 11:39:32 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.20 2009/01/03 18:20:00 scarabeus Exp $
# @ECLASS: kde4-base.eclass
# @MAINTAINER:
@@ -18,7 +18,7 @@
case "${EAPI}" in
2)
- EXPORT_FUNCTIONS pkg_setup src_unpack src_configure src_compile src_test src_install pkg_postinst pkg_postrm
+ EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_configure src_compile src_test src_install pkg_postinst pkg_postrm
;;
*)
EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_test src_install pkg_postinst pkg_postrm
@@ -533,6 +533,12 @@
fi
}
+
+# transition function so we will be compatible with soon to come eclasses
+kde4-base_src_prepare() {
+ echo
+}
+
# @FUNCTION: kde4-base_src_compile
# @DESCRIPTION:
# General function for compiling KDE4 applications.
1.8 eclass/kde4-meta.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-meta.eclass?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-meta.eclass?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-meta.eclass?r1=1.7&r2=1.8
Index: kde4-meta.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- kde4-meta.eclass 2 Oct 2008 06:49:02 -0000 1.7
+++ kde4-meta.eclass 3 Jan 2009 18:20:00 -0000 1.8
@@ -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-meta.eclass,v 1.7 2008/10/02 06:49:02 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.8 2009/01/03 18:20:00 scarabeus Exp $
#
# @ECLASS: kde4-meta.eclass
# @MAINTAINER:
@@ -19,7 +19,7 @@
case "${EAPI}" in
2)
- EXPORT_FUNCTIONS pkg_setup src_unpack src_configure src_compile src_test src_install pkg_postinst pkg_postrm
+ EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_configure src_compile src_test src_install pkg_postinst pkg_postrm
;;
*)
EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_test src_install pkg_postinst pkg_postrm
@@ -513,6 +513,11 @@
popd > /dev/null
}
+# transition function so we will work with soon to come eclasses.
+kde4-meta_src_prepare() {
+ kde4-base_src_prepare
+}
+
# @FUNCTION: kde4-meta_src_configure
# @DESCRIPTION:
# Currently just calls its equivalent in kde4-base.eclass(5). Use this in split
^ permalink raw reply [flat|nested] 8+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: kde4-base.eclass kde4-meta.eclass
@ 2009-08-07 1:00 Alex Alexander (wired)
0 siblings, 0 replies; 8+ messages in thread
From: Alex Alexander (wired) @ 2009-08-07 1:00 UTC (permalink / raw
To: gentoo-commits
wired 09/08/07 01:00:11
Modified: kde4-base.eclass kde4-meta.eclass
Log:
moved license/homepage stuff from kde4-meta to kde4-base
Revision Changes Path
1.43 eclass/kde4-base.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-base.eclass?rev=1.43&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-base.eclass?rev=1.43&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-base.eclass?r1=1.42&r2=1.43
Index: kde4-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- kde4-base.eclass 3 Aug 2009 21:59:53 -0000 1.42
+++ kde4-base.eclass 7 Aug 2009 01:00:11 -0000 1.43
@@ -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.42 2009/08/03 21:59:53 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.43 2009/08/07 01:00:11 wired Exp $
# @ECLASS: kde4-base.eclass
# @MAINTAINER:
@@ -22,6 +22,17 @@
EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_configure src_compile src_test src_install pkg_postinst pkg_postrm
+case ${KDEBASE} in
+ kde-base)
+ HOMEPAGE="http://www.kde.org/"
+ LICENSE="GPL-2"
+ ;;
+ koffice)
+ HOMEPAGE="http://www.koffice.org/"
+ LICENSE="GPL-2"
+ ;;
+esac
+
# @ECLASS-VARIABLE: OPENGL_REQUIRED
# @DESCRIPTION:
# Is qt-opengl required? Possible values are 'always', 'optional' and 'never'.
1.24 eclass/kde4-meta.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-meta.eclass?rev=1.24&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-meta.eclass?rev=1.24&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-meta.eclass?r1=1.23&r2=1.24
Index: kde4-meta.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- kde4-meta.eclass 3 Aug 2009 21:59:53 -0000 1.23
+++ kde4-meta.eclass 7 Aug 2009 01:00:11 -0000 1.24
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.23 2009/08/03 21:59:53 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.24 2009/08/07 01:00:11 wired Exp $
#
# @ECLASS: kde4-meta.eclass
# @MAINTAINER:
@@ -20,17 +20,6 @@
die "kde4-meta.eclass inherited but KMNAME not defined - broken ebuild"
fi
-case ${KDEBASE} in
- kde-base)
- HOMEPAGE="http://www.kde.org/"
- LICENSE="GPL-2"
- ;;
- koffice)
- HOMEPAGE="http://www.koffice.org/"
- LICENSE="GPL-2"
- ;;
-esac
-
# Add khelpcenter dependency when installing handbooks
if [[ ${PN} != khelpcenter ]] && has handbook ${IUSE//+}; then
RDEPEND+=" handbook? ( >=kde-base/khelpcenter-${PV}:${SLOT}[kdeprefix=] )"
^ permalink raw reply [flat|nested] 8+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: kde4-base.eclass kde4-meta.eclass
@ 2009-12-02 17:07 Jonathan Callen (abcd)
0 siblings, 0 replies; 8+ messages in thread
From: Jonathan Callen (abcd) @ 2009-12-02 17:07 UTC (permalink / raw
To: gentoo-commits
abcd 09/12/02 17:07:05
Modified: kde4-base.eclass kde4-meta.eclass
Log:
Update kde4 eclasses from overlay
Revision Changes Path
1.55 eclass/kde4-base.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-base.eclass?rev=1.55&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-base.eclass?rev=1.55&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-base.eclass?r1=1.54&r2=1.55
Index: kde4-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- kde4-base.eclass 1 Dec 2009 10:56:17 -0000 1.54
+++ kde4-base.eclass 2 Dec 2009 17:07:05 -0000 1.55
@@ -1,6 +1,6 @@
# Copyright 1999-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.54 2009/12/01 10:56:17 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.55 2009/12/02 17:07:05 abcd Exp $
# @ECLASS: kde4-base.eclass
# @MAINTAINER:
@@ -146,7 +146,7 @@
# Currently defaults to 4.5.1 for KDE 4.3 and earlier
# or 4.6.0_rc1 for KDE 4.4 and later
if slot_is_at_least 4.4 "${KDE_MINIMAL}"; then
- QT_MINIMAL="${QT_MINIMAL:-4.6.0_rc1}"
+ QT_MINIMAL="${QT_MINIMAL:-4.6.0}"
fi
QT_MINIMAL="${QT_MINIMAL:-4.5.1}"
@@ -240,7 +240,7 @@
kdedepend="
dev-util/pkgconfig
!aqua? (
- x11-proto/xextproto
+ || ( >=x11-libs/libXtst-1.1.0 <x11-proto/xextproto-7.1.0 )
x11-proto/xf86vidmodeproto
)
"
@@ -364,7 +364,7 @@
case ${KDEBASE} in
kde-base)
case ${PV} in
- 4.3.85 | 4.3.9[0568])
+ 4.3.8[05] | 4.3.9[0568])
# block for normally packed unstable releases
SRC_URI="mirror://kde/unstable/${PV}/src/${_kmname_pv}.tar.bz2" ;;
4.3.[6-9]*)
1.29 eclass/kde4-meta.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-meta.eclass?rev=1.29&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-meta.eclass?rev=1.29&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-meta.eclass?r1=1.28&r2=1.29
Index: kde4-meta.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- kde4-meta.eclass 1 Dec 2009 10:56:17 -0000 1.28
+++ kde4-meta.eclass 2 Dec 2009 17:07:05 -0000 1.29
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.28 2009/12/01 10:56:17 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.29 2009/12/02 17:07:05 abcd Exp $
#
# @ECLASS: kde4-meta.eclass
# @MAINTAINER:
@@ -20,6 +20,11 @@
die "kde4-meta.eclass inherited but KMNAME not defined - broken ebuild"
fi
+# Add khelpcenter dependency when installing handbooks
+if [[ ${PN} != khelpcenter ]] && has handbook ${IUSE//+}; then
+ RDEPEND+=" handbook? ( $(add_kdebase_dep khelpcenter) )"
+fi
+
# Add dependencies that all packages in a certain module share.
case ${KMNAME} in
kdebase|kdebase-apps|kdebase-workspace|kdebase-runtime|kdegraphics)
@@ -208,7 +213,7 @@
else
local abort tarball tarfile f extractlist moduleprefix postfix
case ${PV} in
- 4.3.85 | 4.3.9[0568])
+ 4.3.8[05] | 4.3.9[0568])
# block for normally packed upstream unstable snapshots
KMTARPARAMS+=" --bzip2" # bz2
postfix="bz2"
^ permalink raw reply [flat|nested] 8+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: kde4-base.eclass kde4-meta.eclass
@ 2010-05-17 1:16 Maciej Mrozowski (reavertm)
0 siblings, 0 replies; 8+ messages in thread
From: Maciej Mrozowski (reavertm) @ 2010-05-17 1:16 UTC (permalink / raw
To: gentoo-commits
reavertm 10/05/17 01:16:39
Modified: kde4-base.eclass kde4-meta.eclass
Log:
Improve automatic misc documentation files installation (README's, ChangeLogs, etc)
Revision Changes Path
1.62 eclass/kde4-base.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.62&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.62&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?r1=1.61&r2=1.62
Index: kde4-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- kde4-base.eclass 15 May 2010 15:19:04 -0000 1.61
+++ kde4-base.eclass 17 May 2010 01:16:39 -0000 1.62
@@ -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.61 2010/05/15 15:19:04 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.62 2010/05/17 01:16:39 reavertm Exp $
# @ECLASS: kde4-base.eclass
# @MAINTAINER:
@@ -725,19 +725,12 @@
# Install common documentation of KDE4 applications
local doc
if ! has kde4-meta ${INHERITED}; then
- for doc in AUTHORS ChangeLog* README* NEWS TODO HACKING; do
- [[ -s "${S}/${doc}" ]] && dodoc "${doc}"
+ for doc in "${S}"/{AUTHORS,CHANGELOG,ChangeLog*,README*,NEWS,TODO,HACKING}; do
+ [[ -s "${doc}" ]] && dodoc "${doc}"
+ done
+ for doc in "${S}"/*/{AUTHORS,CHANGELOG,ChangeLog*,README*,NEWS,TODO,HACKING}; do
+ [[ -s "${doc}" ]] && newdoc "${doc}" "$(basename $(dirname ${doc})).$(basename ${doc})"
done
- # kdelibs, kdepimlibs
- if [[ -z ${KMNAME} ]]; then
- for doc in "${S}"/*/{AUTHORS,ChangeLog*,README*,NEWS,TODO,HACKING}; do
- if [[ -s "${S}/${doc}" ]]; then
- local doc_complete=${doc}
- doc="${doc#*/}"
- newdoc "$doc_complete" "${doc%/*}.${doc##*/}"
- fi
- done
- fi
fi
cmake-utils_src_install
1.37 eclass/kde4-meta.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-meta.eclass?rev=1.37&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-meta.eclass?rev=1.37&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-meta.eclass?r1=1.36&r2=1.37
Index: kde4-meta.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- kde4-meta.eclass 15 May 2010 16:51:46 -0000 1.36
+++ kde4-meta.eclass 17 May 2010 01:16:39 -0000 1.37
@@ -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-meta.eclass,v 1.36 2010/05/15 16:51:46 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.37 2010/05/17 01:16:39 reavertm Exp $
#
# @ECLASS: kde4-meta.eclass
# @MAINTAINER:
@@ -711,10 +711,10 @@
kde4-meta_src_install() {
debug-print-function $FUNCNAME "$@"
- # Search ${S}/${KMMODULE} and install any "AUTHORS ChangeLog* README* NEWS TODO HACKING" found
+ # Search ${S}/${KMMODULE} and install common documentation files found
local doc
- for doc in AUTHORS ChangeLog* README* NEWS TODO HACKING; do
- [[ -s "${S}/${KMMODULE}/${doc}" ]] && dodoc "${S}/${KMMODULE}/${doc}"
+ for doc in "${S}/${KMMODULE}"/{AUTHORS,CHANGELOG,ChangeLog*,README*,NEWS,TODO,HACKING}; do
+ [[ -s "${doc}" ]] && dodoc "${doc}"
done
kde4-base_src_install
^ permalink raw reply [flat|nested] 8+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: kde4-base.eclass kde4-meta.eclass
@ 2010-06-22 13:49 Maciej Mrozowski (reavertm)
0 siblings, 0 replies; 8+ messages in thread
From: Maciej Mrozowski (reavertm) @ 2010-06-22 13:49 UTC (permalink / raw
To: gentoo-commits
reavertm 10/06/22 13:49:08
Modified: kde4-base.eclass kde4-meta.eclass
Log:
Check whether misc files (README's and such) are actually regular files
Revision Changes Path
1.63 eclass/kde4-base.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.63&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.63&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?r1=1.62&r2=1.63
Index: kde4-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- kde4-base.eclass 17 May 2010 01:16:39 -0000 1.62
+++ kde4-base.eclass 22 Jun 2010 13:49:08 -0000 1.63
@@ -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.62 2010/05/17 01:16:39 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.63 2010/06/22 13:49:08 reavertm Exp $
# @ECLASS: kde4-base.eclass
# @MAINTAINER:
@@ -726,10 +726,10 @@
local doc
if ! has kde4-meta ${INHERITED}; then
for doc in "${S}"/{AUTHORS,CHANGELOG,ChangeLog*,README*,NEWS,TODO,HACKING}; do
- [[ -s "${doc}" ]] && dodoc "${doc}"
+ [[ -f "${doc}" ]] && [[ -s "${doc}" ]] && dodoc "${doc}"
done
for doc in "${S}"/*/{AUTHORS,CHANGELOG,ChangeLog*,README*,NEWS,TODO,HACKING}; do
- [[ -s "${doc}" ]] && newdoc "${doc}" "$(basename $(dirname ${doc})).$(basename ${doc})"
+ [[ -f "${doc}" ]] && [[ -s "${doc}" ]] && newdoc "${doc}" "$(basename $(dirname ${doc})).$(basename ${doc})"
done
fi
1.38 eclass/kde4-meta.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-meta.eclass?rev=1.38&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-meta.eclass?rev=1.38&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-meta.eclass?r1=1.37&r2=1.38
Index: kde4-meta.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- kde4-meta.eclass 17 May 2010 01:16:39 -0000 1.37
+++ kde4-meta.eclass 22 Jun 2010 13:49:08 -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-meta.eclass,v 1.37 2010/05/17 01:16:39 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.38 2010/06/22 13:49:08 reavertm Exp $
#
# @ECLASS: kde4-meta.eclass
# @MAINTAINER:
@@ -714,7 +714,7 @@
# Search ${S}/${KMMODULE} and install common documentation files found
local doc
for doc in "${S}/${KMMODULE}"/{AUTHORS,CHANGELOG,ChangeLog*,README*,NEWS,TODO,HACKING}; do
- [[ -s "${doc}" ]] && dodoc "${doc}"
+ [[ -f "${doc}" ]] && [[ -s "${doc}" ]] && dodoc "${doc}"
done
kde4-base_src_install
^ permalink raw reply [flat|nested] 8+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: kde4-base.eclass kde4-meta.eclass
@ 2010-09-14 12:39 Maciej Mrozowski (reavertm)
0 siblings, 0 replies; 8+ messages in thread
From: Maciej Mrozowski (reavertm) @ 2010-09-14 12:39 UTC (permalink / raw
To: gentoo-commits
reavertm 10/09/14 12:39:51
Modified: kde4-base.eclass kde4-meta.eclass
Log:
Rework KDE_HANDBOOK=1 -> KDE_HANDBOOK->'always', 'optional'(USE=handbook), 'never'(default)
Revision Changes Path
1.74 eclass/kde4-base.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.74&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.74&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?r1=1.73&r2=1.74
Index: kde4-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- kde4-base.eclass 13 Sep 2010 21:47:37 -0000 1.73
+++ kde4-base.eclass 14 Sep 2010 12:39:51 -0000 1.74
@@ -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.73 2010/09/13 21:47:37 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.74 2010/09/14 12:39:51 reavertm Exp $
# @ECLASS: kde4-base.eclass
# @MAINTAINER:
@@ -141,15 +141,18 @@
# @DESCRIPTION:
# Is kde required? Possible values are 'always', 'optional' and 'never'.
# This variable must be set before inheriting any eclasses. Defaults to 'always'
-# If set to always or optional, KDE_MINIMAL may be overriden as well.
+# If set to 'always' or 'optional', KDE_MINIMAL may be overriden as well.
# 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"
+# Set to enable handbook in application. Possible values are 'always', 'optional'
+# (handbook USE flag) and 'never'.
+# This variable must be set before inheriting any eclasses. Defaults to 'never'.
+# It adds default handbook dirs for kde-base packages to KMEXTRA and in any case it
+# ensures buildtime and runtime dependencies.
+KDE_HANDBOOK="${KDE_HANDBOOK:-never}"
# Setup packages inheriting this eclass
case ${KDEBASE} in
@@ -318,16 +321,26 @@
"
kderdepend=""
-# Handbook handling - dependencies
-if [[ -n ${KDE_HANDBOOK} ]]; then
- kdedepend+="
- handbook? (
- app-text/docbook-xml-dtd:4.2
- app-text/docbook-xsl-stylesheets
- )
- "
- [[ ${PN} != kdelibs ]] && kderdepend+=" handbook? ( $(add_kdebase_dep khelpcenter) )"
-fi
+kdehandbookdepend="
+ app-text/docbook-xml-dtd:4.2
+ app-text/docbook-xsl-stylesheets
+"
+kdehandbookrdepend="
+ $(add_kdebase_dep kdelibs 'handbook')
+"
+case ${KDE_HANDBOOK} in
+ always)
+ kdedepend+=" ${kdehandbookdepend}"
+ [[ ${PN} != kdelibs ]] && kderdepend+=" ${kdehandbookrdepend}"
+ ;;
+ optional)
+ IUSE+=" +handbook"
+ kdedepend+=" handbook? ( ${kdehandbookdepend} )"
+ [[ ${PN} != kdelibs ]] && kderdepend+=" handbook? ( ${kdehandbookrdepend} )"
+ ;;
+ *) ;;
+esac
+unset kdehandbookdepend kdehandbookrdepend
case ${KDE_REQUIRED} in
always)
1.41 eclass/kde4-meta.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-meta.eclass?rev=1.41&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-meta.eclass?rev=1.41&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-meta.eclass?r1=1.40&r2=1.41
Index: kde4-meta.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- kde4-meta.eclass 11 Sep 2010 04:25:23 -0000 1.40
+++ kde4-meta.eclass 14 Sep 2010 12:39:51 -0000 1.41
@@ -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-meta.eclass,v 1.40 2010/09/11 04:25:23 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.41 2010/09/14 12:39:51 reavertm Exp $
#
# @ECLASS: kde4-meta.eclass
# @MAINTAINER:
@@ -108,10 +108,9 @@
# @DESCRIPTION:
# All subdirectories listed here will be extracted, compiled & installed.
# $KMMODULE is always added to $KMEXTRA.
-# If the handbook USE-flag is set, and if this directory exists,
-# then "doc/$KMMODULE" is added to $KMEXTRA. In other cases, this should be
-# handled in the ebuild.
-# If the documentation is in a different subdirectory, you should add it to KMEXTRA.
+# If KDE_HANDBOOK is 'always' or 'optional' and handbook USE-flag is set, and if this
+# directory exists, then "doc/$KMMODULE" is added to $KMEXTRA. If there's additional
+# documentation in different subdirectories, it should be added to KMEXTRA manually..
# @ECLASS-VARIABLE: KMCOMPILEONLY
# @DESCRIPTION:
@@ -282,14 +281,20 @@
kde4-meta_create_extractlists() {
debug-print-function ${FUNCNAME} "$@"
- # TODO change to KMEXTRA for more strict check
- if has handbook ${IUSE//+} && use handbook && [[ -n ${KMMODULE} ]]; then
+ # Add default handbook locations
+ # FIXME - legacy code - remove when 4.4.5 is gone or preferrably port 4.4.5.
+ if ! slot_is_at_least 4.5 ${SLOT} && has handbook ${IUSE//+} && use handbook && [[ -n ${KMMODULE} ]]; then
# We use the basename of $KMMODULE because $KMMODULE can contain
# the path to the module subdirectory.
KMEXTRA_NONFATAL+="
doc/${KMMODULE##*/}"
fi
+ # Add default handbook locations
+ if [[ -n ${KMMODULE} ]] && [[ ${KDE_HANDBOOK} = always ]] || { [[ ${KDE_HANDBOOK} = optional ]] && use handbook; }; then
+ KMEXTRA+=" doc/${KMMODULE##*/}"
+ fi
+
# Add some CMake-files to KMEXTRACTONLY.
# Note that this actually doesn't include KMEXTRA handling.
# In those cases you should care to add the relevant files to KMEXTRACTONLY
^ permalink raw reply [flat|nested] 8+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: kde4-base.eclass kde4-meta.eclass
@ 2011-05-01 13:52 Tomas Chvatal (scarabeus)
0 siblings, 0 replies; 8+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2011-05-01 13:52 UTC (permalink / raw
To: gentoo-commits
scarabeus 11/05/01 13:52:09
Modified: kde4-base.eclass kde4-meta.eclass
Log:
Rework the gcc checkup to be less time consuming and move to git-2 eclass
Revision Changes Path
1.91 eclass/kde4-base.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.91&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.91&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?r1=1.90&r2=1.91
Index: kde4-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- kde4-base.eclass 22 Apr 2011 18:48:03 -0000 1.90
+++ kde4-base.eclass 1 May 2011 13:52:09 -0000 1.91
@@ -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.90 2011/04/22 18:48:03 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.91 2011/05/01 13:52:09 scarabeus Exp $
# @ECLASS: kde4-base.eclass
# @MAINTAINER:
@@ -20,12 +20,12 @@
# for tests you should proceed with setting VIRTUALX_REQUIRED=test.
: ${VIRTUALX_REQUIRED:=manual}
-inherit kde4-functions fdo-mime gnome2-utils base virtualx versionator eutils
+inherit kde4-functions toolchain-funcs fdo-mime gnome2-utils base virtualx versionator eutils
if [[ ${BUILD_TYPE} = live ]]; then
case ${KDE_SCM} in
svn) inherit subversion ;;
- git) inherit git ;;
+ git) inherit git-2 ;;
esac
fi
@@ -385,7 +385,7 @@
# this can't be done on one line because if user doesn't use any localisation
# then he is probably not interested in kde-l10n at all.
kderdepend+="
- linguas_${_lingua}? ( $(add_kdebase_dep kde-l10n "linguas_${_lingua}(+)?") )
+ linguas_${_lingua}? ( $(add_kdebase_dep kde-l10n "linguas_${_lingua}(+)") )
"
done
unset _lingua
@@ -608,18 +608,7 @@
;;
esac
- case $_kmname in
- kdepim|kdepim-runtime)
- case ${PV} in
- # kdepim still did not branch
- 4.6.9999)
- EGIT_BRANCH="master"
- ;;
- esac
- ;;
- esac
EGIT_REPO_URI="${EGIT_MIRROR}/${_kmname}"
- EGIT_PROJECT="${_kmname}"
debug-print "${FUNCNAME}: Repository: ${EGIT_REPO_URI}"
debug-print "${FUNCNAME}: Branch: ${EGIT_BRANCH}"
@@ -653,6 +642,14 @@
# Don't set KDEHOME during compilation, it will cause access violations
unset KDEHOME
+ # Check if gcc compiler is fresh enough.
+ # In theory should be in pkg_pretend but we check it only for kdelibs there
+ # and for others we do just quick scan in pkg_setup because pkg_pretend
+ # executions consume quite some time.
+ [[ $(gcc-major-version) -lt 4 ]] || \
+ ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 3 ]] ) \
+ && die "Sorry, but gcc-4.3 and earlier wont work for KDE (see bug 354837)."
+
if [[ ${KDEBASE} = kde-base ]]; then
if use kdeprefix; then
KDEDIR=/usr/kde/${SLOT}
@@ -710,7 +707,7 @@
subversion_src_unpack
;;
git)
- git_src_unpack
+ git-2_src_unpack
;;
esac
else
1.52 eclass/kde4-meta.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-meta.eclass?rev=1.52&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-meta.eclass?rev=1.52&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-meta.eclass?r1=1.51&r2=1.52
Index: kde4-meta.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- kde4-meta.eclass 6 Apr 2011 14:22:14 -0000 1.51
+++ kde4-meta.eclass 1 May 2011 13:52:09 -0000 1.52
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.51 2011/04/06 14:22:14 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.52 2011/05/01 13:52:09 scarabeus Exp $
#
# @ECLASS: kde4-meta.eclass
# @MAINTAINER:
@@ -14,16 +14,9 @@
[[ -z ${KMNAME} ]] && die "kde4-meta.eclass inherited but KMNAME not defined - broken ebuild"
-inherit kde4-base toolchain-funcs versionator
+inherit kde4-base versionator
-case ${EAPI:-0} in
- 3)
- KDEMETA_EXPF="pkg_setup src_unpack src_prepare src_configure src_compile src_test src_install pkg_preinst pkg_postinst pkg_postrm"
- ;;
- *)
- KDEMETA_EXPF="pkg_pretend pkg_setup src_unpack src_prepare src_configure src_compile src_test src_install pkg_preinst pkg_postinst pkg_postrm"
- ;;
-esac
+KDEMETA_EXPF="pkg_setup src_unpack src_prepare src_configure src_compile src_test src_install pkg_preinst pkg_postinst pkg_postrm"
EXPORT_FUNCTIONS ${KDEMETA_EXPF}
# Add dependencies that all packages in a certain module share.
@@ -137,17 +130,6 @@
# Specify extra parameters to pass to tar, in kde4-meta_src_extract.
# '-xpf -j' are passed to tar by default.
-# @FUNCTION: kde4-meta_pkg_pretend
-# @DESCRIPTION:
-# Currently only checks the gcc version.
-kde4-meta_pkg_pretend() {
- debug-print-function ${FUNCNAME} "$@"
-
- slot_is_at_least 4.6 ${SLOT} && ( [[ $(gcc-major-version) -lt 4 ]] || \
- ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 3 ]] ) ) \
- && die "Sorry, but gcc-4.3 and earlier wont work for KDE SC 4.6 (see bug 354837)."
-}
-
# @FUNCTION: kde4-meta_pkg_setup
# @DESCRIPTION:
# Currently calls its equivalent in kde4-base.eclass(5) and checks the gcc version.
@@ -155,8 +137,6 @@
kde4-meta_pkg_setup() {
debug-print-function ${FUNCNAME} "$@"
- has pkg_pretend ${KDEMETA_EXPF} || kde4-meta_pkg_pretend
-
kde4-base_pkg_setup
}
@@ -178,7 +158,7 @@
subversion_bootstrap
;;
git)
- git_src_unpack
+ git-2_src_unpack
;;
esac
fi
^ permalink raw reply [flat|nested] 8+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: kde4-base.eclass kde4-meta.eclass
@ 2011-10-29 15:07 Jonathan Callen (abcd)
0 siblings, 0 replies; 8+ messages in thread
From: Jonathan Callen (abcd) @ 2011-10-29 15:07 UTC (permalink / raw
To: gentoo-commits
abcd 11/10/29 15:07:16
Modified: kde4-base.eclass kde4-meta.eclass
Log:
Sync kde4 eclasses
Revision Changes Path
1.110 eclass/kde4-base.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.110&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.110&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?r1=1.109&r2=1.110
Index: kde4-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- kde4-base.eclass 21 Oct 2011 23:00:19 -0000 1.109
+++ kde4-base.eclass 29 Oct 2011 15:07:16 -0000 1.110
@@ -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.109 2011/10/21 23:00:19 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.110 2011/10/29 15:07:16 abcd Exp $
# @ECLASS: kde4-base.eclass
# @MAINTAINER:
@@ -600,7 +600,7 @@
kde4-base_pkg_setup() {
debug-print-function ${FUNCNAME} "$@"
- if has kdeprefix ${IUSE//+} && use kdeprefix; then
+ if use_if_iuse kdeprefix; then
eerror "Sorry, kdeprefix support has been removed."
eerror "Please remove kdeprefix from your USE variable."
die "kdeprefix support has been removed"
@@ -682,7 +682,7 @@
# Enable/disable handbooks for kde4-base packages
# kde-l10n inherits kde4-base but is metpackage, so no check for doc
# kdelibs inherits kde4-base but handle installing the handbook itself
- if ! has kde4-meta ${INHERITED} && has handbook ${IUSE//+}; then
+ if ! has kde4-meta ${INHERITED} && in_iuse handbook; then
if [[ ${KDEBASE} == kde-base ]]; then
if [[ ${PN} != kde-l10n && ${PN} != kdepim-l10n && ${PN} != kdelibs ]] && use !handbook; then
# documentation in kde4-functions
@@ -760,11 +760,11 @@
# Build tests in src_test only, where we override this value
local cmakeargs=(-DKDE4_BUILD_TESTS=OFF)
- if has kdeenablefinal ${IUSE//+} && use kdeenablefinal; then
+ if use_if_iuse kdeenablefinal; then
cmakeargs+=(-DKDE4_ENABLE_FINAL=ON)
fi
- if has debug ${IUSE//+} && use debug; then
+ if use_if_iuse debug; then
# Set "real" debug mode
CMAKE_BUILD_TYPE="Debugfull"
else
@@ -880,6 +880,9 @@
debug-print-function ${FUNCNAME} "$@"
gnome2_icon_savelist
+ if [[ ${BUILD_TYPE} == live && ${KDE_SCM} == svn ]]; then
+ subversion_pkg_preinst
+ fi
}
# @FUNCTION: kde4-base_pkg_postinst
@@ -894,7 +897,7 @@
buildsycoca
if [[ -z ${I_KNOW_WHAT_I_AM_DOING} ]]; then
- if has kdeenablefinal ${IUSE//+} && use kdeenablefinal; then
+ if use_if_iuse kdeenablefinal; then
echo
ewarn "WARNING! you have kdeenable final useflag enabled."
ewarn "This useflag needs to be enabled on ALL kde using packages and"
1.58 eclass/kde4-meta.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-meta.eclass?rev=1.58&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-meta.eclass?rev=1.58&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-meta.eclass?r1=1.57&r2=1.58
Index: kde4-meta.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- kde4-meta.eclass 6 Oct 2011 14:13:29 -0000 1.57
+++ kde4-meta.eclass 29 Oct 2011 15:07:16 -0000 1.58
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.57 2011/10/06 14:13:29 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.58 2011/10/29 15:07:16 abcd Exp $
#
# @ECLASS: kde4-meta.eclass
# @MAINTAINER:
@@ -289,7 +289,7 @@
# Add default handbook locations
# FIXME - legacy code - remove when 4.4.5 is gone or preferrably port 4.4.5.
- if [[ $(get_kde_version) < 4.5 ]] && has handbook ${IUSE//+} && use handbook && [[ -z ${KMNOMODULE} ]]; then
+ if [[ $(get_kde_version) < 4.5 ]] && use_if_iuse handbook && [[ -z ${KMNOMODULE} ]]; then
# We use the basename of $KMMODULE because $KMMODULE can contain
# the path to the module subdirectory.
KMEXTRA_NONFATAL+="
@@ -346,7 +346,7 @@
KMEXTRACTONLY+="
kdepim-version.h"
fi
- if has kontact ${IUSE//+} && use kontact; then
+ if use_if_iuse kontact; then
KMEXTRA+="
kontact/plugins/${PLUGINNAME:-${PN}}/"
fi
@@ -584,13 +584,13 @@
sed -r -e '/find_package\(KdepimLibs/s/REQUIRED//' \
-e '/find_package\((KdepimLibs|Boost|QGpgme|Akonadi|ZLIB|Strigi|SharedDesktopOntologies|Soprano|Nepomuk)/{/macro_optional_/!s/find/macro_optional_&/}' \
-e '/macro_log_feature\((Boost|QGPGME|Akonadi|ZLIB|STRIGI|SHAREDDESKTOPONTOLOGIES|Soprano|Nepomuk)_FOUND/s/ TRUE / FALSE /' \
- -e '/if[[:space:]]*([[:space:]]*BUILD_.*)/s/^/#OVERRIDE /' \
- -e '/if[[:space:]]*([[:space:]]*[[:alnum:]]*_FOUND[[:space:]]*)/s/^/#OVERRIDE /' \
+ -e 's/if[[:space:]]*([[:space:]]*BUILD_.*)[[:space:]]*/if(1) # &/' \
+ -e 's/if[[:space:]]*([[:space:]]*[[:alnum:]]*_FOUND[[:space:]]*)[[:space:]]*$/if(1) # &/' \
-i CMakeLists.txt || die "failed to disable hardcoded checks"
# Disable broken or redundant build logic
- if ( has kontact ${IUSE//+} && use kontact ) || [[ ${PN} = kontact ]]; then
- sed -e '/if[[:space:]]*([[:space:]]*BUILD_.*)/s/^/#OVERRIDE /' \
- -e '/if[[:space:]]*([[:space:]]*[[:alnum:]]*_FOUND[[:space:]]*)/s/^/#OVERRIDE /' \
+ if use_if_iuse kontact || [[ ${PN} = kontact ]]; then
+ sed -e 's/if[[:space:]]*([[:space:]]*BUILD_.*)[[:space:]]*$/if(1) # &/' \
+ -e 's/if[[:space:]]*([[:space:]]*[[:alnum:]]*_FOUND[[:space:]]*)[[:space:]]*$/if(1) # &/' \
-i kontact/plugins/CMakeLists.txt || die 'failed to override build logic'
fi
if [[ $(get_kde_version) < 4.5 ]]; then
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2011-10-29 15:07 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-08-07 1:00 [gentoo-commits] gentoo-x86 commit in eclass: kde4-base.eclass kde4-meta.eclass Alex Alexander (wired)
-- strict thread matches above, loose matches on Subject: below --
2011-10-29 15:07 Jonathan Callen (abcd)
2011-05-01 13:52 Tomas Chvatal (scarabeus)
2010-09-14 12:39 Maciej Mrozowski (reavertm)
2010-06-22 13:49 Maciej Mrozowski (reavertm)
2010-05-17 1:16 Maciej Mrozowski (reavertm)
2009-12-02 17:07 Jonathan Callen (abcd)
2009-01-03 18:20 Tomas Chvatal (scarabeus)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox