Fix depends. Add DOCS. Remove old versions.

Package-Manager: portage-2.1.2-r6

8 files changed, 25 insertions, 80 deletions

diff --git a/xfce-extra/xfce4-datetime/Manifest b/xfce-extra/xfce4-datetime/Manifest
index 4f3ed4736022..fcdffa6ea9df 100644
--- a/xfce-extra/xfce4-datetime/Manifest
+++ b/xfce-extra/xfce4-datetime/Manifest
@@ -1,5 +1,4 @@
 DIST xfce4-datetime-plugin-0.3.1.tar.gz 311941 RMD160 12d08ceb342d433e0c629e6047570c241be46256 SHA1 70b308fbc146b9e172e47d7e10fd10ed1707a46e SHA256 6421c027d1610cc5ac4fed79ad4fc840986474df152812c31bbd0c942e573c23
-DIST xfce4-datetime-plugin-0.4.0.tar.gz 767305 RMD160 7e64b73ef08fe73ad977d696266e94fd70e9177d SHA1 57ca3b66a847a2a86fc3c5b65c5f43bf0ef03ff8 SHA256 d5d76b5a6e21792159d9368de9bd5cf2cac5eb4d9723c45870471be4e2f25372
 DIST xfce4-datetime-plugin-0.4.1.tar.gz 374686 RMD160 4b630622cd518c14a5a86cb4d8f7459d4bce5650 SHA1 0d5057aef0933acd572e94fe4ac0e0b9384d4a6c SHA256 a232929ddadc9d9b8223ecc97e9006dda8b7ca3f0bffab43d55bba992c9d673d
 EBUILD xfce4-datetime-0.3.1-r1.ebuild 412 RMD160 4d08b9cabdc6be6f75832f4237bbac34e430a5af SHA1 9e534ddb13117a7f7637b5ad9b13482d1c4cc419 SHA256 60144d3a58c2e77846ce1908e7fb481fc72e47cbcba96678ee799f8076d3fbea
 MD5 f671e7ba2e0e95deb30b5c0053c0db23 xfce4-datetime-0.3.1-r1.ebuild 412
@@ -9,10 +8,6 @@ EBUILD xfce4-datetime-0.3.1-r2.ebuild 419 RMD160 aaf22867dd0482faef7d0df7f303085
 MD5 ac51ff5f7497b794714baf07fa6ebb2f xfce4-datetime-0.3.1-r2.ebuild 419
 RMD160 aaf22867dd0482faef7d0df7f303085c06d0160c xfce4-datetime-0.3.1-r2.ebuild 419
 SHA256 d1f260e61c4f27e2349504ee9b7ad0ecc8d80e198ae6375d265ad49b73839481 xfce4-datetime-0.3.1-r2.ebuild 419
-EBUILD xfce4-datetime-0.4.0.ebuild 456 RMD160 1973488b35a144758af5f4e964498213a30d0985 SHA1 fa9deda623217425d88f4e34ad3a2f74375e22be SHA256 4fae73adf0f792c71a563c65dca36136e6fbcff7c681e450d733aa0d24a396b1
-MD5 97b6f9c17a42a6d5c55e4192f51c17ae xfce4-datetime-0.4.0.ebuild 456
-RMD160 1973488b35a144758af5f4e964498213a30d0985 xfce4-datetime-0.4.0.ebuild 456
-SHA256 4fae73adf0f792c71a563c65dca36136e6fbcff7c681e450d733aa0d24a396b1 xfce4-datetime-0.4.0.ebuild 456
 EBUILD xfce4-datetime-0.4.1.ebuild 456 RMD160 d946fdf0a12648a717ffb666790491d8532f943e SHA1 96748a1dd90e6d609ffb909e525345b5e8a7b17e SHA256 39003166ae53e9a90bac68483f59339b00ddd96d3945bf3b6354ed250c726625
 MD5 7b42ec2323664bc93a27c86189ed92d3 xfce4-datetime-0.4.1.ebuild 456
 RMD160 d946fdf0a12648a717ffb666790491d8532f943e xfce4-datetime-0.4.1.ebuild 456
@@ -31,9 +26,6 @@ SHA256 b6d78089045461a7d3b86c4efa84a04636414dc47fb08b85d50dfe9d4ba6e423 files/di
 MD5 daf26ac44131c6d2cff8188eeac6350c files/digest-xfce4-datetime-0.3.1-r2 283
 RMD160 b5915c32be1870ee44aee1a94c6d3f59c58f65dd files/digest-xfce4-datetime-0.3.1-r2 283
 SHA256 b6d78089045461a7d3b86c4efa84a04636414dc47fb08b85d50dfe9d4ba6e423 files/digest-xfce4-datetime-0.3.1-r2 283
