diff options
| author |   Andreas Hüttel <dilfridge@gentoo.org> | 2011-12-18 00:00:45 +0000 |
|---|---|---|
| committer | Andreas Hüttel <dilfridge@gentoo.org> | 2011-12-18 00:00:45 +0000 |
| commit | 5bc4fec97a0dbb4b9918f952978d440b666921e7 (patch) | |
| tree | 35063e16358e334987e61a8382e038183fff61b1 /eclass/kde4-meta.eclass | |
| parent | fixup manifests (diff) | |
| download | historical-5bc4fec97a0dbb4b9918f952978d440b666921e7.tar.gz historical-5bc4fec97a0dbb4b9918f952978d440b666921e7.tar.bz2 historical-5bc4fec97a0dbb4b9918f952978d440b666921e7.zip | |
Re-sync kde4 eclasses with kde overlay: remove libkworkspace target hacks (requires libkworkspace rebuild), force qt-4.7.4 for kde-4.8, properly treat kde-4.[789] version numbers, warn if the handbook useflag is added manually. Proofread by reavertm.
Diffstat (limited to 'eclass/kde4-meta.eclass')
| -rw-r--r-- | eclass/kde4-meta.eclass | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass index 08cbfa20016d..1178a209a4af 100644 --- a/eclass/kde4-meta.eclass +++ b/eclass/kde4-meta.eclass @@ -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.58 2011/10/29 15:07:16 abcd Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.59 2011/12/18 00:00:45 dilfridge Exp $ # # @ECLASS: kde4-meta.eclass # @MAINTAINER: @@ -556,6 +556,9 @@ kde4-meta_change_cmakelists() { sed -e '/startkde/s/^/#DONOTINSTALL /' \ -i CMakeLists.txt || die "${LINENO}: sed died in the kdebase-startkde collision prevention section" fi + # Remove workspace target prefix in order to get direct linking to workspace libs + sed -e '/set(KDE4WORKSPACE_TARGET_PREFIX/s/^/#OVERRIDE /' \ + -i CMakeLists.txt || die "${LINENO}: sed died in KDE4WORKSPACE_TARGET_PREFIX removal section" # Strip EXPORT feature section from workspace for KDE4 versions > 4.1.82 if [[ ${PN} != libkworkspace ]]; then sed -e '/install(FILES ${CMAKE_CURRENT_BINARY_DIR}\/KDE4WorkspaceConfig.cmake/,/^[[:space:]]*FILE KDE4WorkspaceLibraryTargets.cmake )[[:space:]]*^/d' \ |