diff options
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/kde4-meta.eclass | 6 |
2 files changed, 9 insertions, 2 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index b82ea5872e84..edc913e5d30b 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.183 2012/03/23 19:53:51 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.184 2012/03/24 20:44:51 dilfridge Exp $ + + 24 Mar 2012; Andreas K. Huettel <dilfridge@gentoo.org> kde4-meta.eclass: + Make opengl dependency soft in kde-workspace (except kwin) 23 Mar 2012; Mike Gilbert <floppym@gentoo.org> chromium.eclass: Set IUSE=custom-cflags in the eclass so we can reference it in the die hook. diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass index e21e734da527..2fc7b37266db 100644 --- a/eclass/kde4-meta.eclass +++ b/eclass/kde4-meta.eclass @@ -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.60 2012/03/06 22:23:51 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.61 2012/03/24 20:44:51 dilfridge Exp $ # # @ECLASS: kde4-meta.eclass # @MAINTAINER: @@ -573,6 +573,10 @@ kde4-meta_change_cmakelists() { sed -e '/KActivities/s/REQUIRED//' \ -i CMakeLists.txt || die "${LINENO}: sed died in kde-workspace dep reduction section" fi + 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" + fi ;; kdebase-runtime | kde-runtime) # COLLISION PROTECT section |