-MD5 40f26f3b9ffa03c3a37d4696fee7b75f files/digest-xfce4-datetime-0.4.0 283
-RMD160 df44c52710b1ae645e1d0856480dfd0661ae4742 files/digest-xfce4-datetime-0.4.0 283
-SHA256 77da547a9a4e6d977bb930fe799b4685968b13ff7c8e42be07482900db6190e0 files/digest-xfce4-datetime-0.4.0 283
 MD5 66c25b64847c6bc31fcf36aaa5076c95 files/digest-xfce4-datetime-0.4.1 283
 RMD160 3c458128ad65c736b725eb02505bb92dc43e6c34 files/digest-xfce4-datetime-0.4.1 283
 SHA256 78938808518db93ad6235f923a0ea1f958e0ee3e05e99e381b13f5fb70ae3e33 files/digest-xfce4-datetime-0.4.1 283
diff --git a/xfce-extra/xfce4-xkb/ChangeLog b/xfce-extra/xfce4-xkb/ChangeLog
index f8eb624ee12e..414c9ef0e7f5 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-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-xkb/ChangeLog,v 1.8 2007/02/01 22:27:29 welp Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-xkb/ChangeLog,v 1.9 2007/02/04 01:33:05 drac Exp $
+
+  04 Feb 2007; Samuli Suominen <drac@gentoo.org> -xfce4-xkb-0.4.1.ebuild,
+  -xfce4-xkb-0.4.3.ebuild, xfce4-xkb-0.4.3-r1.ebuild:
+  Fixing depends and adding DOCS.
 
 *xfce4-xkb-0.4.3-r1 (01 Feb 2007)
 
diff --git a/xfce-extra/xfce4-xkb/Manifest b/xfce-extra/xfce4-xkb/Manifest
index 8320631f3961..fbd1fcdbf605 100644
--- a/xfce-extra/xfce4-xkb/Manifest
+++ b/xfce-extra/xfce4-xkb/Manifest
@@ -1,26 +1,17 @@
 DIST xfce4-xkb-plugin-0.3.5.tar.gz 353851 RMD160 07ea55609a80f237b43dca514b49044dcfcbbd14 SHA256 769d4b337200b2dead8fc23d4fb394bacde551cb07a504acc68e160891cd8c18
-DIST xfce4-xkb-plugin-0.4.1.tar.gz 400233 RMD160 c223455fa265d6f2928c2cd792d9aeff53d76bd6 SHA1 ab7444b2108cf6ac1df1e379b94fda611c117b1b SHA256 6d9f8955a99122f15c9f377ffde6c1a2f6e185e1b28e6beece8bb547587fc056
 DIST xfce4-xkb-plugin-0.4.3.tar.bz2 231843 RMD160 b2f80e3a44123b82792a3fa981f40799cb29477f SHA1 962f1fdc6b373fa5d8a886aaaa4d0fbb45c44234 SHA256 e72983cf53450caa0a755838b61e867b599f2302d08d3ad28662ed6391152f7e
 EBUILD xfce4-xkb-0.3.5.ebuild 526 RMD160 9d1bfc0b83f556da5c9bd11020b5e78c854d12e0 SHA1 39cbba532c0a05f9a908d2c8022ccd8229175df3 SHA256 c45a6e95f66e6ae9d2cf2350b54882405ceba13dfd330928c0e5c242a9ed5e03
 MD5 11cab50fedbf846a07443f99fd6f09f6 xfce4-xkb-0.3.5.ebuild 526
 RMD160 9d1bfc0b83f556da5c9bd11020b5e78c854d12e0 xfce4-xkb-0.3.5.ebuild 526
 SHA256 c45a6e95f66e6ae9d2cf2350b54882405ceba13dfd330928c0e5c242a9ed5e03 xfce4-xkb-0.3.5.ebuild 526
