commit: b9db3a043ecd2585f5bbcc9d28362e7fab44fdac Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> AuthorDate: Tue Nov 10 02:16:40 2015 +0000 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> CommitDate: Fri Nov 13 16:46:20 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9db3a04
kde-apps/oxygen-icons: pkgmove to kde-frameworks/oxygen-icons kde4-base.eclass: Recognize KDEBASE in kde-frameworks kde4-functions.eclass: Change RDEPEND chromium.eclass: Minor change Various ebuilds: kde-apps/oxygen-icons -> kde-frameworks/oxygen-icons Package-Manager: portage-2.2.23 app-leechcraft/lc-core/lc-core-0.6.60.ebuild | 2 +- app-leechcraft/lc-core/lc-core-0.6.65.ebuild | 2 +- app-leechcraft/lc-core/lc-core-0.6.70.ebuild | 2 +- app-leechcraft/lc-core/lc-core-9999.ebuild | 2 +- eclass/chromium.eclass | 2 +- eclass/kde4-base.eclass | 2 +- eclass/kde4-functions.eclass | 2 +- {kde-apps => kde-frameworks}/oxygen-icons/Manifest | 0 {kde-apps => kde-frameworks}/oxygen-icons/metadata.xml | 0 {kde-apps => kde-frameworks}/oxygen-icons/oxygen-icons-4.14.3.ebuild | 0 lxqt-base/lxqt-meta/lxqt-meta-0.9.0-r2.ebuild | 4 ++-- media-sound/cantata/cantata-1.5.1.ebuild | 2 +- net-im/qutim/qutim-0.3.2.ebuild | 2 +- net-im/qutim/qutim-0.3.3_p1.ebuild | 2 +- net-irc/quassel/quassel-0.12.2-r2.ebuild | 2 +- net-irc/quassel/quassel-0.12.2.ebuild | 2 +- net-irc/quassel/quassel-9999.ebuild | 2 +- profiles/updates/4Q-2015 | 1 + virtual/freedesktop-icon-theme/freedesktop-icon-theme-0.ebuild | 2 +- www-client/chromium/chromium-46.0.2490.86.ebuild | 2 +- www-client/chromium/chromium-47.0.2526.49.ebuild | 2 +- www-client/chromium/chromium-47.0.2526.58.ebuild | 2 +- www-client/chromium/chromium-48.0.2547.0.ebuild | 2 +- www-client/chromium/chromium-48.0.2552.0.ebuild | 2 +- .../google-chrome-unstable-48.0.2560.0_p1.ebuild | 2 +- www-client/google-chrome/google-chrome-46.0.2490.86_p1.ebuild | 2 +- x11-themes/oxygen-molecule/oxygen-molecule-3.2.ebuild | 2 +- x11-themes/tangerine-icon-theme/tangerine-icon-theme-0.27.ebuild | 2 +- 28 files changed, 26 insertions(+), 25 deletions(-) diff --git a/app-leechcraft/lc-core/lc-core-0.6.60.ebuild b/app-leechcraft/lc-core/lc-core-0.6.60.ebuild index e811201..4f1323d 100644 --- a/app-leechcraft/lc-core/lc-core-0.6.60.ebuild +++ b/app-leechcraft/lc-core/lc-core-0.6.60.ebuild @@ -29,7 +29,7 @@ DEPEND="${COMMON_DEPEND} RDEPEND="${COMMON_DEPEND} dev-qt/qtsvg:4 || ( - kde-apps/oxygen-icons + kde-frameworks/oxygen-icons x11-themes/kfaenza )" diff --git a/app-leechcraft/lc-core/lc-core-0.6.65.ebuild b/app-leechcraft/lc-core/lc-core-0.6.65.ebuild index 80761a9..1df615c 100644 --- a/app-leechcraft/lc-core/lc-core-0.6.65.ebuild +++ b/app-leechcraft/lc-core/lc-core-0.6.65.ebuild @@ -29,7 +29,7 @@ DEPEND="${COMMON_DEPEND} RDEPEND="${COMMON_DEPEND} dev-qt/qtsvg:4 || ( - kde-apps/oxygen-icons + kde-frameworks/oxygen-icons x11-themes/kfaenza )" diff --git a/app-leechcraft/lc-core/lc-core-0.6.70.ebuild b/app-leechcraft/lc-core/lc-core-0.6.70.ebuild index 5defdda..f7ca3c9 100644 --- a/app-leechcraft/lc-core/lc-core-0.6.70.ebuild +++ b/app-leechcraft/lc-core/lc-core-0.6.70.ebuild @@ -30,7 +30,7 @@ DEPEND="${COMMON_DEPEND} RDEPEND="${COMMON_DEPEND} dev-qt/qtsvg:4 || ( - kde-apps/oxygen-icons + kde-frameworks/oxygen-icons x11-themes/kfaenza )" diff --git a/app-leechcraft/lc-core/lc-core-9999.ebuild b/app-leechcraft/lc-core/lc-core-9999.ebuild index df3e7fb..a0eb2c1 100644 --- a/app-leechcraft/lc-core/lc-core-9999.ebuild +++ b/app-leechcraft/lc-core/lc-core-9999.ebuild @@ -30,7 +30,7 @@ DEPEND="${COMMON_DEPEND} RDEPEND="${COMMON_DEPEND} dev-qt/qtsvg:4 || ( - kde-apps/oxygen-icons + kde-frameworks/oxygen-icons x11-themes/kfaenza )" diff --git a/eclass/chromium.eclass b/eclass/chromium.eclass index e4da665..ae6a84b 100644 --- a/eclass/chromium.eclass +++ b/eclass/chromium.eclass @@ -140,7 +140,7 @@ chromium_pkg_postinst() { 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-apps/oxygen-icons." + elog "For KDE, the required package is kde-frameworks/oxygen-icons." elog elog "For other desktop environments, try one of the following:" elog " - x11-themes/gnome-icon-theme" diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass index e22d048..44e52d1 100644 --- a/eclass/kde4-base.eclass +++ b/eclass/kde4-base.eclass @@ -328,7 +328,7 @@ fi # all packages needs oxygen icons for basic iconset if [[ ${PN} != oxygen-icons ]]; then - kderdepend+=" kde-apps/oxygen-icons" + kderdepend+=" kde-frameworks/oxygen-icons" fi # add a dependency over kde4-l10n diff --git a/eclass/kde4-functions.eclass b/eclass/kde4-functions.eclass index d2fd060..7319bc5 100644 --- a/eclass/kde4-functions.eclass +++ b/eclass/kde4-functions.eclass @@ -36,7 +36,7 @@ esac # @DESCRIPTION: # This gets set to a non-zero value when a package is considered a kde or # kdevelop ebuild. -if [[ ${CATEGORY} = kde-base || ${CATEGORY} = kde-apps ]]; then +if [[ ${CATEGORY} = kde-base || ${CATEGORY} = kde-apps || ${CATEGORY} = kde-frameworks ]]; then debug-print "${ECLASS}: KDEBASE ebuild recognized" KDEBASE=kde-base elif [[ ${KMNAME-${PN}} = kdevelop ]]; then diff --git a/kde-apps/oxygen-icons/Manifest b/kde-frameworks/oxygen-icons/Manifest similarity index 100% rename from kde-apps/oxygen-icons/Manifest rename to kde-frameworks/oxygen-icons/Manifest diff --git a/kde-apps/oxygen-icons/metadata.xml b/kde-frameworks/oxygen-icons/metadata.xml similarity index 100% rename from kde-apps/oxygen-icons/metadata.xml rename to kde-frameworks/oxygen-icons/metadata.xml diff --git a/kde-apps/oxygen-icons/oxygen-icons-4.14.3.ebuild b/kde-frameworks/oxygen-icons/oxygen-icons-4.14.3.ebuild similarity index 100% rename from kde-apps/oxygen-icons/oxygen-icons-4.14.3.ebuild rename to kde-frameworks/oxygen-icons/oxygen-icons-4.14.3.ebuild diff --git a/lxqt-base/lxqt-meta/lxqt-meta-0.9.0-r2.ebuild b/lxqt-base/lxqt-meta/lxqt-meta-0.9.0-r2.ebuild index 9da7ff2..527357b 100644 --- a/lxqt-base/lxqt-meta/lxqt-meta-0.9.0-r2.ebuild +++ b/lxqt-base/lxqt-meta/lxqt-meta-0.9.0-r2.ebuild @@ -28,7 +28,7 @@ RDEPEND=" virtual/ttf-fonts admin? ( ~lxqt-base/lxqt-admin-${PV} ) filemanager? ( ~x11-misc/pcmanfm-qt-${PV} ) - icons? ( oxygen? ( kde-apps/oxygen-icons ) + icons? ( oxygen? ( kde-frameworks/oxygen-icons ) !oxygen? ( virtual/freedesktop-icon-theme ) ) lightdm? ( x11-misc/lightdm ) lximage? ( media-gfx/lximage-qt ) @@ -41,7 +41,7 @@ RDEPEND=" sddm? ( >=x11-misc/sddm-0.10.0 ) ssh-askpass? ( ~lxqt-base/lxqt-openssh-askpass-${PV} )" -# Note: we prefer kde-apps/oxygen-icons over other icon sets, as the initial +# Note: we prefer kde-frameworks/oxygen-icons over other icon sets, as the initial # install expects oxygen icons, until the user specifies otherwise (bug 543380) S="${WORKDIR}" diff --git a/media-sound/cantata/cantata-1.5.1.ebuild b/media-sound/cantata/cantata-1.5.1.ebuild index 743ff14..a116dd7 100644 --- a/media-sound/cantata/cantata-1.5.1.ebuild +++ b/media-sound/cantata/cantata-1.5.1.ebuild @@ -30,7 +30,7 @@ REQUIRED_USE=" RDEPEND=" sys-libs/zlib x11-libs/libX11 - kde-apps/oxygen-icons + kde-frameworks/oxygen-icons cdda? ( media-sound/cdparanoia ) cddb? ( media-libs/libcddb ) kde? ( $(add_kdeapps_dep kwalletd) ) diff --git a/net-im/qutim/qutim-0.3.2.ebuild b/net-im/qutim/qutim-0.3.2.ebuild index ff2e14f..9ebfd41 100644 --- a/net-im/qutim/qutim-0.3.2.ebuild +++ b/net-im/qutim/qutim-0.3.2.ebuild @@ -90,7 +90,7 @@ DEPEND="${CDEPEND} RDEPEND="${CDEPEND} xmpp? ( app-crypt/qca:2[gpg] ) oscar? ( app-crypt/qca:2[openssl] ) - kde-apps/oxygen-icons + kde-frameworks/oxygen-icons " DOCS=( AUTHORS INSTALL ChangeLog ) diff --git a/net-im/qutim/qutim-0.3.3_p1.ebuild b/net-im/qutim/qutim-0.3.3_p1.ebuild index d1cf922..3e80744 100644 --- a/net-im/qutim/qutim-0.3.3_p1.ebuild +++ b/net-im/qutim/qutim-0.3.3_p1.ebuild @@ -91,7 +91,7 @@ DEPEND="${CDEPEND} RDEPEND="${CDEPEND} xmpp? ( app-crypt/qca:2[gpg] ) oscar? ( app-crypt/qca:2[openssl] ) - kde-apps/oxygen-icons + kde-frameworks/oxygen-icons " DOCS=( AUTHORS INSTALL ChangeLog ) diff --git a/net-irc/quassel/quassel-0.12.2-r2.ebuild b/net-irc/quassel/quassel-0.12.2-r2.ebuild index 0112eb4..11f6a4f 100644 --- a/net-irc/quassel/quassel-0.12.2-r2.ebuild +++ b/net-irc/quassel/quassel-0.12.2-r2.ebuild @@ -63,7 +63,7 @@ GUI_RDEPEND=" dev-qt/qtdbus:4 kde? ( kde-base/kdelibs:4 - kde-apps/oxygen-icons + kde-frameworks/oxygen-icons ayatana? ( kde-misc/plasma-widget-message-indicator ) ) ) diff --git a/net-irc/quassel/quassel-0.12.2.ebuild b/net-irc/quassel/quassel-0.12.2.ebuild index 50e3edf..470d038 100644 --- a/net-irc/quassel/quassel-0.12.2.ebuild +++ b/net-irc/quassel/quassel-0.12.2.ebuild @@ -63,7 +63,7 @@ GUI_RDEPEND=" dev-qt/qtdbus:4 kde? ( kde-base/kdelibs:4 - kde-apps/oxygen-icons + kde-frameworks/oxygen-icons ) ) phonon? ( || ( media-libs/phonon[qt4] dev-qt/qtphonon:4 ) ) diff --git a/net-irc/quassel/quassel-9999.ebuild b/net-irc/quassel/quassel-9999.ebuild index 0b96116..d55c1a8 100644 --- a/net-irc/quassel/quassel-9999.ebuild +++ b/net-irc/quassel/quassel-9999.ebuild @@ -63,7 +63,7 @@ GUI_RDEPEND=" dev-qt/qtdbus:4 kde? ( kde-base/kdelibs:4 - kde-apps/oxygen-icons + kde-frameworks/oxygen-icons ayatana? ( kde-misc/plasma-widget-message-indicator ) ) ) diff --git a/profiles/updates/4Q-2015 b/profiles/updates/4Q-2015 index 2e7926f..c54b7d3 100644 --- a/profiles/updates/4Q-2015 +++ b/profiles/updates/4Q-2015 @@ -10,3 +10,4 @@ slotmove =dev-python/pyfltk-1.3.3 1 0 move virtual/dnspython virtual/python-dnspython move virtual/funcsigs virtual/python-funcsigs move virtual/pmw virtual/python-pmw +move kde-apps/oxygen-icons kde-frameworks/oxygen-icons diff --git a/virtual/freedesktop-icon-theme/freedesktop-icon-theme-0.ebuild b/virtual/freedesktop-icon-theme/freedesktop-icon-theme-0.ebuild index 4b2f1a5..d2db79f 100644 --- a/virtual/freedesktop-icon-theme/freedesktop-icon-theme-0.ebuild +++ b/virtual/freedesktop-icon-theme/freedesktop-icon-theme-0.ebuild @@ -18,7 +18,7 @@ RDEPEND="|| ( x11-themes/faenza-icon-theme lxde-base/lxde-icon-theme x11-themes/tango-icon-theme - kde-apps/oxygen-icons + kde-frameworks/oxygen-icons x11-themes/mate-icon-theme ) " diff --git a/www-client/chromium/chromium-46.0.2490.86.ebuild b/www-client/chromium/chromium-46.0.2490.86.ebuild index f9f393e..6667787 100644 --- a/www-client/chromium/chromium-46.0.2490.86.ebuild +++ b/www-client/chromium/chromium-46.0.2490.86.ebuild @@ -139,7 +139,7 @@ are not displayed properly: Depending on your desktop environment, you may need to install additional packages to get icons on the Downloads page. -For KDE, the required package is kde-apps/oxygen-icons. +For KDE, the required package is kde-frameworks/oxygen-icons. For other desktop environments, try one of the following: - x11-themes/gnome-icon-theme diff --git a/www-client/chromium/chromium-47.0.2526.49.ebuild b/www-client/chromium/chromium-47.0.2526.49.ebuild index b46557d..fbb9efa 100644 --- a/www-client/chromium/chromium-47.0.2526.49.ebuild +++ b/www-client/chromium/chromium-47.0.2526.49.ebuild @@ -146,7 +146,7 @@ are not displayed properly: Depending on your desktop environment, you may need to install additional packages to get icons on the Downloads page. -For KDE, the required package is kde-apps/oxygen-icons. +For KDE, the required package is kde-frameworks/oxygen-icons. For other desktop environments, try one of the following: - x11-themes/gnome-icon-theme diff --git a/www-client/chromium/chromium-47.0.2526.58.ebuild b/www-client/chromium/chromium-47.0.2526.58.ebuild index b46557d..fbb9efa 100644 --- a/www-client/chromium/chromium-47.0.2526.58.ebuild +++ b/www-client/chromium/chromium-47.0.2526.58.ebuild @@ -146,7 +146,7 @@ are not displayed properly: Depending on your desktop environment, you may need to install additional packages to get icons on the Downloads page. -For KDE, the required package is kde-apps/oxygen-icons. +For KDE, the required package is kde-frameworks/oxygen-icons. For other desktop environments, try one of the following: - x11-themes/gnome-icon-theme diff --git a/www-client/chromium/chromium-48.0.2547.0.ebuild b/www-client/chromium/chromium-48.0.2547.0.ebuild index 795e72f..7c51aa4 100644 --- a/www-client/chromium/chromium-48.0.2547.0.ebuild +++ b/www-client/chromium/chromium-48.0.2547.0.ebuild @@ -146,7 +146,7 @@ are not displayed properly: Depending on your desktop environment, you may need to install additional packages to get icons on the Downloads page. -For KDE, the required package is kde-apps/oxygen-icons. +For KDE, the required package is kde-frameworks/oxygen-icons. For other desktop environments, try one of the following: - x11-themes/gnome-icon-theme diff --git a/www-client/chromium/chromium-48.0.2552.0.ebuild b/www-client/chromium/chromium-48.0.2552.0.ebuild index 795e72f..7c51aa4 100644 --- a/www-client/chromium/chromium-48.0.2552.0.ebuild +++ b/www-client/chromium/chromium-48.0.2552.0.ebuild @@ -146,7 +146,7 @@ are not displayed properly: Depending on your desktop environment, you may need to install additional packages to get icons on the Downloads page. -For KDE, the required package is kde-apps/oxygen-icons. +For KDE, the required package is kde-frameworks/oxygen-icons. For other desktop environments, try one of the following: - x11-themes/gnome-icon-theme diff --git a/www-client/google-chrome-unstable/google-chrome-unstable-48.0.2560.0_p1.ebuild b/www-client/google-chrome-unstable/google-chrome-unstable-48.0.2560.0_p1.ebuild index 16a97be..9198058 100644 --- a/www-client/google-chrome-unstable/google-chrome-unstable-48.0.2560.0_p1.ebuild +++ b/www-client/google-chrome-unstable/google-chrome-unstable-48.0.2560.0_p1.ebuild @@ -89,7 +89,7 @@ are not displayed properly: Depending on your desktop environment, you may need to install additional packages to get icons on the Downloads page. -For KDE, the required package is kde-apps/oxygen-icons. +For KDE, the required package is kde-frameworks/oxygen-icons. For other desktop environments, try one of the following: - x11-themes/gnome-icon-theme diff --git a/www-client/google-chrome/google-chrome-46.0.2490.86_p1.ebuild b/www-client/google-chrome/google-chrome-46.0.2490.86_p1.ebuild index 16a97be..9198058 100644 --- a/www-client/google-chrome/google-chrome-46.0.2490.86_p1.ebuild +++ b/www-client/google-chrome/google-chrome-46.0.2490.86_p1.ebuild @@ -89,7 +89,7 @@ are not displayed properly: Depending on your desktop environment, you may need to install additional packages to get icons on the Downloads page. -For KDE, the required package is kde-apps/oxygen-icons. +For KDE, the required package is kde-frameworks/oxygen-icons. For other desktop environments, try one of the following: - x11-themes/gnome-icon-theme diff --git a/x11-themes/oxygen-molecule/oxygen-molecule-3.2.ebuild b/x11-themes/oxygen-molecule/oxygen-molecule-3.2.ebuild index 2468eff..c444db3 100644 --- a/x11-themes/oxygen-molecule/oxygen-molecule-3.2.ebuild +++ b/x11-themes/oxygen-molecule/oxygen-molecule-3.2.ebuild @@ -13,7 +13,7 @@ SLOT="4" KEYWORDS="amd64 x86" IUSE="" -RDEPEND="kde-apps/oxygen-icons" +RDEPEND="kde-frameworks/oxygen-icons" S=${WORKDIR} diff --git a/x11-themes/tangerine-icon-theme/tangerine-icon-theme-0.27.ebuild b/x11-themes/tangerine-icon-theme/tangerine-icon-theme-0.27.ebuild index ebf32d6..ca8740b 100644 --- a/x11-themes/tangerine-icon-theme/tangerine-icon-theme-0.27.ebuild +++ b/x11-themes/tangerine-icon-theme/tangerine-icon-theme-0.27.ebuild @@ -17,7 +17,7 @@ IUSE="minimal" RESTRICT="binchecks strip" -RDEPEND="!minimal? ( || ( x11-themes/gnome-icon-theme kde-apps/oxygen-icons ) )" +RDEPEND="!minimal? ( || ( x11-themes/gnome-icon-theme kde-frameworks/oxygen-icons ) )" DEPEND="dev-util/intltool >=gnome-base/librsvg-2.34 sys-devel/gettext