Rename USE="keyboard" to USE="xklavier" matching one in gnome-base/gdm.

(Portage version: 2.2.0_alpha23/cvs/Linux x86_64)

5 files changed, 27 insertions, 18 deletions

diff --git a/xfce-base/xfce4-settings/ChangeLog b/xfce-base/xfce4-settings/ChangeLog
index 6e09808d1385..3b523f4619f2 100644
--- a/xfce-base/xfce4-settings/ChangeLog
+++ b/xfce-base/xfce4-settings/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for xfce-base/xfce4-settings
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-settings/ChangeLog,v 1.68 2011/02/12 09:53:18 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-settings/ChangeLog,v 1.69 2011/02/12 20:57:36 ssuominen Exp $
+
+  12 Feb 2011; Samuli Suominen <ssuominen@gentoo.org>
+  xfce4-settings-4.6.5.ebuild, xfce4-settings-4.8.0.ebuild,
+  xfce4-settings-4.8.1.ebuild, metadata.xml:
+  Rename USE="keyboard" to USE="xklavier" matching one in gnome-base/gdm.
 
   12 Feb 2011; Samuli Suominen <ssuominen@gentoo.org>
   xfce4-settings-4.6.5.ebuild, xfce4-settings-4.8.0.ebuild,
diff --git a/xfce-base/xfce4-settings/metadata.xml b/xfce-base/xfce4-settings/metadata.xml
index 21bbdbdae78b..a80a93222213 100644
--- a/xfce-base/xfce4-settings/metadata.xml
+++ b/xfce-base/xfce4-settings/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
   <herd>xfce</herd>
   <use>
-    <flag name='libcanberra'>Enable sound event support with <pkg>media-libs/libcanberra</pkg></flag>
-    <flag name='keyboard'>Enable Keyboard layout selection with <pkg>x11-libs/libxklavier</pkg></flag>
+    <flag name='libcanberra'>Enable sound event support using <pkg>media-libs/libcanberra</pkg></flag>
+    <flag name='xklavier'>Enable keyboard layout selection support using <pkg>x11-libs/libxklavier</pkg></flag>
   </use>
 </pkgmetadata>
diff --git a/xfce-base/xfce4-settings/xfce4-settings-4.6.5.ebuild b/xfce-base/xfce4-settings/xfce4-settings-4.6.5.ebuild
index 128975774b37..6f29bff211d8 100644
--- a/xfce-base/xfce4-settings/xfce4-settings-4.6.5.ebuild
+++ b/xfce-base/xfce4-settings/xfce4-settings-4.6.5.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-settings-4.6.5.ebuild,v 1.11 2011/02/12 09:53:18 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-settings/xfce4-settings-4.6.5.ebuild,v 1.12 2011/02/12 20:57:36 ssuominen Exp $
 
 EAPI=3
 EAUTORECONF=yes
@@ -13,7 +13,7 @@ SRC_URI="mirror://xfce/src/xfce/${PN}/4.6/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
-IUSE="debug +keyboard libcanberra libnotify"
+IUSE="debug +xklavier libcanberra libnotify"
 
 RDEPEND=">=dev-libs/glib-2.12:2
 	>=dev-libs/dbus-glib-0.34
@@ -29,7 +29,7 @@ RDEPEND=">=dev-libs/glib-2.12:2
 	>=xfce-base/xfconf-4.6
 	>=xfce-base/exo-0.3.100
 	libnotify? ( <x11-libs/libnotify-0.7 )
-	keyboard? ( >=x11-libs/libxklavier-0.3 )
+	xklavier? ( >=x11-libs/libxklavier-0.3 )
 	libcanberra? ( media-libs/libcanberra )"
 DEPEND="${RDEPEND}
 	dev-util/intltool
@@ -39,11 +39,15 @@ DEPEND="${RDEPEND}
 	x11-proto/xf86vidmodeproto"
 
 pkg_setup() {
-	XFCONF="--disable-dependency-tracking
+	XFCONF=(
+		--disable-dependency-tracking
 		$(use_enable libnotify)
-		$(use_enable keyboard libxklavier)
+		$(use_enable xklavier libxklavier)
 		$(use_enable libcanberra sound-settings)
-		$(xfconf_use_debug)"
+		$(xfconf_use_debug)
+		)
+
 	DOCS="AUTHORS ChangeLog NEWS TODO"
-	PATCHES=( "${FILESDIR}/${PN}-4.6.3-exo.patch" )
+
+	PATCHES=( "${FILESDIR}"/${PN}-4.6.3-exo.patch )
 }