-EBUILD xfce4-xkb-0.4.1.ebuild 565 RMD160 b13df6110fb4081174090ab1a7ece8c05774f8c3 SHA1 668a6d6637aa85bff1447b57011cceece5b7ffe4 SHA256 1c588a01a3114ed024f12dcb3709d420fef1d89f0f211890999203096c676d64
-MD5 5d688765408312c8471701fcf305b020 xfce4-xkb-0.4.1.ebuild 565
-RMD160 b13df6110fb4081174090ab1a7ece8c05774f8c3 xfce4-xkb-0.4.1.ebuild 565
-SHA256 1c588a01a3114ed024f12dcb3709d420fef1d89f0f211890999203096c676d64 xfce4-xkb-0.4.1.ebuild 565
-EBUILD xfce4-xkb-0.4.3-r1.ebuild 499 RMD160 c50f57cd256e15df1f06531ea1eedff7efe06ccb SHA1 ac8ed95b3e757d8971f5f0232d16f9fdf6e45587 SHA256 8ef063e02743e512d38431992f3ca59b538d01295acd19dde5584524313eae41
-MD5 8e0257eda5a94ba09e235e0121a0bf04 xfce4-xkb-0.4.3-r1.ebuild 499
-RMD160 c50f57cd256e15df1f06531ea1eedff7efe06ccb xfce4-xkb-0.4.3-r1.ebuild 499
-SHA256 8ef063e02743e512d38431992f3ca59b538d01295acd19dde5584524313eae41 xfce4-xkb-0.4.3-r1.ebuild 499
-EBUILD xfce4-xkb-0.4.3.ebuild 550 RMD160 d4e4e0b6a2d07e873d96cea92572bdd48a3808cb SHA1 047a937180a94977790095b5d40dea56ee521c1d SHA256 0a84e6c601eedcb083991b17f57aa45809ad1f87c80a68a366c58aeb9d9fc791
-MD5 7b4a0e57c1fe6441722a7dcadc8cb305 xfce4-xkb-0.4.3.ebuild 550
-RMD160 d4e4e0b6a2d07e873d96cea92572bdd48a3808cb xfce4-xkb-0.4.3.ebuild 550
-SHA256 0a84e6c601eedcb083991b17f57aa45809ad1f87c80a68a366c58aeb9d9fc791 xfce4-xkb-0.4.3.ebuild 550
-MISC ChangeLog 1460 RMD160 3de8d3bd6dc0542dfb76f98565e02f1dc83ea4b0 SHA1 3dee9030db4559e5f1c7ab11d756fdc4f5bd050b SHA256 1996ea76b5278ecf88e803de7a0aba79d4229946f1e7cc000d4a5a70a45b4024
-MD5 14768c3da2b69fbaab326c92157d614e ChangeLog 1460
-RMD160 3de8d3bd6dc0542dfb76f98565e02f1dc83ea4b0 ChangeLog 1460
-SHA256 1996ea76b5278ecf88e803de7a0aba79d4229946f1e7cc000d4a5a70a45b4024 ChangeLog 1460
+EBUILD xfce4-xkb-0.4.3-r1.ebuild 614 RMD160 2a3f99bf99b541a4d55c5d7d548e4176feea2bc2 SHA1 38cd618200e89339f060239a4d0578253fccd674 SHA256 ba29629b4ccfb3de7503932c93bc59cb3d867bbef08d4be65e649dda3df67835
+MD5 597618975bddbbf3f01422d9e083347f xfce4-xkb-0.4.3-r1.ebuild 614
+RMD160 2a3f99bf99b541a4d55c5d7d548e4176feea2bc2 xfce4-xkb-0.4.3-r1.ebuild 614
+SHA256 ba29629b4ccfb3de7503932c93bc59cb3d867bbef08d4be65e649dda3df67835 xfce4-xkb-0.4.3-r1.ebuild 614
+MISC ChangeLog 1623 RMD160 518039badfdcb32d373eac76b4b56b274eae0978 SHA1 68a409fd38f90657a08b7d06104566d6af61efad SHA256 6a8b2444e9561072d49b231295cb15e0d3cc4e3068db144376e48a70e535fa2e
+MD5 9732e4959711f9a06531f89ebff15508 ChangeLog 1623
+RMD160 518039badfdcb32d373eac76b4b56b274eae0978 ChangeLog 1623
+SHA256 6a8b2444e9561072d49b231295cb15e0d3cc4e3068db144376e48a70e535fa2e ChangeLog 1623
 MISC metadata.xml 157 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 SHA1 7eae91f2588bdae8667d37a98fb3090d539eeca1 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61
 MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 metadata.xml 157
@@ -28,12 +19,6 @@ SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61 metadata
 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 dcaa1ee60fed524be640c9b9adb8cc09 files/digest-xfce4-xkb-0.4.1 268
-RMD160 a09b9c9387f2860dadeb1873d9b4795de4da62e6 files/digest-xfce4-xkb-0.4.1 268
-SHA256 f7cff51c6b78e686afe9b44bef07c991ae2a8ae5ac008615fb338730576063eb files/digest-xfce4-xkb-0.4.1 268
-MD5 30ec47b37889a478b797c24c79ba7688 files/digest-xfce4-xkb-0.4.3 271
-RMD160 c8d34ac4466afb9b6833113a732dd27e32fdb358 files/digest-xfce4-xkb-0.4.3 271
-SHA256 4a31ab722b362fe996d295776225292bdd376ddf9934facb7850b5cbd51045bb files/digest-xfce4-xkb-0.4.3 271
 MD5 30ec47b37889a478b797c24c79ba7688 files/digest-xfce4-xkb-0.4.3-r1 271
 RMD160 c8d34ac4466afb9b6833113a732dd27e32fdb358 files/digest-xfce4-xkb-0.4.3-r1 271
 SHA256 4a31ab722b362fe996d295776225292bdd376ddf9934facb7850b5cbd51045bb files/digest-xfce4-xkb-0.4.3-r1 271
