From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RcN2H-0001F2-PC for garchives@archives.gentoo.org; Sun, 18 Dec 2011 20:08:42 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CC7FF21C352; Sun, 18 Dec 2011 20:00:47 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 59EC221C33E for ; Sun, 18 Dec 2011 19:59:00 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CB5391B403D for ; Sun, 18 Dec 2011 19:58:59 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 0A06A8004C for ; Sun, 18 Dec 2011 19:58:58 +0000 (UTC) From: "Christoph Mende" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Christoph Mende" Message-ID: Subject: [gentoo-commits] proj/xfce:master commit in: xfce-base/xfce4-settings/ X-VCS-Repository: proj/xfce X-VCS-Files: xfce-base/xfce4-settings/xfce4-settings-9999.ebuild X-VCS-Directories: xfce-base/xfce4-settings/ X-VCS-Committer: angelos X-VCS-Committer-Name: Christoph Mende X-VCS-Revision: e89723dc1bf21252ab2bb3cc419176cba241a47b Date: Sun, 18 Dec 2011 19:58:58 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 6720b8a3-418e-424d-8d11-880a014986d3 X-Archives-Hash: 3472a82423872a7b2ccef5f40ed5ebdb commit: e89723dc1bf21252ab2bb3cc419176cba241a47b Author: Christoph Mende gentoo org> AuthorDate: Sun Dec 18 19:51:11 2011 +0000 Commit: Christoph Mende gentoo org> CommitDate: Sun Dec 18 19:51:11 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/xfce.git;a=3D= commit;h=3De89723dc xfce4-settings: Sync with gentoo-x86 (Portage version: 2.2.0_alpha81/git/Linux x86_64, signed Manifest commit = with key 84F20B43) --- .../xfce4-settings/xfce4-settings-9999.ebuild | 16 ++++++++++----= -- 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/xfce-base/xfce4-settings/xfce4-settings-9999.ebuild b/xfce-b= ase/xfce4-settings/xfce4-settings-9999.ebuild index 063b9ff..aeecff4 100644 --- a/xfce-base/xfce4-settings/xfce4-settings-9999.ebuild +++ b/xfce-base/xfce4-settings/xfce4-settings-9999.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/xfce-base/xfce4-settings/xfce4-settin= gs-4.8.2.ebuild,v 1.2 2011/05/19 19:25:34 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-settings/xfce4-settin= gs-4.8.3.ebuild,v 1.7 2011/11/29 00:07:15 ssuominen Exp $ =20 EAPI=3D4 inherit xfconf @@ -13,11 +13,10 @@ SLOT=3D"0" KEYWORDS=3D"" IUSE=3D"debug libcanberra libnotify +xklavier" =20 -RDEPEND=3D">=3Ddev-libs/glib-2.24:2 +RDEPEND=3D">=3Ddev-libs/glib-2.16:2 >=3Ddev-libs/dbus-glib-0.88 - gnome-base/libglade:2.0 - media-libs/fontconfig:1.0 - >=3Dx11-libs/gtk+-2.20:2 + >=3Dgnome-base/libglade-2 + >=3Dx11-libs/gtk+-2.14:2 x11-libs/libX11 >=3Dx11-libs/libXcursor-1.1 >=3Dx11-libs/libXi-1.3 @@ -49,6 +48,11 @@ pkg_setup() { } =20 src_prepare() { - sed -i -e '/IconThemeName/s:Rodent:Tango:' xfsettingsd/xsettings.xml ||= die + local theme=3DHicolor + has_version x11-themes/tango-icon-theme && theme=3DTango + has_version x11-themes/gnome-icon-theme && theme=3DGNOME + has_version x11-themes/faenza-icon-theme && theme=3DFaenza + sed -i -e "/IconThemeName/s:Rodent:${theme}:" xfsettingsd/xsettings.xml= || die + xfconf_src_prepare }