Block >=libxklavier-4.

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

6 files changed, 9 insertions, 73 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/Manifest b/xfce-extra/xfce4-xkb/Manifest
index 0fdac387107c..a8099732829c 100644
--- a/xfce-extra/xfce4-xkb/Manifest
+++ b/xfce-extra/xfce4-xkb/Manifest
@@ -1,21 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX xfce4-xkb-0.4.3-libtool.patch 300 RMD160 c3b01523c988f550f92f6d91f5ea9f29a3802a22 SHA1 12e1ca7ffb60058af19a8a347f7cf2ecf75f677e SHA256 b56c96030aebaed045143a02a5ad64a2d5f1691983275f5a8ecf2e9f4c081114
 DIST xfce4-xkb-plugin-0.5.2.tar.gz 832449 RMD160 a55cdc77e5303e08d6d203607e4ce80cf1c435d4 SHA1 28fe7940416887aeea555433c4e7a0f2e10c575b SHA256 ff18a46137184870307c958614c2f22b16dac9472132dec2aba5608cde489346
-DIST xfce4-xkb-plugin-0.5.3.1.tar.gz 765726 RMD160 8862c90030691ed0797c742f76a129ae5dfbe320 SHA1 abb4776700e8080b4fe60229235d25592a75a676 SHA256 6a80af48a88c24d1d0905b313da4d610c803301cd596bdc2f21bf0ffadbf932c
-DIST xfce4-xkb-plugin-0.5.3.2.tar.gz 762139 RMD160 0181360e1a65c4fec2c27fedf197ded3b840c19e SHA1 3277affa0e5ece0b580428bbb8d7c6787d94c4a7 SHA256 893b720ceca12c8e94851c874b842ef08c3fbb50a539ab599d2f888901847cd6
 DIST xfce4-xkb-plugin-0.5.3.3.tar.gz 768414 RMD160 c4f691f0712c105ca37e4af4b311b066cceb3eec SHA1 5e83d55cd6f14a62a87ccadd0f11eee070a6f4a7 SHA256 97b257ae15feefb9a32ef1d34d696797e2555862e19cc46bc31d84379c531379
 EBUILD xfce4-xkb-0.5.2.ebuild 589 RMD160 7dfda409e22329848b9bc9209db6d4bc3ac91f11 SHA1 517d5e19e1c9fa9231972326c311e46c79f85f84 SHA256 de60d0c8cec49dd5c21bc3928211721e1495cb5f3e3bcf00edbeba8c6dcc53fa
-EBUILD xfce4-xkb-0.5.3.1.ebuild 600 RMD160 90eed48640e28b8a74ee8b9dfd91c2cd94fe59c4 SHA1 8e30b8384919bc6e7a44d2072766ce329a38c80c SHA256 14a8862b3644eb1b705d13d63087b1599ee9e84c32cd44034c9a42b96b3cdf67
-EBUILD xfce4-xkb-0.5.3.2.ebuild 600 RMD160 165f4455de7776df4626a4735d94dcfaee80e1dd SHA1 6ab0f8b0fe39724aa44c1825ac2576a08e7fea42 SHA256 e990419556bd7307e505f503214085a7cd7677f627af3c62856a7a70dbc3230b
-EBUILD xfce4-xkb-0.5.3.3.ebuild 599 RMD160 b35f2cd94be54cc61bb4b7a85330b32a3c17cf6a SHA1 db8977ad8fe5102562876522cf6a900b421da83f SHA256 5dc24c93f4d44803aa02130b666c04851c40a467cb02cfd7cfd19332a9a52613
-MISC ChangeLog 6014 RMD160 873153034faeac5a44818940ff67e9378b148fd0 SHA1 c0e0df7873ddda14f2f76bf865c1ecb192b0ff42 SHA256 c6400f190d4326fb775a41d6d71453b68e5605b0c795e7971eb6270184a73759
+EBUILD xfce4-xkb-0.5.3.3.ebuild 628 RMD160 6b0d56a5f4f69b6c5dcd9e15b183535af16cce5f SHA1 2841cfacaff6496a7bc83c254f068ecf7188c072 SHA256 f52fdc6d8f0d39d24d79084dd7478acb81af06fe523227cb20c21882e145c943
+MISC ChangeLog 6124 RMD160 3b6d37057d4bc2a96f002e8f2b313d3e47f46f69 SHA1 9e7aeddc7ffb1b482e32ccfcce4054d93b16702f SHA256 9f48c248b60558a5b9c599944a5b05dd8382748abafc5110fe1c89d3f957f5e8
 MISC metadata.xml 157 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 SHA1 7eae91f2588bdae8667d37a98fb3090d539eeca1 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.10 (GNU/Linux)
-
-iEYEARECAAYFAkm+ZekACgkQKhnDs22gwa+D0gCgseMwSuqNn3emvXGc58Fq47EB
-YmoAoLFkWjp/R8ebJtysa8KrlZ1bu/AO
-=dgsH
------END PGP SIGNATURE-----
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