Version bump and a few cleanups.

(Portage version: 2.1_pre7-r4)

6 files changed, 45 insertions, 18 deletions

diff --git a/xfce-extra/xfce4-xkb/ChangeLog b/xfce-extra/xfce4-xkb/ChangeLog
index dd29d67fa8be..e3493754c6cf 100644
--- a/xfce-extra/xfce4-xkb/ChangeLog
+++ b/xfce-extra/xfce4-xkb/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for xfce-extra/xfce4-xkb
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-xkb/ChangeLog,v 1.3 2005/10/06 07:53:04 bcowan Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-xkb/ChangeLog,v 1.4 2006/04/08 21:50:21 dostrow Exp $
+
+*xfce4-xkb-0.3.5 (08 Apr 2006)
+
+  08 Apr 2006; Daniel Ostrow <dostrow@gentoo.org>
+  -xfce4-xkb-0.3.2-r1.ebuild, +xfce4-xkb-0.3.5.ebuild:
+  Version bump. Thanks to antst <antst@mail.ru> on bug # 126481 for the note.
+  Also clean up some ebuilds.
 
 *xfce4-xkb-0.3.2-r2 (06 Oct 2005)
 
diff --git a/xfce-extra/xfce4-xkb/Manifest b/xfce-extra/xfce4-xkb/Manifest
index 798f6dcdf2d2..ca76ee3a0b45 100644
--- a/xfce-extra/xfce4-xkb/Manifest
+++ b/xfce-extra/xfce4-xkb/Manifest
@@ -1,6 +1,18 @@
-MD5 a38b6099a26d3a6b62d4aca1bc1d4ebe xfce4-xkb-0.3.2-r2.ebuild 527
-MD5 b0ca8ebce52a8e8e1191940f69d95db8 xfce4-xkb-0.3.2-r1.ebuild 388
-MD5 975f55f172c7e873e6c48fcfc0d62419 ChangeLog 650
-MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
-MD5 f2f7062883e987a9719cba81f19d7b34 files/digest-xfce4-xkb-0.3.2-r1 74
+MD5 1c17287617dcf30b1faab3ad2289dc52 ChangeLog 896
+RMD160 b11059b3f57d647a8f9b493c35e8cb36a35ecbf6 ChangeLog 896
+SHA256 0a6b202002748edd618137c83c4d449fc27fc486bc59d0e374af9687bfd098fc ChangeLog 896
 MD5 f2f7062883e987a9719cba81f19d7b34 files/digest-xfce4-xkb-0.3.2-r2 74
+RMD160 66fba106c8d5a7f159cb0bd14cc63da631c1507a files/digest-xfce4-xkb-0.3.2-r2 74
+SHA256 f737dbfa71350f0783bb00c236b856a421bc339686abd3211ac99eacac6027a2 files/digest-xfce4-xkb-0.3.2-r2 74
+MD5 164c08989d3f0a2474ae9c9035c46d0e files/digest-xfce4-xkb-0.3.5 268
+RMD160 1d4d256cbdf9c163b7ef93727d88bcda6f35a244 files/digest-xfce4-xkb-0.3.5 268
+SHA256 749d028a22ec45eee4e39f29a5c45e91d7110f5e7d82519456d5cf2a79dfa616 files/digest-xfce4-xkb-0.3.5 268
+MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
+RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 metadata.xml 157
+SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61 metadata.xml 157
+MD5 a38b6099a26d3a6b62d4aca1bc1d4ebe xfce4-xkb-0.3.2-r2.ebuild 527
+RMD160 e7d5d8bd28d7c771527a59450dff7335e72cfce9 xfce4-xkb-0.3.2-r2.ebuild 527
+SHA256 8560ca7f1aa9c7ea4da249a1c5a3d3dc7896bdb751c124256874903adffb1a5e xfce4-xkb-0.3.2-r2.ebuild 527
+MD5 643e19ce7d88a8bc3e2e230473f40e51 xfce4-xkb-0.3.5.ebuild 528
+RMD160 34c6f67a44703be51fd4dbb544737b731f77ffad xfce4-xkb-0.3.5.ebuild 528
+SHA256 01f88733094c80b5cedf73667230068b8648a0b011032b27946c611f28e75585 xfce4-xkb-0.3.5.ebuild 528
diff --git a/xfce-extra/xfce4-xkb/files/digest-xfce4-xkb-0.3.2-r1 b/xfce-extra/xfce4-xkb/files/digest-xfce4-xkb-0.3.2-r1
deleted file mode 100644
index bb260c4d0bba..000000000000
--- a/xfce-extra/xfce4-xkb/files/digest-xfce4-xkb-0.3.2-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b233819d685ab3b7f4a47c2da9fb6936 xfce4-xkb-plugin-0.3.2.tar.gz 334136
diff --git a/xfce-extra/xfce4-xkb/files/digest-xfce4-xkb-0.3.5 b/xfce-extra/xfce4-xkb/files/digest-xfce4-xkb-0.3.5
new file mode 100644
index 000000000000..dadb4d551758
--- /dev/null
+++ b/xfce-extra/xfce4-xkb/files/digest-xfce4-xkb-0.3.5
@@ -0,0 +1,3 @@
+MD5 0c92dd17579e102b40289c4bc83c5505 xfce4-xkb-plugin-0.3.5.tar.gz 353851
+RMD160 07ea55609a80f237b43dca514b49044dcfcbbd14 xfce4-xkb-plugin-0.3.5.tar.gz 353851
+SHA256 769d4b337200b2dead8fc23d4fb394bacde551cb07a504acc68e160891cd8c18 xfce4-xkb-plugin-0.3.5.tar.gz 353851
diff --git a/xfce-extra/xfce4-xkb/xfce4-xkb-0.3.2-r1.ebuild b/xfce-extra/xfce4-xkb/xfce4-xkb-0.3.2-r1.ebuild
deleted file mode 100644
index 18e63514f7c9..000000000000
--- a/xfce-extra/xfce4-xkb/xfce4-xkb-0.3.2-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2005 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.3.2-r1.ebuild,v 1.1 2005/01/07 01:49:40 bcowan Exp $
-
-DESCRIPTION="Xfce4 panel xkb layout switching plugin"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-
-GOODIES_PLUGIN=1
-
-inherit xfce4
diff --git a/xfce-extra/xfce4-xkb/xfce4-xkb-0.3.5.ebuild b/xfce-extra/xfce4-xkb/xfce4-xkb-0.3.5.ebuild
new file mode 100644
index 000000000000..b513833e91dd
--- /dev/null
+++ b/xfce-extra/xfce4-xkb/xfce4-xkb-0.3.5.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2006 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.3.5.ebuild,v 1.1 2006/04/08 21:50:21 dostrow Exp $
+
+inherit xfce42
+
+DESCRIPTION="Xfce4 panel xkb layout switching plugin"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+RDEPEND="|| ( ( x11-libs/libX11
+	x11-libs/libXpm
+	x11-libs/libXext )
+	virtual/x11 )"
+DEPEND="${RDEPEND}
+	|| ( x11-libs/libX11 virtual/x11 )"
+
+goodies_plugin