Version bump.

Package-Manager: portage-2.2_rc62/cvs/Linux x86_64

4 files changed, 89 insertions, 2 deletions

diff --git a/xfce-base/xfce4-settings/ChangeLog b/xfce-base/xfce4-settings/ChangeLog
index 938b0333746d..b77190a84e90 100644
--- a/xfce-base/xfce4-settings/ChangeLog
+++ b/xfce-base/xfce4-settings/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for xfce-base/xfce4-settings
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-settings/ChangeLog,v 1.32 2010/01/18 00:34:12 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-settings/ChangeLog,v 1.33 2010/02/15 12:18:33 ssuominen Exp $
+
+*xfce4-settings-4.7.1 (15 Feb 2010)
+
+  15 Feb 2010; Samuli Suominen <ssuominen@gentoo.org>
+  +xfce4-settings-4.7.1.ebuild,
+  +files/xfce4-settings-4.7.1-libxklavier.patch:
+  Version bump.
 
   18 Jan 2010; Jeroen Roovers <jer@gentoo.org> xfce4-settings-4.6.3.ebuild:
   Stable for HPPA (bug #281427).
diff --git a/xfce-base/xfce4-settings/Manifest b/xfce-base/xfce4-settings/Manifest
index f2ec29f8f574..5786562e125e 100644
--- a/xfce-base/xfce4-settings/Manifest
+++ b/xfce-base/xfce4-settings/Manifest
@@ -1,11 +1,14 @@
 AUX xfce4-settings-4.6.3-Xi.patch 3446 RMD160 7ac843fc0939fa5c26ea00d9e073824e3e27a088 SHA1 3b9cd3623e9d4a9830075d54e49d7d5e63ea67cf SHA256 b28e940ae81087ea9cc7d15584b6a0ce4d329436dc513652b4fa81807d53160c
 AUX xfce4-settings-4.6.3-exo.patch 677 RMD160 cfd4cd31df25e62babea9d197c9bfbfd02d0df41 SHA1 27dc3571bdb8a6f63de8c4e0d24be17b5f000c3b SHA256 06be2fa459411bb42a03b49fb27bc8ae07d084e85995f6671f721aa750e4e4ae
+AUX xfce4-settings-4.7.1-libxklavier.patch 1247 RMD160 b1a80034634e3304fbe4435d2bc6fc858dd4eeb5 SHA1 e88409c8f89d67c9cb6f6dd57c9f2cc0439417f2 SHA256 51248be1115e934a8075bbe0873137c56b475da577325c5d97d6540ca723f0fe
 DIST xfce4-settings-4.6.1.tar.bz2 501587 RMD160 6ecfa08d6ad528d43988c5fe128b2fcd6db6f0d3 SHA1 ab117c3923571e2437095fd165ac4bf392e658e0 SHA256 36dda4d43366fad47ee95ea5d4fa336d0b14f79c524b4f29a2ac1b9ada4abf8d
 DIST xfce4-settings-4.6.3.tar.bz2 534204 RMD160 732c19f0e6258a9ea2583eddd57d4953817a206d SHA1 8a7f114ae5cab071668937351a0b3b4be1b9b51c SHA256 f34b896960f7c30c3601b9946b145076a215778da6ab8399d268cd1f2b2b9d34
 DIST xfce4-settings-4.7.0.tar.bz2 550655 RMD160 3d8d9c013264091ecccd7adf4230cb626957b0db SHA1 7e5fcdc74e2fdcd13f3d8f8fd077497aaa52950d SHA256 4d547c885871a08bd6d211998c43c913b49fb1ae700e4ee03b6fd7252a146c0e
+DIST xfce4-settings-4.7.1.tar.bz2 557670 RMD160 30d72e732068342ed4ec575d7bb538aae67a827e SHA1 d213664f358ff41693006cd17d3941551317084b SHA256 1f1ea56985b9207f44ae9c7922344edcfd51cba8f2db6861306affa937039500
 EBUILD xfce4-settings-4.6.1.ebuild 1328 RMD160 6c797152f1bf55722c0f31a7346839b9f0a1663b SHA1 0efa0dfa9ae1e886aedf4011bdff99aeb9d06d49 SHA256 2501ba04f2e89220df1b163fe2290331aa901ae0d588c238d70a3fb10295d3ed
 EBUILD xfce4-settings-4.6.3-r1.ebuild 1510 RMD160 224adb8575c8d5c815485c9ae5a58ff05cbc2b78 SHA1 dbfebb743c9bdfc5209b62721433ad06f90f4d22 SHA256 593723431a29240c08ec53c5e07f8e48cbb0d522d9eaf6460669e595e4b442dd
 EBUILD xfce4-settings-4.6.3.ebuild 1473 RMD160 528aaa3e7584502230a446b5f125a37cbb7a7060 SHA1 f2856d8c69613fbd67417806fc92140b5d47c0aa SHA256 98399319e2f11585fb030d07a7bbf733dbe8f8d5740f9a97df8f1ae1c4e08e99
 EBUILD xfce4-settings-4.7.0.ebuild 1424 RMD160 14fb4cfeba636777ac51704b04ede9f7b9a48d1c SHA1 806dcb79e93e272832915538130b120b5668ac58 SHA256 6b4e016775301c1b97dbc1664933bbd0bfae93eaa1d70e095daecdbe92ab031f
-MISC ChangeLog 4691 RMD160 4be91fff62d47d170a28bc6f2dda35ce4c086abb SHA1 65bfa61ec2310dc474c9f58a4cef2e7c61b941df SHA256 b75ac8a1385dab3bc12e1eeaf358e8471542203b5fabd4448a299fb3dc6add2b
+EBUILD xfce4-settings-4.7.1.ebuild 1490 RMD160 549307fe9daf2046dd685f7098ceac4df3075885 SHA1 c864e06ba6bc493801be63fbaa45604bf1a93d2e SHA256 63529b83c5ef756e2f5f3c53730017b25d3dbba4d625977aea0f344806aca249
+MISC ChangeLog 4886 RMD160 20180c29c824ab0a6a20877f2fdf639728e24e57 SHA1 82a3fa9014d918fa1e385ff11282b243fe731cd6 SHA256 089e0785ee29a06cce8105626c217a71786a862c4ffdc01960c59b9cd178061d
 MISC metadata.xml 363 RMD160 2f66508d394f9cc14654775f3a0b117bc10d3ef5 SHA1 8a3e6715e41535ea04377624a621c9ada60fd5ff SHA256 2442135d806e37420f1904d5b32e8b7afe94ed212307d25667f363db06c558e3
diff --git a/xfce-base/xfce4-settings/files/xfce4-settings-4.7.1-libxklavier.patch b/xfce-base/xfce4-settings/files/xfce4-settings-4.7.1-libxklavier.patch
new file mode 100644
index 000000000000..2eecdfd98e40
--- /dev/null
+++ b/xfce-base/xfce4-settings/files/xfce4-settings-4.7.1-libxklavier.patch
@@ -0,0 +1,26 @@
+--- configure.ac
++++ configure.ac
+@@ -142,6 +142,8 @@
+                            [libxklavier], [Keyboard layout selection])
+ XDT_CHECK_OPTIONAL_PACKAGE([LIBXKLAVIER4], [libxklavier], [4.0],
+                            [libxklavier], [Keyboard layout selection])
++XDT_CHECK_OPTIONAL_PACKAGE([LIBXKLAVIER5], [libxklavier], [5.0],
++                           [libxklavier], [Keyboard layout selection])
+ 
+ dnl ************************************
+ dnl *** Xsettings daemon is optional ***
+diff -ur xfce4-settings-4.7.1.orig/dialogs/keyboard-settings/xfce-keyboard-settings.c xfce4-settings-4.7.1/dialogs/keyboard-settings/xfce-keyboard-settings.c
+--- xfce4-settings-4.7.1.orig/dialogs/keyboard-settings/xfce-keyboard-settings.c	2010-01-23 13:48:05.000000000 +0200
++++ xfce4-settings-4.7.1/dialogs/keyboard-settings/xfce-keyboard-settings.c	2010-02-15 14:23:24.000000000 +0200
+@@ -395,7 +395,11 @@
+ 
+ #ifdef HAVE_LIBXKLAVIER
+   /* Stop xklavier engine */
++#ifdef HAVE_LIBXKLAVIER5
++  xkl_engine_stop_listen (settings->priv->xkl_engine, XKLL_TRACK_KEYBOARD_STATE);
++#else
+   xkl_engine_stop_listen (settings->priv->xkl_engine);
++#endif /* HAVE_LIBXKLAVIER5 */
+ #endif /* HAVE_LIBXKLAVIER */
+ 
+   g_object_unref (G_OBJECT (settings->priv->provider));
diff --git a/xfce-base/xfce4-settings/xfce4-settings-4.7.1.ebuild b/xfce-base/xfce4-settings/xfce4-settings-4.7.1.ebuild
new file mode 100644
index 000000000000..b3ce68a4943d
--- /dev/null
+++ b/xfce-base/xfce4-settings/xfce4-settings-4.7.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2010 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.7.1.ebuild,v 1.1 2010/02/15 12:18:33 ssuominen Exp $
+
+EAPI=2
+EAUTORECONF=yes
+inherit xfconf
+
+DESCRIPTION="Settings daemon for Xfce4"
+HOMEPAGE="http://www.xfce.org"
+SRC_URI="mirror://xfce/src/xfce/${PN}/4.7/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
+IUSE="debug +keyboard libnotify sound"
+
+RDEPEND=">=dev-libs/glib-2.16:2
+	>=dev-libs/dbus-glib-0.34
+	>=gnome-base/libglade-2
+	>=x11-libs/gtk+-2.14:2
+	>=x11-libs/libX11-1
+	>=x11-libs/libXcursor-1.1
+	>=x11-libs/libXi-1.3
+	>=x11-libs/libXrandr-1.1
+	>=x11-libs/libwnck-2.12
+	>=xfce-base/libxfce4util-4.6
+	>=xfce-base/libxfce4ui-4.7
+	>=xfce-base/xfconf-4.6
+	>=xfce-base/exo-0.5
+	libnotify? ( >=x11-libs/libnotify-0.1.3 )
+	keyboard? ( >=x11-libs/libxklavier-0.3 )
+	sound? ( media-libs/libcanberra )
+	!<x11-base/xorg-server-1.5.3"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	dev-util/pkgconfig
+	x11-proto/inputproto
+	x11-proto/xf86vidmodeproto"
+
+pkg_setup() {
+	XFCONF="--disable-dependency-tracking
+		--disable-static
+		$(use_enable libnotify)
+		$(use_enable keyboard libxklavier)
+		$(use_enable sound sound-settings)
+		$(use_enable debug)"
+	DOCS="AUTHORS ChangeLog NEWS TODO"
+	PATCHES=( "${FILESDIR}/${P}-libxklavier.patch" )
+}