Fix bug 115490 and remove usage of virtual/x11.

Package-Manager: portage-2.1.2-r11

5 files changed, 73 insertions, 5 deletions

diff --git a/xfce-base/xfwm4/ChangeLog b/xfce-base/xfwm4/ChangeLog
index 88e20fb0ea42..a4745b751738 100644
--- a/xfce-base/xfwm4/ChangeLog
+++ b/xfce-base/xfwm4/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for xfce-base/xfwm4
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfwm4/ChangeLog,v 1.79 2007/02/22 02:50:01 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfwm4/ChangeLog,v 1.80 2007/02/26 18:31:34 drac Exp $
+
+*xfwm4-4.2.3.2-r1 (26 Feb 2007)
+
+  26 Feb 2007; Samuli Suominen <drac@gentoo.org>
+  +files/xfwm4-4.2.3.2-workspace.patch, +xfwm4-4.2.3.2-r1.ebuild:
+  Fix bug 115490 with revbumped version.
 
   22 Feb 2007; Joshua Nichols <nichoj@gentoo.org> xfwm4-4.4.0.ebuild:
   Updated homepage. See bug #165707.
diff --git a/xfce-base/xfwm4/Manifest b/xfce-base/xfwm4/Manifest
index 86a2283fd07d..d416e56b2137 100644
--- a/xfce-base/xfwm4/Manifest
+++ b/xfce-base/xfwm4/Manifest
@@ -2,8 +2,16 @@ AUX x-modular-composite-version.patch 575 RMD160 bff756116f314f102d082b5b6d8ee6f
 MD5 de9e7cce72361127a24dc569bc41da0d files/x-modular-composite-version.patch 575
 RMD160 bff756116f314f102d082b5b6d8ee6f4ece63ba1 files/x-modular-composite-version.patch 575
 SHA256 52178173a91c32d60b71a68141c9238499253c1086c350cb64c14b15b68ccf48 files/x-modular-composite-version.patch 575
+AUX xfwm4-4.2.3.2-workspace.patch 574 RMD160 53e04e7c282d5b90804b24c5a91e4da667749663 SHA1 6fd5ce56306b1151791afcd31aaa17140855efd1 SHA256 822c6878d3fdd5c2f026329a0d3d9e84f7a5b250146a22fc2307411574afed45
+MD5 dfe94df6a1851fdba06954e8be0b8e51 files/xfwm4-4.2.3.2-workspace.patch 574
+RMD160 53e04e7c282d5b90804b24c5a91e4da667749663 files/xfwm4-4.2.3.2-workspace.patch 574
+SHA256 822c6878d3fdd5c2f026329a0d3d9e84f7a5b250146a22fc2307411574afed45 files/xfwm4-4.2.3.2-workspace.patch 574
 DIST xfwm4-4.2.3.2.tar.gz 1759179 RMD160 ed47f8800d400a521d65c2a6c9828071eea72f71 SHA1 7bea1f749077c7aa902da69c8711dff16933dae2 SHA256 018628d7c5ef10d947cb0228ca4ed7527aebf9ea54eb6db49091a7b8f61c2b86
 DIST xfwm4-4.4.0.tar.bz2 1674325 RMD160 bba6f80232ae53c4e6c7199cfe10c85d2f4995f6 SHA1 1a215b4371ed52c8c46cfd9a22dd41031a312f7c SHA256 096b67e4002ecdadca60e01b67821d3898597c240adc4c204d2ee2b40db0b179
+EBUILD xfwm4-4.2.3.2-r1.ebuild 927 RMD160 30a580dace8a43c64dfb9298f29f8b90b4bcead8 SHA1 20ba758c9567c711520003817daef277aa7cf7fc SHA256 09fde9ba097c9da35231fe3fd4e7a2464e5e7711a9e20a4ec411f7be9ace03ac
+MD5 f6366fd9cdbca3676d5cd6463a42947d xfwm4-4.2.3.2-r1.ebuild 927
+RMD160 30a580dace8a43c64dfb9298f29f8b90b4bcead8 xfwm4-4.2.3.2-r1.ebuild 927
+SHA256 09fde9ba097c9da35231fe3fd4e7a2464e5e7711a9e20a4ec411f7be9ace03ac xfwm4-4.2.3.2-r1.ebuild 927
 EBUILD xfwm4-4.2.3.2.ebuild 876 RMD160 696a73bec686421b2ccadb9785ad03710a126d2e SHA1 2da52f7a7f8e6bcfb5aa0c3dda0e6da746493fec SHA256 671f3d6dde43c1eb23eb6a9f28a13153ab0c026af8834ceebe78c57bd7db9c63
 MD5 d1c783d7673004144402058953c0f290 xfwm4-4.2.3.2.ebuild 876
 RMD160 696a73bec686421b2ccadb9785ad03710a126d2e xfwm4-4.2.3.2.ebuild 876
@@ -12,10 +20,10 @@ EBUILD xfwm4-4.4.0.ebuild 1163 RMD160 d1e5e0399cdb14fe850945917544546938fcd521 S
 MD5 ffc2796cefa62f54b4b44ad3d7ab0893 xfwm4-4.4.0.ebuild 1163
 RMD160 d1e5e0399cdb14fe850945917544546938fcd521 xfwm4-4.4.0.ebuild 1163
 SHA256 963fd7dfdc360f0727aa6492245f23bfc4f56c0263094345fbf586c7e61f2487 xfwm4-4.4.0.ebuild 1163