diff --git a/xfce-extra/xfce4-xkb/files/digest-xfce4-xkb-0.4.1 b/xfce-extra/xfce4-xkb/files/digest-xfce4-xkb-0.4.1
deleted file mode 100644
index f387e9677b27..000000000000
--- a/xfce-extra/xfce4-xkb/files/digest-xfce4-xkb-0.4.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b74327c8b61898d7ecf6e431fd209d34 xfce4-xkb-plugin-0.4.1.tar.gz 400233
-RMD160 c223455fa265d6f2928c2cd792d9aeff53d76bd6 xfce4-xkb-plugin-0.4.1.tar.gz 400233
-SHA256 6d9f8955a99122f15c9f377ffde6c1a2f6e185e1b28e6beece8bb547587fc056 xfce4-xkb-plugin-0.4.1.tar.gz 400233
diff --git a/xfce-extra/xfce4-xkb/files/digest-xfce4-xkb-0.4.3 b/xfce-extra/xfce4-xkb/files/digest-xfce4-xkb-0.4.3
deleted file mode 100644
index 196eb7265029..000000000000
--- a/xfce-extra/xfce4-xkb/files/digest-xfce4-xkb-0.4.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 e0375158339672f49c9e48a8b4669592 xfce4-xkb-plugin-0.4.3.tar.bz2 231843
-RMD160 b2f80e3a44123b82792a3fa981f40799cb29477f xfce4-xkb-plugin-0.4.3.tar.bz2 231843
-SHA256 e72983cf53450caa0a755838b61e867b599f2302d08d3ad28662ed6391152f7e xfce4-xkb-plugin-0.4.3.tar.bz2 231843
diff --git a/xfce-extra/xfce4-xkb/xfce4-xkb-0.4.1.ebuild b/xfce-extra/xfce4-xkb/xfce4-xkb-0.4.1.ebuild
deleted file mode 100644
index 35344c121fc6..000000000000
--- a/xfce-extra/xfce4-xkb/xfce4-xkb-0.4.1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# 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.4.1.ebuild,v 1.1 2006/12/06 05:08:16 nichoj Exp $
-
-inherit xfce44
-
-xfce44_beta
-xfce44_gzipped
-xfce44_goodies_panel_plugin
-
-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 )"
diff --git a/xfce-extra/xfce4-xkb/xfce4-xkb-0.4.3-r1.ebuild b/xfce-extra/xfce4-xkb/xfce4-xkb-0.4.3-r1.ebuild
index eae1743182ad..b6b6ae4c0b13 100644
--- a/xfce-extra/xfce4-xkb/xfce4-xkb-0.4.3-r1.ebuild
+++ b/xfce-extra/xfce4-xkb/xfce4-xkb-0.4.3-r1.ebuild
@@ -1,15 +1,20 @@
 # Copyright 1999-2007 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.4.3-r1.ebuild,v 1.1 2007/02/01 22:27:29 welp Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-xkb/xfce4-xkb-0.4.3-r1.ebuild,v 1.2 2007/02/04 01:33:05 drac Exp $
 
 inherit xfce44
 
-xfce44_beta
+xfce44
 xfce44_goodies_panel_plugin
 
-DESCRIPTION="Xfce4 panel xkb layout switching plugin"
+DESCRIPTION="XKB layout switching panel plugin"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-DEPEND="xfce-base/xfce4-panel \
-	x11-proto/kbproto \
-	dev-libs/glib"
-RDEPEND="${DEPEND}"
+RDEPEND=">=xfce-base/xfce4-panel-${XFCE_MASTER_VERSION}
+	>=dev-libs/glib-2.6
+	>=x11-libs/gtk+-2.6"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	dev-util/intltool
+	x11-proto/kbproto"
+
+DOCS="AUTHORS ChangeLog NEWS README"
diff --git a/xfce-extra/xfce4-xkb/xfce4-xkb-0.4.3.ebuild b/xfce-extra/xfce4-xkb/xfce4-xkb-0.4.3.ebuild
deleted file mode 100644
index 7a9ae722880e..000000000000
--- a/xfce-extra/xfce4-xkb/xfce4-xkb-0.4.3.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2007 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.4.3.ebuild,v 1.1 2007/01/21 23:34:55 nichoj Exp $
-
-inherit xfce44
-
-xfce44_beta
-xfce44_goodies_panel_plugin
-
-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 )"