diff options
| author |   Michael Palimaka <kensington@gentoo.org> | 2013-04-07 17:46:23 +0000 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2013-04-07 17:46:23 +0000 |
| commit | 3c621f8417555394247fa0df9d7be45258989d15 (patch) | |
| tree | aa97eaa7354ef08e5df519ab2cbca89a9e8ec91a /eclass | |
| parent | Add missing ChangeLog. (diff) | |
| download | historical-3c621f8417555394247fa0df9d7be45258989d15.tar.gz historical-3c621f8417555394247fa0df9d7be45258989d15.tar.bz2 historical-3c621f8417555394247fa0df9d7be45258989d15.zip | |
Guard against multiple inheritance. Make KMCOMPILEONLY sed case-insensitive to avoid file collisions in the future.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 6 | ||||
| -rw-r--r-- | eclass/kde4-meta.eclass | 11 |
2 files changed, 13 insertions, 4 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 08961ece9a1b..9bd03df11d09 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -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.773 2013/04/07 17:41:37 kensington Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.774 2013/04/07 17:46:23 kensington Exp $ + + 07 Apr 2013; Michael Palimaka <kensington@gentoo.org> kde4-meta.eclass: + Guard against multiple inheritance. Make KMCOMPILEONLY sed case-insensitive + to avoid file collisions in the future. 07 Apr 2013; Michael Palimaka <kensington@gentoo.org> kde4-functions.eclass, kde4-meta-pkg.eclass: diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass index 69cb76ad9c72..3cd949f4ce88 100644 --- a/eclass/kde4-meta.eclass +++ b/eclass/kde4-meta.eclass @@ -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.69 2013/02/07 03:38:33 alexxy Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.70 2013/04/07 17:46:23 kensington Exp $ # # @ECLASS: kde4-meta.eclass # @MAINTAINER: @@ -12,6 +12,9 @@ # You must define KMNAME to use this eclass, and do so before inheriting it. All other variables are optional. # Do not include the same item in more than one of KMMODULE, KMMEXTRA, KMCOMPILEONLY, KMEXTRACTONLY. +if [[ ${___ECLASS_ONCE_KDE4_META} != "recur -_+^+_- spank" ]] ; then +___ECLASS_ONCE_KDE4_META="recur -_+^+_- spank" + [[ -z ${KMNAME} ]] && die "kde4-meta.eclass inherited but KMNAME not defined - broken ebuild" inherit kde4-base versionator @@ -482,8 +485,8 @@ kde4-meta_change_cmakelists() { find "${S}"/${i} -name CMakeLists.txt -print0 | \ xargs -0 sed -i \ -e 's/^#DONOTCOMPILE //g' \ - -e '/install(.*)/{s/^/#DONOTINSTALL /;}' \ - -e '/^install(/,/)/{s/^/#DONOTINSTALL /;}' \ + -e '/install(.*)/I{s/^/#DONOTINSTALL /;}' \ + -e '/^install(/,/)/I{s/^/#DONOTINSTALL /;}' \ -e '/kde4_install_icons(.*)/{s/^/#DONOTINSTALL /;}' || \ die "${LINENO}: sed died in the KMCOMPILEONLY section while processing ${i}" _change_cmakelists_parent_dirs ${i} @@ -682,3 +685,5 @@ kde4-meta_pkg_postrm() { kde4-base_pkg_postrm } + +fi |