Block >=libxklavier-4.

(Portage version: 2.2_rc33/cvs/Linux x86_64)

5 files changed, 7 insertions, 56 deletions

diff --git a/xfce-extra/xfce4-xkb/ChangeLog b/xfce-extra/xfce4-xkb/ChangeLog
index dc71ac437a53..baa9a13fdbc9 100644
--- a/xfce-extra/xfce4-xkb/ChangeLog
+++ b/xfce-extra/xfce4-xkb/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for xfce-extra/xfce4-xkb
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-xkb/ChangeLog,v 1.46 2009/03/16 14:44:47 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-xkb/ChangeLog,v 1.47 2009/07/20 15:44:52 ssuominen Exp $
+
+  20 Jul 2009; Samuli Suominen <ssuominen@gentoo.org>
+  xfce4-xkb-0.5.3.3.ebuild:
+  Block >=libxklavier-4.
 
   16 Mar 2009; Christoph Mende <angelos@gentoo.org>
   xfce4-xkb-0.5.3.3.ebuild:
diff --git a/xfce-extra/xfce4-xkb/files/xfce4-xkb-0.4.3-libtool.patch b/xfce-extra/xfce4-xkb/files/xfce4-xkb-0.4.3-libtool.patch
deleted file mode 100644
index c96adcbb7e0c..000000000000
--- a/xfce-extra/xfce4-xkb/files/xfce4-xkb-0.4.3-libtool.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- xfce4-xkb-plugin-0.4.3/configure.in.orig	2008-09-21 21:00:26.000000000 +0200
-+++ xfce4-xkb-plugin-0.4.3/configure.in	2008-09-21 21:00:36.000000000 +0200
-@@ -38,6 +38,7 @@
- AC_PROG_CC()
- AC_PROG_LD()
- AC_PROG_INSTALL()
-+AC_PROG_LIBTOOL()
- AC_PROG_INTLTOOL()
- 
- dnl *******************************
diff --git a/xfce-extra/xfce4-xkb/xfce4-xkb-0.5.3.1.ebuild b/xfce-extra/xfce4-xkb/xfce4-xkb-0.5.3.1.ebuild
deleted file mode 100644
index 6efd3e45a5ce..000000000000
--- a/xfce-extra/xfce4-xkb/xfce4-xkb-0.5.3.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-xkb/xfce4-xkb-0.5.3.1.ebuild,v 1.1 2009/01/31 12:40:55 angelos Exp $
-
-inherit xfce44
-
-xfce44
-xfce44_gzipped
-
-DESCRIPTION="XKB layout switching panel plugin"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-RDEPEND=">=x11-libs/libxklavier-3.2
-	x11-libs/libwnck"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	x11-proto/kbproto
-	gnome-base/librsvg"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-xfce44_goodies_panel_plugin
diff --git a/xfce-extra/xfce4-xkb/xfce4-xkb-0.5.3.2.ebuild b/xfce-extra/xfce4-xkb/xfce4-xkb-0.5.3.2.ebuild
deleted file mode 100644
index 03e4b4b3256b..000000000000
--- a/xfce-extra/xfce4-xkb/xfce4-xkb-0.5.3.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-xkb/xfce4-xkb-0.5.3.2.ebuild,v 1.1 2009/02/04 10:26:33 angelos Exp $
-
-inherit xfce44
-
-xfce44
-xfce44_gzipped
-
-DESCRIPTION="XKB layout switching panel plugin"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-RDEPEND=">=x11-libs/libxklavier-3.2
-	x11-libs/libwnck"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	x11-proto/kbproto
-	gnome-base/librsvg"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-xfce44_goodies_panel_plugin
diff --git a/xfce-extra/xfce4-xkb/xfce4-xkb-0.5.3.3.ebuild b/xfce-extra/xfce4-xkb/xfce4-xkb-0.5.3.3.ebuild
index 1b392d589f70..0c44046b699c 100644
--- a/xfce-extra/xfce4-xkb/xfce4-xkb-0.5.3.3.ebuild
+++ b/xfce-extra/xfce4-xkb/xfce4-xkb-0.5.3.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-xkb/xfce4-xkb-0.5.3.3.ebuild,v 1.2 2009/03/16 14:44:47 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-xkb/xfce4-xkb-0.5.3.3.ebuild,v 1.3 2009/07/20 15:44:52 ssuominen Exp $
 
 inherit xfce4
 
@@ -11,6 +11,7 @@ DESCRIPTION="XKB layout switching panel plugin"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE=""
 RDEPEND=">=x11-libs/libxklavier-3.2
+	!>=x11-libs/libxklavier-4
 	x11-libs/libwnck"
 DEPEND="${RDEPEND}
 	dev-util/intltool