diff options
author | Andreas K. Hüttel <dilfridge@gentoo.org> | 2011-01-03 20:36:17 +0000 |
---|---|---|
committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2011-01-03 20:36:17 +0000 |
commit | 83f57e70ab9383c0a064d653cdcfbf3c2637024b (patch) | |
tree | e16fe84aa4f7aa802676ea224751bbeab32cc3b9 | |
parent | Remove old version. (diff) | |
download | gentoo-2-83f57e70ab9383c0a064d653cdcfbf3c2637024b.tar.gz gentoo-2-83f57e70ab9383c0a064d653cdcfbf3c2637024b.tar.bz2 gentoo-2-83f57e70ab9383c0a064d653cdcfbf3c2637024b.zip |
Add RDEPEND on oxygen-icons to all ebuilds using kde4-base.eclass. Ack'ed by tampakrap.
-rw-r--r-- | eclass/kde4-base.eclass | 6 | ||||
-rw-r--r-- | eclass/kde4-functions.eclass | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass index 237e3fbe01e9..52dd02dc8472 100644 --- a/eclass/kde4-base.eclass +++ b/eclass/kde4-base.eclass @@ -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.81 2010/12/29 17:06:51 tampakrap Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.82 2011/01/03 20:36:17 dilfridge Exp $ # @ECLASS: kde4-base.eclass # @MAINTAINER: @@ -379,6 +379,10 @@ kdedepend=" " kderdepend="" +if [[ ${PN} != oxygen-icons ]]; then + kderdepend+=" $(add_kdebase_dep oxygen-icons)" +fi + kdehandbookdepend=" app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets diff --git a/eclass/kde4-functions.eclass b/eclass/kde4-functions.eclass index 2b553af4f92a..289984a83114 100644 --- a/eclass/kde4-functions.eclass +++ b/eclass/kde4-functions.eclass @@ -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-functions.eclass,v 1.41 2010/12/29 17:56:34 tampakrap Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v 1.42 2011/01/03 20:36:17 dilfridge Exp $ inherit versionator @@ -376,10 +376,10 @@ add_kdebase_dep() { if [[ ${KDEBASE} = kde-base ]]; then # FIXME remove hack when >kdepim-4.4.5 is gone local FIXME_PV - if [[ ${KMNAME} = kdepim || ${PN} = kdepim-runtime ]] && [[ ${PV} = 4.4.6* || ${PV} = 4.4.7* || ${PV} = 4.4.8* || ${PV} = 4.4.9* ]] && [[ ${1} = kdelibs || ${1} = kdepimlibs ]]; then + if [[ ${KMNAME} = kdepim || ${PN} = kdepim-runtime ]] && [[ ${PV} = 4.4.6* || ${PV} = 4.4.7* || ${PV} = 4.4.8* || ${PV} = 4.4.9* ]] && [[ ${1} = kdelibs || ${1} = kdepimlibs || ${1} = oxygen-icons ]]; then FIXME_PV=4.4.5 # FIXME remove hack when kdepim-4.6beta is gone - elif [[ ${KMNAME} = kdepim || ${PN} = kdepim-runtime ]] && [[ ${PV} = 4.5.93* ]] && [[ ${1} = kdelibs || ${1} = kdepimlibs ]]; then + elif [[ ${KMNAME} = kdepim || ${PN} = kdepim-runtime ]] && [[ ${PV} = 4.5.93* ]] && [[ ${1} = kdelibs || ${1} = kdepimlibs || ${1} = oxygen-icons ]]; then FIXME_PV=4.5.90 else FIXME_PV=${PV} |