mrueg 14/12/04 10:32:10 Modified: ChangeLog kde4-base.eclass Log: Sync kde4-base.eclass with overlay.
Revision Changes Path 1.1453 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1453&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1453&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1452&r2=1.1453 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.1452 retrieving revision 1.1453 diff -u -r1.1452 -r1.1453 --- ChangeLog 4 Dec 2014 01:17:15 -0000 1.1452 +++ ChangeLog 4 Dec 2014 10:32:10 -0000 1.1453 @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1452 2014/12/04 01:17:15 axs Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1453 2014/12/04 10:32:10 mrueg Exp $ + + 04 Dec 2014; Manuel Rüger <[email protected]> kde4-base.eclass: + Sync kde4-base.eclass with overlay. 04 Dec 2014; Ian Stakenvicius (_AxS_) <[email protected]> mozconfig-v5.34.eclass: 1.144 eclass/kde4-base.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.144&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.144&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?r1=1.143&r2=1.144 Index: kde4-base.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v retrieving revision 1.143 retrieving revision 1.144 diff -u -r1.143 -r1.144 --- kde4-base.eclass 13 Nov 2014 04:19:51 -0000 1.143 +++ kde4-base.eclass 4 Dec 2014 10:32:10 -0000 1.144 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.143 2014/11/13 04:19:51 kensington Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.144 2014/12/04 10:32:10 mrueg Exp $ # @ECLASS: kde4-base.eclass # @MAINTAINER: @@ -186,7 +186,7 @@ # packages that will never be mirrored. (As they only will ever be in # the overlay). case ${PV} in - *9999* | 4.?.[6-9]? | 4.??.[6-9]?) + *9999* | 4.?.[6-9]? | 4.??.[6-9]? | ??.?.[6-9]? | ??.??.[6-9]?) RESTRICT+=" mirror" ;; esac @@ -329,15 +329,19 @@ kderdepend="" +if [[ ${CATEGORY} == kde-apps ]]; then + kderdepend+=" !kde-base/${PN}" +fi + # all packages needs oxygen icons for basic iconset if [[ ${PN} != oxygen-icons ]]; then - kderdepend+=" $(add_kdebase_dep oxygen-icons)" + kderdepend+=" || ( kde-apps/oxygen-icons $(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, + # if our package has linguas, pull in kde-l10n with selected lingua enabled, # but only for selected ones. # this can't be done on one line because if user doesn't use any localisation # then he is probably not interested in kde-l10n at all. @@ -454,9 +458,18 @@ 4.11.14) # Part of 4.14 actually, sigh. Not stable for next release! SRC_URI="mirror://kde/stable/4.14.3/src/${_kmname_pv}.tar.xz" ;; + ??.?.[6-9]? | ??.??.[4-9]?) + # Unstable KDE Applications releases + SRC_URI="mirror://kde/unstable/applications/${PV}/src/${_kmname}-${PV}.tar.xz" ;; *) - # Stable KDE SC releases - SRC_URI="mirror://kde/stable/${PV}/src/${_kmname_pv}.tar.xz" ;; + if [[ ${CATEGORY} == kde-apps ]]; then + # Stable KDE Applications releases + SRC_URI="mirror://kde/stable/applications/${PV}/src/${_kmname}-${PV}.tar.xz" + else + # Stable KDE SC releases + SRC_URI="mirror://kde/stable/${PV}/src/${_kmname_pv}.tar.xz" + fi + ;; esac ;; kdevelop|kdevelop-php*|kdevplatform)
