mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-08-24 18:58:08 -07:00
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
This commit is contained in:
committed by
Michael Palimaka
parent
7dc172758a
commit
b9db3a043e
@@ -29,7 +29,7 @@ DEPEND="${COMMON_DEPEND}
|
|||||||
RDEPEND="${COMMON_DEPEND}
|
RDEPEND="${COMMON_DEPEND}
|
||||||
dev-qt/qtsvg:4
|
dev-qt/qtsvg:4
|
||||||
|| (
|
|| (
|
||||||
kde-apps/oxygen-icons
|
kde-frameworks/oxygen-icons
|
||||||
x11-themes/kfaenza
|
x11-themes/kfaenza
|
||||||
)"
|
)"
|
||||||
|
|
||||||
|
|||||||
@@ -29,7 +29,7 @@ DEPEND="${COMMON_DEPEND}
|
|||||||
RDEPEND="${COMMON_DEPEND}
|
RDEPEND="${COMMON_DEPEND}
|
||||||
dev-qt/qtsvg:4
|
dev-qt/qtsvg:4
|
||||||
|| (
|
|| (
|
||||||
kde-apps/oxygen-icons
|
kde-frameworks/oxygen-icons
|
||||||
x11-themes/kfaenza
|
x11-themes/kfaenza
|
||||||
)"
|
)"
|
||||||
|
|
||||||
|
|||||||
@@ -30,7 +30,7 @@ DEPEND="${COMMON_DEPEND}
|
|||||||
RDEPEND="${COMMON_DEPEND}
|
RDEPEND="${COMMON_DEPEND}
|
||||||
dev-qt/qtsvg:4
|
dev-qt/qtsvg:4
|
||||||
|| (
|
|| (
|
||||||
kde-apps/oxygen-icons
|
kde-frameworks/oxygen-icons
|
||||||
x11-themes/kfaenza
|
x11-themes/kfaenza
|
||||||
)"
|
)"
|
||||||
|
|
||||||
|
|||||||
@@ -30,7 +30,7 @@ DEPEND="${COMMON_DEPEND}
|
|||||||
RDEPEND="${COMMON_DEPEND}
|
RDEPEND="${COMMON_DEPEND}
|
||||||
dev-qt/qtsvg:4
|
dev-qt/qtsvg:4
|
||||||
|| (
|
|| (
|
||||||
kde-apps/oxygen-icons
|
kde-frameworks/oxygen-icons
|
||||||
x11-themes/kfaenza
|
x11-themes/kfaenza
|
||||||
)"
|
)"
|
||||||
|
|
||||||
|
|||||||
@@ -140,7 +140,7 @@ chromium_pkg_postinst() {
|
|||||||
elog "Depending on your desktop environment, you may need"
|
elog "Depending on your desktop environment, you may need"
|
||||||
elog "to install additional packages to get icons on the Downloads page."
|
elog "to install additional packages to get icons on the Downloads page."
|
||||||
elog
|
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
|
||||||
elog "For other desktop environments, try one of the following:"
|
elog "For other desktop environments, try one of the following:"
|
||||||
elog " - x11-themes/gnome-icon-theme"
|
elog " - x11-themes/gnome-icon-theme"
|
||||||
|
|||||||
@@ -328,7 +328,7 @@ fi
|
|||||||
|
|
||||||
# all packages needs oxygen icons for basic iconset
|
# all packages needs oxygen icons for basic iconset
|
||||||
if [[ ${PN} != oxygen-icons ]]; then
|
if [[ ${PN} != oxygen-icons ]]; then
|
||||||
kderdepend+=" kde-apps/oxygen-icons"
|
kderdepend+=" kde-frameworks/oxygen-icons"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# add a dependency over kde4-l10n
|
# add a dependency over kde4-l10n
|
||||||
|
|||||||
@@ -36,7 +36,7 @@ esac
|
|||||||
# @DESCRIPTION:
|
# @DESCRIPTION:
|
||||||
# This gets set to a non-zero value when a package is considered a kde or
|
# This gets set to a non-zero value when a package is considered a kde or
|
||||||
# kdevelop ebuild.
|
# 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"
|
debug-print "${ECLASS}: KDEBASE ebuild recognized"
|
||||||
KDEBASE=kde-base
|
KDEBASE=kde-base
|
||||||
elif [[ ${KMNAME-${PN}} = kdevelop ]]; then
|
elif [[ ${KMNAME-${PN}} = kdevelop ]]; then
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ RDEPEND="
|
|||||||
virtual/ttf-fonts
|
virtual/ttf-fonts
|
||||||
admin? ( ~lxqt-base/lxqt-admin-${PV} )
|
admin? ( ~lxqt-base/lxqt-admin-${PV} )
|
||||||
filemanager? ( ~x11-misc/pcmanfm-qt-${PV} )
|
filemanager? ( ~x11-misc/pcmanfm-qt-${PV} )
|
||||||
icons? ( oxygen? ( kde-apps/oxygen-icons )
|
icons? ( oxygen? ( kde-frameworks/oxygen-icons )
|
||||||
!oxygen? ( virtual/freedesktop-icon-theme ) )
|
!oxygen? ( virtual/freedesktop-icon-theme ) )
|
||||||
lightdm? ( x11-misc/lightdm )
|
lightdm? ( x11-misc/lightdm )
|
||||||
lximage? ( media-gfx/lximage-qt )
|
lximage? ( media-gfx/lximage-qt )
|
||||||
@@ -41,7 +41,7 @@ RDEPEND="
|
|||||||
sddm? ( >=x11-misc/sddm-0.10.0 )
|
sddm? ( >=x11-misc/sddm-0.10.0 )
|
||||||
ssh-askpass? ( ~lxqt-base/lxqt-openssh-askpass-${PV} )"
|
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)
|
# install expects oxygen icons, until the user specifies otherwise (bug 543380)
|
||||||
|
|
||||||
S="${WORKDIR}"
|
S="${WORKDIR}"
|
||||||
|
|||||||
@@ -30,7 +30,7 @@ REQUIRED_USE="
|
|||||||
RDEPEND="
|
RDEPEND="
|
||||||
sys-libs/zlib
|
sys-libs/zlib
|
||||||
x11-libs/libX11
|
x11-libs/libX11
|
||||||
kde-apps/oxygen-icons
|
kde-frameworks/oxygen-icons
|
||||||
cdda? ( media-sound/cdparanoia )
|
cdda? ( media-sound/cdparanoia )
|
||||||
cddb? ( media-libs/libcddb )
|
cddb? ( media-libs/libcddb )
|
||||||
kde? ( $(add_kdeapps_dep kwalletd) )
|
kde? ( $(add_kdeapps_dep kwalletd) )
|
||||||
|
|||||||
@@ -90,7 +90,7 @@ DEPEND="${CDEPEND}
|
|||||||
RDEPEND="${CDEPEND}
|
RDEPEND="${CDEPEND}
|
||||||
xmpp? ( app-crypt/qca:2[gpg] )
|
xmpp? ( app-crypt/qca:2[gpg] )
|
||||||
oscar? ( app-crypt/qca:2[openssl] )
|
oscar? ( app-crypt/qca:2[openssl] )
|
||||||
kde-apps/oxygen-icons
|
kde-frameworks/oxygen-icons
|
||||||
"
|
"
|
||||||
|
|
||||||
DOCS=( AUTHORS INSTALL ChangeLog )
|
DOCS=( AUTHORS INSTALL ChangeLog )
|
||||||
|
|||||||
@@ -91,7 +91,7 @@ DEPEND="${CDEPEND}
|
|||||||
RDEPEND="${CDEPEND}
|
RDEPEND="${CDEPEND}
|
||||||
xmpp? ( app-crypt/qca:2[gpg] )
|
xmpp? ( app-crypt/qca:2[gpg] )
|
||||||
oscar? ( app-crypt/qca:2[openssl] )
|
oscar? ( app-crypt/qca:2[openssl] )
|
||||||
kde-apps/oxygen-icons
|
kde-frameworks/oxygen-icons
|
||||||
"
|
"
|
||||||
|
|
||||||
DOCS=( AUTHORS INSTALL ChangeLog )
|
DOCS=( AUTHORS INSTALL ChangeLog )
|
||||||
|
|||||||
@@ -63,7 +63,7 @@ GUI_RDEPEND="
|
|||||||
dev-qt/qtdbus:4
|
dev-qt/qtdbus:4
|
||||||
kde? (
|
kde? (
|
||||||
kde-base/kdelibs:4
|
kde-base/kdelibs:4
|
||||||
kde-apps/oxygen-icons
|
kde-frameworks/oxygen-icons
|
||||||
ayatana? ( kde-misc/plasma-widget-message-indicator )
|
ayatana? ( kde-misc/plasma-widget-message-indicator )
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -63,7 +63,7 @@ GUI_RDEPEND="
|
|||||||
dev-qt/qtdbus:4
|
dev-qt/qtdbus:4
|
||||||
kde? (
|
kde? (
|
||||||
kde-base/kdelibs:4
|
kde-base/kdelibs:4
|
||||||
kde-apps/oxygen-icons
|
kde-frameworks/oxygen-icons
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
phonon? ( || ( media-libs/phonon[qt4] dev-qt/qtphonon:4 ) )
|
phonon? ( || ( media-libs/phonon[qt4] dev-qt/qtphonon:4 ) )
|
||||||
|
|||||||
@@ -63,7 +63,7 @@ GUI_RDEPEND="
|
|||||||
dev-qt/qtdbus:4
|
dev-qt/qtdbus:4
|
||||||
kde? (
|
kde? (
|
||||||
kde-base/kdelibs:4
|
kde-base/kdelibs:4
|
||||||
kde-apps/oxygen-icons
|
kde-frameworks/oxygen-icons
|
||||||
ayatana? ( kde-misc/plasma-widget-message-indicator )
|
ayatana? ( kde-misc/plasma-widget-message-indicator )
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -10,3 +10,4 @@ slotmove =dev-python/pyfltk-1.3.3 1 0
|
|||||||
move virtual/dnspython virtual/python-dnspython
|
move virtual/dnspython virtual/python-dnspython
|
||||||
move virtual/funcsigs virtual/python-funcsigs
|
move virtual/funcsigs virtual/python-funcsigs
|
||||||
move virtual/pmw virtual/python-pmw
|
move virtual/pmw virtual/python-pmw
|
||||||
|
move kde-apps/oxygen-icons kde-frameworks/oxygen-icons
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ RDEPEND="|| (
|
|||||||
x11-themes/faenza-icon-theme
|
x11-themes/faenza-icon-theme
|
||||||
lxde-base/lxde-icon-theme
|
lxde-base/lxde-icon-theme
|
||||||
x11-themes/tango-icon-theme
|
x11-themes/tango-icon-theme
|
||||||
kde-apps/oxygen-icons
|
kde-frameworks/oxygen-icons
|
||||||
x11-themes/mate-icon-theme
|
x11-themes/mate-icon-theme
|
||||||
)
|
)
|
||||||
"
|
"
|
||||||
|
|||||||
@@ -139,7 +139,7 @@ are not displayed properly:
|
|||||||
Depending on your desktop environment, you may need
|
Depending on your desktop environment, you may need
|
||||||
to install additional packages to get icons on the Downloads page.
|
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:
|
For other desktop environments, try one of the following:
|
||||||
- x11-themes/gnome-icon-theme
|
- x11-themes/gnome-icon-theme
|
||||||
|
|||||||
@@ -146,7 +146,7 @@ are not displayed properly:
|
|||||||
Depending on your desktop environment, you may need
|
Depending on your desktop environment, you may need
|
||||||
to install additional packages to get icons on the Downloads page.
|
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:
|
For other desktop environments, try one of the following:
|
||||||
- x11-themes/gnome-icon-theme
|
- x11-themes/gnome-icon-theme
|
||||||
|
|||||||
@@ -146,7 +146,7 @@ are not displayed properly:
|
|||||||
Depending on your desktop environment, you may need
|
Depending on your desktop environment, you may need
|
||||||
to install additional packages to get icons on the Downloads page.
|
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:
|
For other desktop environments, try one of the following:
|
||||||
- x11-themes/gnome-icon-theme
|
- x11-themes/gnome-icon-theme
|
||||||
|
|||||||
@@ -146,7 +146,7 @@ are not displayed properly:
|
|||||||
Depending on your desktop environment, you may need
|
Depending on your desktop environment, you may need
|
||||||
to install additional packages to get icons on the Downloads page.
|
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:
|
For other desktop environments, try one of the following:
|
||||||
- x11-themes/gnome-icon-theme
|
- x11-themes/gnome-icon-theme
|
||||||
|
|||||||
@@ -146,7 +146,7 @@ are not displayed properly:
|
|||||||
Depending on your desktop environment, you may need
|
Depending on your desktop environment, you may need
|
||||||
to install additional packages to get icons on the Downloads page.
|
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:
|
For other desktop environments, try one of the following:
|
||||||
- x11-themes/gnome-icon-theme
|
- x11-themes/gnome-icon-theme
|
||||||
|
|||||||
@@ -89,7 +89,7 @@ are not displayed properly:
|
|||||||
Depending on your desktop environment, you may need
|
Depending on your desktop environment, you may need
|
||||||
to install additional packages to get icons on the Downloads page.
|
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:
|
For other desktop environments, try one of the following:
|
||||||
- x11-themes/gnome-icon-theme
|
- x11-themes/gnome-icon-theme
|
||||||
|
|||||||
@@ -89,7 +89,7 @@ are not displayed properly:
|
|||||||
Depending on your desktop environment, you may need
|
Depending on your desktop environment, you may need
|
||||||
to install additional packages to get icons on the Downloads page.
|
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:
|
For other desktop environments, try one of the following:
|
||||||
- x11-themes/gnome-icon-theme
|
- x11-themes/gnome-icon-theme
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ SLOT="4"
|
|||||||
KEYWORDS="amd64 x86"
|
KEYWORDS="amd64 x86"
|
||||||
IUSE=""
|
IUSE=""
|
||||||
|
|
||||||
RDEPEND="kde-apps/oxygen-icons"
|
RDEPEND="kde-frameworks/oxygen-icons"
|
||||||
|
|
||||||
S=${WORKDIR}
|
S=${WORKDIR}
|
||||||
|
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ IUSE="minimal"
|
|||||||
|
|
||||||
RESTRICT="binchecks strip"
|
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
|
DEPEND="dev-util/intltool
|
||||||
>=gnome-base/librsvg-2.34
|
>=gnome-base/librsvg-2.34
|
||||||
sys-devel/gettext
|
sys-devel/gettext
|
||||||
|
|||||||
Reference in New Issue
Block a user