* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog kde4-base.eclass kde4-meta.eclass
@ 2012-03-06 22:23 Andreas HAttel (dilfridge)
0 siblings, 0 replies; 4+ messages in thread
From: Andreas HAttel (dilfridge) @ 2012-03-06 22:23 UTC (permalink / raw
To: gentoo-commits
dilfridge 12/03/06 22:23:51
Modified: ChangeLog kde4-base.eclass kde4-meta.eclass
Log:
Update from kde overlay
Revision Changes Path
1.155 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.155&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.155&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.154&r2=1.155
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -r1.154 -r1.155
--- ChangeLog 5 Mar 2012 08:20:52 -0000 1.154
+++ ChangeLog 6 Mar 2012 22:23:51 -0000 1.155
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.154 2012/03/05 08:20:52 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.155 2012/03/06 22:23:51 dilfridge Exp $
+
+ 06 Mar 2012; Andreas K. Huettel <dilfridge@gentoo.org> kde4-base.eclass,
+ kde4-meta.eclass:
+ Update from kde overlay
05 Mar 2012; Patrick Lauer <patrick@gentoo.org> apache-2.eclass:
Don't set eapi in eclass, #405911
1.113 eclass/kde4-base.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.113&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.113&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?r1=1.112&r2=1.113
Index: kde4-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- kde4-base.eclass 17 Jan 2012 11:20:03 -0000 1.112
+++ kde4-base.eclass 6 Mar 2012 22:23:51 -0000 1.113
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.112 2012/01/17 11:20:03 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.113 2012/03/06 22:23:51 dilfridge Exp $
# @ECLASS: kde4-base.eclass
# @MAINTAINER:
@@ -83,7 +83,7 @@
KDEVELOP_VERSION=${PV}
KDEVPLATFORM_VERSION="$(($(get_major_version)-3)).$(get_after_major_version)"
;;
- kdevplatform)
+ kdevplatform|kdevelop-php*)
KDEVELOP_VERSION="$(($(get_major_version)+3)).$(get_after_major_version)"
KDEVPLATFORM_VERSION=${PV}
;;
@@ -199,7 +199,10 @@
# @ECLASS-VARIABLE: QT_MINIMAL
# @DESCRIPTION:
# Determine version of qt we enforce as minimal for the package.
-if version_is_at_least 4.7.80 "${KDE_MINIMAL}"; then
+if version_is_at_least 4.8.50 "${KDE_MINIMAL}"; then
+ # Upstream has added an *undeclared* dependency on Qt 4.8...
+ QT_MINIMAL="${QT_MINIMAL:-4.8.0}"
+elif version_is_at_least 4.7.80 "${KDE_MINIMAL}"; then
QT_MINIMAL="${QT_MINIMAL:-4.7.4}"
else
QT_MINIMAL="${QT_MINIMAL:-4.7.0}"
@@ -284,29 +287,18 @@
esac
unset cppuintdepend
-
-# WebKit use dependencies
-case ${KDE_REQUIRED} in
- always)
- qtwebkitusedeps="[kde]"
- ;;
- optional)
- qtwebkitusedeps="[kde?]"
- ;;
- *) ;;
-esac
# KDE dependencies
# Qt accessibility classes are needed in various places, bug 325461
kdecommondepend="
dev-lang/perl
>=x11-libs/qt-core-${QT_MINIMAL}:4[qt3support,ssl]
>=x11-libs/qt-gui-${QT_MINIMAL}:4[accessibility,dbus]
- >=x11-libs/qt-qt3support-${QT_MINIMAL}:4[accessibility,kde]
+ >=x11-libs/qt-qt3support-${QT_MINIMAL}:4[accessibility]
>=x11-libs/qt-script-${QT_MINIMAL}:4
>=x11-libs/qt-sql-${QT_MINIMAL}:4[qt3support]
>=x11-libs/qt-svg-${QT_MINIMAL}:4
>=x11-libs/qt-test-${QT_MINIMAL}:4
- >=x11-libs/qt-webkit-${QT_MINIMAL}:4${qtwebkitusedeps}
+ >=x11-libs/qt-webkit-${QT_MINIMAL}:4
!aqua? (
x11-libs/libXext
x11-libs/libXt
@@ -449,25 +441,19 @@
case ${KDEBASE} in
kde-base)
case ${PV} in
+ 4.4.11.1)
+ # KDEPIM 4.4, special case
+ # TODO: Remove this part when KDEPIM 4.4 gets out of the tree
+ SRC_URI="mirror://kde/stable/kdepim-${PV}/src/${_kmname_pv}.tar.bz2" ;;
4.[456789].8[05] | 4.[456789].9[0235678])
# Unstable KDE SC releases
- SRC_URI="mirror://kde/unstable/${PV}/src/${_kmname_pv}.tar.bz2"
- if ! version_is_at_least 4.6.80 ${PV}
- then
- # KDEPIM IS SPECIAL
- [[ ${KMNAME} == "kdepim" || ${KMNAME} == "kdepim-runtime" ]] && SRC_URI="mirror://kde/unstable/kdepim/${PV}/${_kmname_pv}.tar.bz2"
- fi
- ;;
+ SRC_URI="mirror://kde/unstable/${PV}/src/${_kmname_pv}.tar.bz2" ;;
+ 4.8.1)
+ # Stable KDE SC releases with .xz support
+ SRC_URI="mirror://kde/stable/${PV}/src/${_kmname_pv}.tar.xz" ;;
*)
# Stable KDE SC releases
- SRC_URI="mirror://kde/stable/${PV}/src/${_kmname_pv}.tar.bz2"
- if ! version_is_at_least 4.6.80 ${PV}
- then
- # KDEPIM IS SPECIAL
- # TODO: It might not be with KDE 4.7 (see above)
- [[ ${KMNAME} == "kdepim" || ${KMNAME} == "kdepim-runtime" ]] && SRC_URI="mirror://kde/stable/kdepim-${PV}/src/${_kmname_pv}.tar.bz2"
- fi
- ;;
+ SRC_URI="mirror://kde/stable/${PV}/src/${_kmname_pv}.tar.bz2" ;;
esac
;;
koffice)
@@ -476,8 +462,11 @@
*) SRC_URI="mirror://kde/stable/${_kmname_pv}/${_kmname_pv}.tar.bz2" ;;
esac
;;
- kdevelop)
- SRC_URI="mirror://kde/stable/kdevelop/${KDEVELOP_VERSION}/src/${P}.tar.bz2"
+ kdevelop|kdevelop-php*|kdevplatform)
+ case ${KDEVELOP_VERSION} in
+ 4.[12].[6-9]*) SRC_URI="mirror://kde/unstable/kdevelop/${KDEVELOP_VERSION}/src/${P}.tar.bz2" ;;
+ *) SRC_URI="mirror://kde/stable/kdevelop/${KDEVELOP_VERSION}/src/${P}.tar.bz2" ;;
+ esac
;;
esac
}
1.60 eclass/kde4-meta.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-meta.eclass?rev=1.60&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-meta.eclass?rev=1.60&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-meta.eclass?r1=1.59&r2=1.60
Index: kde4-meta.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- kde4-meta.eclass 18 Dec 2011 00:00:45 -0000 1.59
+++ kde4-meta.eclass 6 Mar 2012 22:23:51 -0000 1.60
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.59 2011/12/18 00:00:45 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.60 2012/03/06 22:23:51 dilfridge Exp $
#
# @ECLASS: kde4-meta.eclass
# @MAINTAINER:
@@ -210,8 +210,13 @@
else
local abort tarball tarfile f extractlist postfix
- KMTARPARAMS+=" --bzip2"
- postfix="bz2"
+ if [[ ${PV} == 4.8.1 ]]; then
+ postfix="xz"
+ KMTARPARAMS+=" --xz"
+ else
+ postfix="bz2"
+ KMTARPARAMS+=" --bzip2"
+ fi
case ${KMNAME} in
kdebase-apps)
^ permalink raw reply [flat|nested] 4+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog kde4-base.eclass kde4-meta.eclass
@ 2012-04-04 15:10 Johannes Huber (johu)
0 siblings, 0 replies; 4+ messages in thread
From: Johannes Huber (johu) @ 2012-04-04 15:10 UTC (permalink / raw
To: gentoo-commits
johu 12/04/04 15:10:20
Modified: ChangeLog kde4-base.eclass kde4-meta.eclass
Log:
Use .xz also for 4.8.x with x>1.
Revision Changes Path
1.203 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.203&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.203&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.202&r2=1.203
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.202
retrieving revision 1.203
diff -u -r1.202 -r1.203
--- ChangeLog 3 Apr 2012 19:21:45 -0000 1.202
+++ ChangeLog 4 Apr 2012 15:10:20 -0000 1.203
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.202 2012/04/03 19:21:45 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.203 2012/04/04 15:10:20 johu Exp $
+
+ 04 Apr 2012; Johannes Huber <johu@gentoo.org> kde4-base.eclass,
+ kde4-meta.eclass:
+ Use .xz also for 4.8.x with x>1.
03 Apr 2012; Krzysztof Pawlik <nelchael@gentoo.org>
python-distutils-ng.eclass:
1.114 eclass/kde4-base.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.114&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.114&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?r1=1.113&r2=1.114
Index: kde4-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- kde4-base.eclass 6 Mar 2012 22:23:51 -0000 1.113
+++ kde4-base.eclass 4 Apr 2012 15:10:20 -0000 1.114
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.113 2012/03/06 22:23:51 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.114 2012/04/04 15:10:20 johu Exp $
# @ECLASS: kde4-base.eclass
# @MAINTAINER:
@@ -448,7 +448,7 @@
4.[456789].8[05] | 4.[456789].9[0235678])
# Unstable KDE SC releases
SRC_URI="mirror://kde/unstable/${PV}/src/${_kmname_pv}.tar.bz2" ;;
- 4.8.1)
+ 4.8.[12345])
# Stable KDE SC releases with .xz support
SRC_URI="mirror://kde/stable/${PV}/src/${_kmname_pv}.tar.xz" ;;
*)
1.62 eclass/kde4-meta.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-meta.eclass?rev=1.62&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-meta.eclass?rev=1.62&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-meta.eclass?r1=1.61&r2=1.62
Index: kde4-meta.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- kde4-meta.eclass 24 Mar 2012 20:44:51 -0000 1.61
+++ kde4-meta.eclass 4 Apr 2012 15:10:20 -0000 1.62
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.61 2012/03/24 20:44:51 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.62 2012/04/04 15:10:20 johu Exp $
#
# @ECLASS: kde4-meta.eclass
# @MAINTAINER:
@@ -210,7 +210,7 @@
else
local abort tarball tarfile f extractlist postfix
- if [[ ${PV} == 4.8.1 ]]; then
+ if [[ ${PV} =~ 4.8.[12345] ]]; then
postfix="xz"
KMTARPARAMS+=" --xz"
else
^ permalink raw reply [flat|nested] 4+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog kde4-base.eclass kde4-meta.eclass
@ 2013-08-15 15:29 Michael Palimaka (kensington)
0 siblings, 0 replies; 4+ messages in thread
From: Michael Palimaka (kensington) @ 2013-08-15 15:29 UTC (permalink / raw
To: gentoo-commits
kensington 13/08/15 15:29:58
Modified: ChangeLog kde4-base.eclass kde4-meta.eclass
Log:
Remove dependencies and actions that are now handled in individual ebuilds.
Revision Changes Path
1.929 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.929&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.929&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.928&r2=1.929
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.928
retrieving revision 1.929
diff -u -r1.928 -r1.929
--- ChangeLog 15 Aug 2013 15:10:05 -0000 1.928
+++ ChangeLog 15 Aug 2013 15:29:58 -0000 1.929
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.928 2013/08/15 15:10:05 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.929 2013/08/15 15:29:58 kensington Exp $
+
+ 15 Aug 2013; Michael Palimaka <kensington@gentoo.org> kde4-base.eclass,
+ kde4-meta.eclass:
+ Remove dependencies and actions that are now handled in individual ebuilds.
15 Aug 2013; Michael Palimaka <kensington@gentoo.org> kde4-base.eclass,
kde4-functions.eclass, kde4-meta.eclass:
1.130 eclass/kde4-base.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.130&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.130&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?r1=1.129&r2=1.130
Index: kde4-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- kde4-base.eclass 15 Aug 2013 15:10:05 -0000 1.129
+++ kde4-base.eclass 15 Aug 2013 15:29:58 -0000 1.130
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.129 2013/08/15 15:10:05 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.130 2013/08/15 15:29:58 kensington Exp $
# @ECLASS: kde4-base.eclass
# @MAINTAINER:
@@ -378,28 +378,6 @@
;;
esac
-# These dependencies are added as they are unconditionally required by kde-workspace.
-# They are not necessarily required by individual applications but are pulled in to prevent
-# bugs like bug #444438. This list is subject to change in the future so do not rely on it
-# in ebuilds - always set correct dependencies.
-case ${KMNAME} in
- kde-workspace)
- kdedepend+="
- x11-libs/xcb-util
- x11-libs/libX11
- x11-libs/libXcomposite
- x11-libs/libXcursor
- x11-libs/libXdamage
- x11-libs/libXfixes
- x11-libs/libxkbfile
- x11-libs/libXrandr
- x11-libs/libXrender
- "
- ;;
- *)
- ;;
-esac
-
# We always need the aqua useflag because otherwise we cannot = refer to it inside
# add_kdebase_dep. This was always kind of a bug, but came to light with EAPI=5
# (where referring to a use flag not in IUSE masks the ebuild).
1.72 eclass/kde4-meta.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-meta.eclass?rev=1.72&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-meta.eclass?rev=1.72&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-meta.eclass?r1=1.71&r2=1.72
Index: kde4-meta.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- kde4-meta.eclass 15 Aug 2013 15:10:05 -0000 1.71
+++ kde4-meta.eclass 15 Aug 2013 15:29:58 -0000 1.72
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.71 2013/08/15 15:10:05 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.72 2013/08/15 15:29:58 kensington Exp $
#
# @ECLASS: kde4-meta.eclass
# @MAINTAINER:
@@ -24,9 +24,6 @@
# Add dependencies that all packages in a certain module share.
case ${KMNAME} in
- kdebase|kdebase-apps|kde-baseapps|kdebase-workspace|kde-workspace|kdebase-runtime|kde-runtime|kdegraphics)
- COMMONDEPEND+=" >=media-libs/qimageblitz-0.0.4"
- ;;
kdepim|kdepim-runtime)
case ${PN} in
akregator|kaddressbook|kjots|kmail|knode|knotes|korganizer|ktimetracker)
@@ -511,7 +508,7 @@
"${S}"/CMakeLists.txt || die "${LINENO}: sed died removing kde-workspace opengl dependency"
fi
;;
- kdebase-runtime | kde-runtime)
+ kde-runtime)
# COLLISION PROTECT section
# Only install the kde4 script as part of kde-base/kdebase-data
if [[ ${PN} != kdebase-data && -f CMakeLists.txt ]]; then
@@ -551,14 +548,6 @@
;;
esac
;;
- kdewebdev)
- # Disable hardcoded checks
- sed -e 's/find_package(KdepimLibs REQUIRED)/macro_optional_find_package(KdepimLibs)/' \
- -e 's/find_package(LibXml2 REQUIRED)/macro_optional_find_package(LibXml2)/' \
- -e 's/find_package(LibXslt REQUIRED)/macro_optional_find_package(LibXslt)/' \
- -e 's/find_package(Boost REQUIRED)/macro_optional_find_package(Boost)/' \
- -i CMakeLists.txt || die "failed to disable hardcoded checks"
- ;;
esac
popd > /dev/null
@@ -571,25 +560,6 @@
kde4-meta_src_configure() {
debug-print-function ${FUNCNAME} "$@"
- # backwards-compatibility: make mycmakeargs an array, if it isn't already
- if [[ $(declare -p mycmakeargs 2>&-) != "declare -a mycmakeargs="* ]]; then
- mycmakeargs=(${mycmakeargs})
- fi
-
- # Set some cmake default values here (usually workarounds for automagic deps)
- case ${KMNAME} in
- kdewebdev)
- mycmakeargs=(
- -DWITH_KdepimLibs=OFF
- -DWITH_LibXml2=OFF
- -DWITH_LibXslt=OFF
- -DWITH_Boost=OFF
- -DWITH_LibTidy=OFF
- "${mycmakeargs[@]}"
- )
- ;;
- esac
-
kde4-base_src_configure
}
^ permalink raw reply [flat|nested] 4+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog kde4-base.eclass kde4-meta.eclass
@ 2013-08-15 15:36 Michael Palimaka (kensington)
0 siblings, 0 replies; 4+ messages in thread
From: Michael Palimaka (kensington) @ 2013-08-15 15:36 UTC (permalink / raw
To: gentoo-commits
kensington 13/08/15 15:36:26
Modified: ChangeLog kde4-base.eclass kde4-meta.eclass
Log:
Fixes for KDE 4.11 and other small improvements.
Revision Changes Path
1.930 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.930&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.930&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.929&r2=1.930
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.929
retrieving revision 1.930
diff -u -r1.929 -r1.930
--- ChangeLog 15 Aug 2013 15:29:58 -0000 1.929
+++ ChangeLog 15 Aug 2013 15:36:26 -0000 1.930
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.929 2013/08/15 15:29:58 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.930 2013/08/15 15:36:26 kensington Exp $
+
+ 15 Aug 2013; Michael Palimaka <kensington@gentoo.org> kde4-base.eclass,
+ kde4-meta.eclass:
+ Fixes for KDE 4.11 and other small improvements.
15 Aug 2013; Michael Palimaka <kensington@gentoo.org> kde4-base.eclass,
kde4-meta.eclass:
1.131 eclass/kde4-base.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.131&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.131&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?r1=1.130&r2=1.131
Index: kde4-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- kde4-base.eclass 15 Aug 2013 15:29:58 -0000 1.130
+++ kde4-base.eclass 15 Aug 2013 15:36:26 -0000 1.131
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.130 2013/08/15 15:29:58 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.131 2013/08/15 15:36:26 kensington Exp $
# @ECLASS: kde4-base.eclass
# @MAINTAINER:
@@ -336,6 +336,7 @@
kderdepend+=" $(add_kdebase_dep oxygen-icons)"
fi
+# add a dependency over kde-l10n
if [[ ${KDEBASE} != "kde-base" && -n ${KDE_LINGUAS} ]]; then
for _lingua in ${KDE_LINGUAS}; do
# if our package has lignuas, pull in kde-l10n with selected lingua enabled,
1.73 eclass/kde4-meta.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-meta.eclass?rev=1.73&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-meta.eclass?rev=1.73&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-meta.eclass?r1=1.72&r2=1.73
Index: kde4-meta.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- kde4-meta.eclass 15 Aug 2013 15:29:58 -0000 1.72
+++ kde4-meta.eclass 15 Aug 2013 15:36:26 -0000 1.73
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.72 2013/08/15 15:29:58 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.73 2013/08/15 15:36:26 kensington Exp $
#
# @ECLASS: kde4-meta.eclass
# @MAINTAINER:
@@ -276,11 +276,13 @@
;;
kde-runtime)
KMEXTRACTONLY+="
+ cmake/modules/
CTestConfig.cmake
config-runtime.h.cmake"
;;
kde-workspace)
KMEXTRACTONLY+="
+ cmake/modules/
config-unix.h.cmake
ConfigureChecks.cmake
config-workspace.h.cmake
@@ -305,22 +307,6 @@
fi
;;
esac
- # Don't install cmake modules for split ebuilds, to avoid collisions.
- # note: kdegraphics >= 4.6.2 does not even have code to do that, so we
- # should not try in that case
- # note2: kdeedu 4.6.4 does not have a cmake/modules/ subdir anymore :(
- # it may be possible to formulate this shorter, but it should also
- # still be understandable...
- if [[ ${KMNAME} != kdegraphics || ( ( $(get_kde_version) != 4.6 || ${PV} < 4.6.2 ) && $(get_kde_version) < 4.7 ) ]] \
- && ! [[ ${KMNAME} == kdeedu && ( ${PV} == 4.6.4 || ${PV} == 4.6.5 ) ]] \
- && ! [[ ${KMNAME} == kdegames && ${PV} > 4.9.0 ]]; then
- case ${KMNAME} in
- kdebase-runtime|kde-runtime|kdebase-workspace|kde-workspace|kdeedu|kdegames|kdegraphics)
- KMEXTRACTONLY+="
- cmake/modules/"
- ;;
- esac
- fi
debug-print "line ${LINENO} ${ECLASS} ${FUNCNAME}: KMEXTRACTONLY ${KMEXTRACTONLY}"
}
@@ -499,10 +485,15 @@
sed -e '/install(FILES ${CMAKE_CURRENT_BINARY_DIR}\/KDE4WorkspaceConfig.cmake/,/^[[:space:]]*FILE KDE4WorkspaceLibraryTargets.cmake )[[:space:]]*^/d' \
-i CMakeLists.txt || die "${LINENO}: sed died in kde-workspace strip config install and fix EXPORT section"
fi
+ # <KDE/4.11
if [[ ${PN} != plasma-workspace ]]; then
sed -e '/KActivities/s/REQUIRED//' \
-i CMakeLists.txt || die "${LINENO}: sed died in kde-workspace dep reduction section"
fi
+ # >=KDE/4.11
+ sed -e 's/TYPE REQUIRED/TYPE OPTIONAL/' -e 's/XCB REQUIRED/XCB/' -e 's/X11 REQUIRED/X11/' \
+ -e 's/message(FATAL_ERROR/message(/' -i CMakeLists.txt \
+ || die "${LINENO}: sed died in kde-workspace dep reduction section"
if [[ "${PN}" != "kwin" ]]; then
sed -i -e "/^ macro_log_feature(OPENGL_OR_ES_FOUND/s/TRUE/FALSE/" \
"${S}"/CMakeLists.txt || die "${LINENO}: sed died removing kde-workspace opengl dependency"
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-08-15 15:36 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-04-04 15:10 [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog kde4-base.eclass kde4-meta.eclass Johannes Huber (johu)
-- strict thread matches above, loose matches on Subject: below --
2013-08-15 15:36 Michael Palimaka (kensington)
2013-08-15 15:29 Michael Palimaka (kensington)
2012-03-06 22:23 Andreas HAttel (dilfridge)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox