summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaweł Hajdan <phajdan.jr@gentoo.org>2011-03-10 19:45:12 +0000
committerPaweł Hajdan <phajdan.jr@gentoo.org>2011-03-10 19:45:12 +0000
commit2cc3a4063332e255678fd23bd16d38edfb0253a4 (patch)
tree684a3a6c7f4d18643991a9acdf13c433fd2be849 /www-client
parentVersion bump. Remove old. (diff)
downloadgentoo-2-2cc3a4063332e255678fd23bd16d38edfb0253a4.tar.gz
gentoo-2-2cc3a4063332e255678fd23bd16d38edfb0253a4.tar.bz2
gentoo-2-2cc3a4063332e255678fd23bd16d38edfb0253a4.zip
Use an elog message instead of (problematic) dependencies for Downloads page icons, bug #352263 by Patrizio Bassi <patrizio.bassi@gmail.com>.
(Portage version: 2.1.9.25/cvs/Linux i686)
Diffstat (limited to 'www-client')
-rw-r--r--www-client/chromium/ChangeLog8
-rw-r--r--www-client/chromium/chromium-10.0.648.127.ebuild18
-rw-r--r--www-client/chromium/chromium-11.0.696.1.ebuild16
-rw-r--r--www-client/chromium/chromium-9999-r1.ebuild16
4 files changed, 42 insertions, 16 deletions
diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 95ac47daf9b4..77a70eb1e0c4 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for www-client/chromium
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.303 2011/03/10 18:45:04 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.304 2011/03/10 19:45:12 phajdan.jr Exp $
+
+ 10 Mar 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+ chromium-10.0.648.127.ebuild, chromium-11.0.696.1.ebuild,
+ chromium-9999-r1.ebuild:
+ Use an elog message instead of (problematic) dependencies for Downloads
+ page icons, bug #352263 by Patrizio Bassi <patrizio.bassi@gmail.com>.
*chromium-11.0.696.1 (10 Mar 2011)
diff --git a/www-client/chromium/chromium-10.0.648.127.ebuild b/www-client/chromium/chromium-10.0.648.127.ebuild
index db7d07d220f9..20960c686b56 100644
--- a/www-client/chromium/chromium-10.0.648.127.ebuild
+++ b/www-client/chromium/chromium-10.0.648.127.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-10.0.648.127.ebuild,v 1.2 2011/03/08 23:30:24 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-10.0.648.127.ebuild,v 1.3 2011/03/10 19:45:12 phajdan.jr Exp $
EAPI="3"
PYTHON_DEPEND="2:2.6"
@@ -48,10 +48,6 @@ DEPEND="${RDEPEND}
sys-devel/flex
>=sys-devel/make-3.81-r2"
RDEPEND+="
- || (
- x11-themes/gnome-icon-theme
- x11-themes/xfce4-icon-theme
- )
x11-misc/xdg-utils
virtual/ttf-fonts
gecko-mediaplayer? ( !www-plugins/gecko-mediaplayer[gnome] )"
@@ -319,3 +315,15 @@ src_install() {
doins "${FILESDIR}"/chromium.xml || die
fi
}
+
+pkg_postinst() {
+ # For more info see bugs #292201 and bug #352263.
+ 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
+ elog "For other desktop environments, try one of the following:"
+ elog " - x11-themes/gnome-icon-theme"
+ elog " - x11-themes/xfce4-icon-theme"
+}
diff --git a/www-client/chromium/chromium-11.0.696.1.ebuild b/www-client/chromium/chromium-11.0.696.1.ebuild
index d712896710c2..e493424c58ea 100644
--- a/www-client/chromium/chromium-11.0.696.1.ebuild
+++ b/www-client/chromium/chromium-11.0.696.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-11.0.696.1.ebuild,v 1.1 2011/03/10 18:45:04 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-11.0.696.1.ebuild,v 1.2 2011/03/10 19:45:12 phajdan.jr Exp $
EAPI="3"
PYTHON_DEPEND="2:2.6"
@@ -49,10 +49,6 @@ DEPEND="${RDEPEND}
sys-devel/flex
>=sys-devel/make-3.81-r2"
RDEPEND+="
- || (
- x11-themes/gnome-icon-theme
- x11-themes/xfce4-icon-theme
- )
x11-misc/xdg-utils
virtual/ttf-fonts"
@@ -316,4 +312,14 @@ src_install() {
pkg_postinst() {
fdo-mime_desktop_database_update
+
+ # For more info see bugs #292201 and bug #352263.
+ 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
+ elog "For other desktop environments, try one of the following:"
+ elog " - x11-themes/gnome-icon-theme"
+ elog " - x11-themes/xfce4-icon-theme"
}
diff --git a/www-client/chromium/chromium-9999-r1.ebuild b/www-client/chromium/chromium-9999-r1.ebuild
index c6ab868d58df..cd4ed17e48e5 100644
--- a/www-client/chromium/chromium-9999-r1.ebuild
+++ b/www-client/chromium/chromium-9999-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.5 2011/03/10 18:45:04 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.6 2011/03/10 19:45:12 phajdan.jr Exp $
EAPI="3"
PYTHON_DEPEND="2:2.6"
@@ -51,10 +51,6 @@ DEPEND="${RDEPEND}
>=sys-devel/make-3.81-r2"
RDEPEND+="
!=www-client/chromium-9999
- || (
- x11-themes/gnome-icon-theme
- x11-themes/xfce4-icon-theme
- )
x11-misc/xdg-utils
virtual/ttf-fonts"
@@ -361,6 +357,16 @@ src_install() {
pkg_postinst() {
fdo-mime_desktop_database_update
+ # For more info see bugs #292201 and bug #352263.
+ 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
+ elog "For other desktop environments, try one of the following:"
+ elog " - x11-themes/gnome-icon-theme"
+ elog " - x11-themes/xfce4-icon-theme"
+
elog
elog "The live ebuild of chromium is now in its own slot."
elog "This means that you can have it installed alongside a versioned"