kensington 15/06/04 18:49:42 Modified: ChangeLog chromium.eclass kde4-base.eclass Log: Move various kde-base packages to kde-apps.
Revision Changes Path 1.1640 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1640&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1640&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1639&r2=1.1640 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.1639 retrieving revision 1.1640 diff -u -r1.1639 -r1.1640 --- ChangeLog 4 Jun 2015 10:36:27 -0000 1.1639 +++ ChangeLog 4 Jun 2015 18:49:42 -0000 1.1640 @@ -1,6 +1,10 @@ # ChangeLog for eclass directory # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1639 2015/06/04 10:36:27 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1640 2015/06/04 18:49:42 kensington Exp $ + + 04 Jun 2015; Michael Palimaka <[email protected]> chromium.eclass, + kde4-base.eclass: + Move various kde-base packages to kde-apps. 04 Jun 2015; Justin Lecher <[email protected]> intel-sdp.eclass: Use path_exists from eutils.eclass 1.12 eclass/chromium.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/chromium.eclass?rev=1.12&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/chromium.eclass?rev=1.12&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/chromium.eclass?r1=1.11&r2=1.12 Index: chromium.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/chromium.eclass,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- chromium.eclass 21 May 2015 12:28:00 -0000 1.11 +++ chromium.eclass 4 Jun 2015 18:49:42 -0000 1.12 @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/chromium.eclass,v 1.11 2015/05/21 12:28:00 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/chromium.eclass,v 1.12 2015/06/04 18:49:42 kensington Exp $ # @ECLASS: chromium.eclass # @MAINTAINER: @@ -136,7 +136,7 @@ elog "Depending on your desktop environment, you may need" elog "to install additional packages to get icons on the Downloads page." elog - elog "For KDE, the required package is kde-base/oxygen-icons." + elog "For KDE, the required package is kde-apps/oxygen-icons." elog elog "For other desktop environments, try one of the following:" elog " - x11-themes/gnome-icon-theme" 1.155 eclass/kde4-base.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.155&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.155&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?r1=1.154&r2=1.155 Index: kde4-base.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v retrieving revision 1.154 retrieving revision 1.155 diff -u -r1.154 -r1.155 --- kde4-base.eclass 3 Jun 2015 22:36:30 -0000 1.154 +++ kde4-base.eclass 4 Jun 2015 18:49:42 -0000 1.155 @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.154 2015/06/03 22:36:30 mrueg Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.155 2015/06/04 18:49:42 kensington Exp $ # @ECLASS: kde4-base.eclass # @MAINTAINER: @@ -328,7 +328,7 @@ # all packages needs oxygen icons for basic iconset if [[ ${PN} != oxygen-icons ]]; then - kderdepend+=" || ( kde-apps/oxygen-icons $(add_kdebase_dep oxygen-icons '' 4.14.3) )" + kderdepend+=" kde-apps/oxygen-icons" fi # add a dependency over kde-l10n @@ -339,7 +339,7 @@ # 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. kderdepend+=" - linguas_${_lingua}? ( || ( kde-apps/kde4-l10n[linguas_${_lingua}(+)] $(add_kdebase_dep kde-l10n "linguas_${_lingua}(+)") ) ) + linguas_${_lingua}? ( $(add_kdeapps_dep kde4-l10n "linguas_${_lingua}(+)") ) " done unset _lingua @@ -904,7 +904,7 @@ fi # for all 3rd party soft tell user that he SHOULD install kdebase-startkde or kdebase-runtime-meta if [[ ${KDEBASE} != kde-base ]] && \ - ! has_version 'kde-base/kdebase-runtime-meta' && \ + ! has_version 'kde-apps/kdebase-runtime-meta' && \ ! has_version 'kde-base/kdebase-startkde'; then if [[ ${KDE_REQUIRED} == always ]] || ( [[ ${KDE_REQUIRED} == optional ]] && use kde ); then echo