-MISC ChangeLog 9194 RMD160 5c6adba8484084bd633768b33702cd8dc8abe697 SHA1 25585a365c0de977fe287d91e7b03da8bfc9c699 SHA256 08d8163016ad03cf79a3b8e95356fdfb138bc2f2cfeaf88016ec7b10c5086ba6
-MD5 45b1330fe8b1a8a62929c726fb276d6c ChangeLog 9194
-RMD160 5c6adba8484084bd633768b33702cd8dc8abe697 ChangeLog 9194
-SHA256 08d8163016ad03cf79a3b8e95356fdfb138bc2f2cfeaf88016ec7b10c5086ba6 ChangeLog 9194
+MISC ChangeLog 9382 RMD160 8302e4f407e719020f7569cc45b9eab8db616469 SHA1 f8d52df88dc5b77813c6563eb1f388b516f49fbb SHA256 efe24391f6aba10dce3cd2d96617193a6803546dcdc1c841daca5a0fb763a653
+MD5 c0fd44c9928d47acce31469b8db47816 ChangeLog 9382
+RMD160 8302e4f407e719020f7569cc45b9eab8db616469 ChangeLog 9382
+SHA256 efe24391f6aba10dce3cd2d96617193a6803546dcdc1c841daca5a0fb763a653 ChangeLog 9382
 MISC metadata.xml 157 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 SHA1 7eae91f2588bdae8667d37a98fb3090d539eeca1 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61
 MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 metadata.xml 157
@@ -23,6 +31,9 @@ SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61 metadata
 MD5 5f498a183dd3cf9ae4f6f8e17d6dec24 files/digest-xfwm4-4.2.3.2 244
 RMD160 02f8e59a805bbeddf190fb624782c63bd5295d6d files/digest-xfwm4-4.2.3.2 244
 SHA256 fc6a2ba9921b477b48861d1f89e1271342d7b8ddb89bd00e5777285840162e1b files/digest-xfwm4-4.2.3.2 244
+MD5 5f498a183dd3cf9ae4f6f8e17d6dec24 files/digest-xfwm4-4.2.3.2-r1 244
+RMD160 02f8e59a805bbeddf190fb624782c63bd5295d6d files/digest-xfwm4-4.2.3.2-r1 244
+SHA256 fc6a2ba9921b477b48861d1f89e1271342d7b8ddb89bd00e5777285840162e1b files/digest-xfwm4-4.2.3.2-r1 244
 MD5 4b1e90a002c28089c23089d9c8e453fa files/digest-xfwm4-4.4.0 241
 RMD160 3d8571ff5016925ce9916bcd44d9f657a05c4d3d files/digest-xfwm4-4.4.0 241
 SHA256 b382955889606ecdc3692c142fa328dcb823248fdf6fe1f5675a3c3bd36d1c9e files/digest-xfwm4-4.4.0 241
diff --git a/xfce-base/xfwm4/files/digest-xfwm4-4.2.3.2-r1 b/xfce-base/xfwm4/files/digest-xfwm4-4.2.3.2-r1
new file mode 100644
index 000000000000..818245ad6d2e
--- /dev/null
+++ b/xfce-base/xfwm4/files/digest-xfwm4-4.2.3.2-r1
@@ -0,0 +1,3 @@
+MD5 d73e89c50179ccb438c076b3b71d59a4 xfwm4-4.2.3.2.tar.gz 1759179
+RMD160 ed47f8800d400a521d65c2a6c9828071eea72f71 xfwm4-4.2.3.2.tar.gz 1759179
+SHA256 018628d7c5ef10d947cb0228ca4ed7527aebf9ea54eb6db49091a7b8f61c2b86 xfwm4-4.2.3.2.tar.gz 1759179
diff --git a/xfce-base/xfwm4/files/xfwm4-4.2.3.2-workspace.patch b/xfce-base/xfwm4/files/xfwm4-4.2.3.2-workspace.patch
new file mode 100644
index 000000000000..475e31c48d46
--- /dev/null
+++ b/xfce-base/xfwm4/files/xfwm4-4.2.3.2-workspace.patch
@@ -0,0 +1,11 @@
+--- xfwm4-4.2.3.2/src/events.c.orig	2006-10-02 13:27:43.000000000 +0200
++++ xfwm4-4.2.3.2/src/events.c	2006-10-02 13:31:26.000000000 +0200
+@@ -542,7 +542,7 @@
+             case KEY_MOVE_WORKSPACE_7:
+             case KEY_MOVE_WORKSPACE_8:
+             case KEY_MOVE_WORKSPACE_9:
+-                if (key - KEY_WORKSPACE_1 < screen_info->workspace_count)
++                if (key - KEY_MOVE_WORKSPACE_1 < screen_info->workspace_count)
+                 {
+                     clientRaise (c);
+                     workspaceSwitch (screen_info, key - KEY_MOVE_WORKSPACE_1, c);
diff --git a/xfce-base/xfwm4/xfwm4-4.2.3.2-r1.ebuild b/xfce-base/xfwm4/xfwm4-4.2.3.2-r1.ebuild
new file mode 100644
index 000000000000..75dc65708657
--- /dev/null
+++ b/xfce-base/xfwm4/xfwm4-4.2.3.2-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfwm4/xfwm4-4.2.3.2-r1.ebuild,v 1.1 2007/02/26 18:31:34 drac Exp $
+
+inherit eutils xfce42 versionator
+
+DESCRIPTION="Xfce4 window manager"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+MY_PV=$(get_version_component_range 1-3)
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXpm
+	x11-libs/startup-notification
+	~xfce-base/xfce-mcs-manager-${MY_PV}"
+DEPEND="${RDEPEND}
+	x11-proto/xproto
+	x11-proto/xextproto
+	x11-libs/libXt
+	sys-devel/autoconf"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-workspace.patch
+}
+
+XFCE_CONFIG="--enable-randr --enable-compositor"
+core_package