Fix depends. Add DOCS. Remove old versions.

(Portage version: 2.1.2-r6)

6 files changed, 17 insertions, 49 deletions

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/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 )"