diff --git a/xfce-base/xfce4-settings/xfce4-settings-4.8.0.ebuild b/xfce-base/xfce4-settings/xfce4-settings-4.8.0.ebuild
index 0aaac9482857..2da18cff26a4 100644
--- a/xfce-base/xfce4-settings/xfce4-settings-4.8.0.ebuild
+++ b/xfce-base/xfce4-settings/xfce4-settings-4.8.0.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-settings-4.8.0.ebuild,v 1.6 2011/02/12 09:53:18 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-settings/xfce4-settings-4.8.0.ebuild,v 1.7 2011/02/12 20:57:36 ssuominen Exp $
 
 EAPI=3
 inherit xfconf
@@ -12,7 +12,7 @@ SRC_URI="mirror://xfce/src/xfce/${PN}/4.8/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
-IUSE="debug +keyboard libcanberra libnotify"
+IUSE="debug +xklavier libcanberra libnotify"
 
 RDEPEND=">=dev-libs/glib-2.16:2
 	>=dev-libs/dbus-glib-0.88
@@ -28,7 +28,7 @@ RDEPEND=">=dev-libs/glib-2.16:2
 	>=xfce-base/exo-0.6
 	libcanberra? ( >=media-libs/libcanberra-0.25[sound] )
 	libnotify? ( >=x11-libs/libnotify-0.1.3 )
-	keyboard? ( >=x11-libs/libxklavier-0.3 )"
+	xklavier? ( >=x11-libs/libxklavier-0.3 )"
 DEPEND="${RDEPEND}
 	dev-util/intltool
 	sys-devel/gettext
@@ -41,7 +41,7 @@ pkg_setup() {
 		--disable-dependency-tracking
 		--disable-static
 		$(use_enable libnotify)
-		$(use_enable keyboard libxklavier)
+		$(use_enable xklavier libxklavier)
 		$(use_enable libcanberra sound-settings)
 		$(xfconf_use_debug)
 		)
diff --git a/xfce-base/xfce4-settings/xfce4-settings-4.8.1.ebuild b/xfce-base/xfce4-settings/xfce4-settings-4.8.1.ebuild
index 6ec7ca19d7d4..cf58622d687e 100644
--- a/xfce-base/xfce4-settings/xfce4-settings-4.8.1.ebuild
+++ b/xfce-base/xfce4-settings/xfce4-settings-4.8.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/xfce-base/xfce4-settings/xfce4-settings-4.8.1.ebuild,v 1.2 2011/02/12 09:53:18 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-settings/xfce4-settings-4.8.1.ebuild,v 1.3 2011/02/12 20:57:36 ssuominen Exp $
 
 EAPI=3
 inherit xfconf
@@ -12,7 +12,7 @@ SRC_URI="mirror://xfce/src/xfce/${PN}/4.8/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
-IUSE="debug +keyboard libcanberra libnotify"
+IUSE="debug libcanberra libnotify +xklavier"
 
 RDEPEND=">=dev-libs/glib-2.16:2
 	>=dev-libs/dbus-glib-0.88
@@ -28,7 +28,7 @@ RDEPEND=">=dev-libs/glib-2.16:2
 	>=xfce-base/exo-0.6
 	libcanberra? ( >=media-libs/libcanberra-0.25[sound] )
 	libnotify? ( >=x11-libs/libnotify-0.1.3 )
-	keyboard? ( >=x11-libs/libxklavier-0.3 )"
+	xklavier? ( >=x11-libs/libxklavier-0.3 )"
 DEPEND="${RDEPEND}
 	dev-util/intltool
 	dev-util/pkgconfig
@@ -41,7 +41,7 @@ pkg_setup() {
 		--disable-dependency-tracking
 		--disable-static
 		$(use_enable libnotify)
-		$(use_enable keyboard libxklavier)
+		$(use_enable xklavier libxklavier)
 		$(use_enable libcanberra sound-settings)
 		$(xfconf_use_debug)
 		)