summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Mende <angelos@gentoo.org>2012-03-23 21:39:42 (GMT)
committerChristoph Mende <angelos@gentoo.org>2012-03-23 21:39:42 (GMT)
commitff4134fa16b9965d2a08a0c10fd0388641726ba9 (patch)
tree037fd1eee5456a28678fb5664b1583cf42edc434
parentxfce4-session: Sync with gentoo-x86 (diff)
downloadxfce-ff4134fa.zip
xfce-ff4134fa.tar.gz
xfce-ff4134fa.tar.bz2
xfce4-settings: Sync with gentoo-x86
(Portage version: 2.2.0_alpha94/git/Linux x86_64, signed Manifest commit with key 84F20B43)
-rw-r--r--xfce-base/xfce4-settings/Manifest8
-rw-r--r--xfce-base/xfce4-settings/xfce4-settings-9999.ebuild21
2 files changed, 14 insertions, 15 deletions
diff --git a/xfce-base/xfce4-settings/Manifest b/xfce-base/xfce4-settings/Manifest
index da88467..fed3d96 100644
--- a/xfce-base/xfce4-settings/Manifest
+++ b/xfce-base/xfce4-settings/Manifest
@@ -1,12 +1,12 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
-EBUILD xfce4-settings-9999.ebuild 1559 RMD160 278ce36dfa130ff9caa4883e720a44286aec3edf SHA1 0f886eeebf25ea16e3958675b96263b4aa46628d SHA256 13eedb5bf080d6a218603d90b05d9bb1ba4a3267f6345164f36ced0e8934f9e4
+EBUILD xfce4-settings-9999.ebuild 1540 RMD160 9e63bcc0854b00951cdb3c4059a8a8ce746804cc SHA1 657d22d6a623cbeb825b06da635ae5476cebc6ad SHA256 2e3a50d1e20ba83756256f96d7240975f714591b5ba2cd3483eb23f84749edf4
MISC metadata.xml 391 RMD160 b281d2622300ce119f47945cc1c8ab91f57c2087 SHA1 44b496f42b7cc7e3924f58f16a63d52d9450b338 SHA256 e12aab743d09d93de0374287e05add71330871ddafb70f9af31707241e1e2815
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.18 (GNU/Linux)
-iF4EAREIAAYFAk7uRC8ACgkQmWq1bYTyC0OHMgD+IzIk67g1bdJrWehvD9csAXPS
-RFvg3D3RJm+grw18ZMEA/3DkSwRJm9dGg/Q8thotMWiZ9UaTbsmaAlbzlhl2WJCB
-=jFEp
+iF4EAREIAAYFAk9s7Z0ACgkQmWq1bYTyC0N3bgD+KoprUWPFDldIeglWedigrrGr
+us207Yq1yjAxt2o0TX4BAJP0w0kabbgTGX753vINsJMZzlF5Ubwm6PaZsKRoheVn
+=ek4I
-----END PGP SIGNATURE-----
diff --git a/xfce-base/xfce4-settings/xfce4-settings-9999.ebuild b/xfce-base/xfce4-settings/xfce4-settings-9999.ebuild
index aeecff4..b476afb 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
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-settings/xfce4-settings-4.8.3.ebuild,v 1.7 2011/11/29 00:07:15 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-settings/xfce4-settings-4.9.2.ebuild,v 1.2 2012/03/23 21:27:03 angelos Exp $
EAPI=4
inherit xfconf
@@ -13,21 +13,21 @@ SLOT="0"
KEYWORDS=""
IUSE="debug libcanberra libnotify +xklavier"
-RDEPEND=">=dev-libs/glib-2.16:2
- >=dev-libs/dbus-glib-0.88
- >=gnome-base/libglade-2
- >=x11-libs/gtk+-2.14:2
+RDEPEND=">=dev-libs/dbus-glib-0.92
+ >=dev-libs/glib-2.24:2
+ media-libs/fontconfig
+ >=x11-libs/gtk+-2.20:2
x11-libs/libX11
>=x11-libs/libXcursor-1.1
>=x11-libs/libXi-1.3
>=x11-libs/libXrandr-1.2
+ >=xfce-base/exo-0.7.1
+ >=xfce-base/libxfce4ui-4.9
>=xfce-base/libxfce4util-4.8
- >=xfce-base/libxfce4ui-4.8
>=xfce-base/xfconf-4.8
- >=xfce-base/exo-0.6
libcanberra? ( >=media-libs/libcanberra-0.25[sound] )
- libnotify? ( >=x11-libs/libnotify-0.4.5 )
- xklavier? ( x11-libs/libxklavier )"
+ libnotify? ( >=x11-libs/libnotify-0.7 )
+ xklavier? ( >=x11-libs/libxklavier-5 )"
DEPEND="${RDEPEND}
dev-util/intltool
dev-util/pkgconfig
@@ -37,7 +37,6 @@ DEPEND="${RDEPEND}
pkg_setup() {
XFCONF=(
- --disable-static
$(use_enable libnotify)
$(use_enable xklavier libxklavier)
$(use_enable libcanberra sound-settings)