Add missing dep for xfce-mcs-manager, bug 170941. Thanks to Martin Ereth for catching this.

Package-Manager: portage-2.1.2.2

5 files changed, 16 insertions, 58 deletions

diff --git a/xfce-base/xfwm4/ChangeLog b/xfce-base/xfwm4/ChangeLog
index e976d3a88561..42315ae6c606 100644
--- a/xfce-base/xfwm4/ChangeLog
+++ b/xfce-base/xfwm4/ChangeLog
@@ -1,6 +1,10 @@
 # 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.93 2007/03/15 13:38:29 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfwm4/ChangeLog,v 1.94 2007/03/15 15:01:21 drac Exp $
+
+  15 Mar 2007; Samuli Suominen <drac@gentoo.org> -xfwm4-4.2.3.2-r1.ebuild,
+  xfwm4-4.4.0.ebuild:
+  Add missing dep for xfce-mcs-manager, bug 170941.
 
   15 Mar 2007; Markus Rothe <corsair@gentoo.org> xfwm4-4.4.0.ebuild:
   Stable on ppc64; bug #169987
diff --git a/xfce-base/xfwm4/Manifest b/xfce-base/xfwm4/Manifest
index 35d02a75412b..a9dee9cf7727 100644
--- a/xfce-base/xfwm4/Manifest
+++ b/xfce-base/xfwm4/Manifest
@@ -8,22 +8,18 @@ RMD160 53e04e7c282d5b90804b24c5a91e4da667749663 files/xfwm4-4.2.3.2-workspace.pa
 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 924 RMD160 2b03091be10a8870f6b58beb340e5a30f4cd9724 SHA1 4d8d2f0f87bb9cbb5ee23f28a4f0d7e9895d43f2 SHA256 5d635f6c45104c3c4320db5b65ec3cc3a5e4c65510a5ed32a775f33af87608e4
-MD5 6d08c5a3852d57ca37a4d1db954f9893 xfwm4-4.2.3.2-r1.ebuild 924
-RMD160 2b03091be10a8870f6b58beb340e5a30f4cd9724 xfwm4-4.2.3.2-r1.ebuild 924
-SHA256 5d635f6c45104c3c4320db5b65ec3cc3a5e4c65510a5ed32a775f33af87608e4 xfwm4-4.2.3.2-r1.ebuild 924
 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
 SHA256 671f3d6dde43c1eb23eb6a9f28a13153ab0c026af8834ceebe78c57bd7db9c63 xfwm4-4.2.3.2.ebuild 876
-EBUILD xfwm4-4.4.0.ebuild 1167 RMD160 529913c389bf791ce5729fb21daf292b9b4990c6 SHA1 b959c5fe62eed7e79f6e97401c4adba945eae4de SHA256 904721819d79a297a36e9ca0a0403b85c04ef8a961975f393e54afa5214054d9
-MD5 af53e75102332a8ce7ca7c4b9991960b xfwm4-4.4.0.ebuild 1167
-RMD160 529913c389bf791ce5729fb21daf292b9b4990c6 xfwm4-4.4.0.ebuild 1167
-SHA256 904721819d79a297a36e9ca0a0403b85c04ef8a961975f393e54afa5214054d9 xfwm4-4.4.0.ebuild 1167
-MISC ChangeLog 10681 RMD160 41435cf46e6a0be6df0f37764d02395acad7e261 SHA1 efaac080e74bbbeb5b761240bded99362fff0c13 SHA256 34ac5c6e11de285d916010686d39ff6c9a81841a03e3dd3ce98435a3d44d5dc9
-MD5 822cc2b9cc794cb74f8438ed09a34855 ChangeLog 10681
-RMD160 41435cf46e6a0be6df0f37764d02395acad7e261 ChangeLog 10681
-SHA256 34ac5c6e11de285d916010686d39ff6c9a81841a03e3dd3ce98435a3d44d5dc9 ChangeLog 10681
+EBUILD xfwm4-4.4.0.ebuild 1217 RMD160 a746ea182aea96bf3da3b8ac0b594b9125fb969c SHA1 3ac5a5714fd79eab37fc94fe5e81f443a2e8872c SHA256 b876fabb5ae5c9d009151370dbd6a637a54f17e2f74c832887cb7b1918b82381
+MD5 8b664bbf8e83acd68623321e65ab2222 xfwm4-4.4.0.ebuild 1217
+RMD160 a746ea182aea96bf3da3b8ac0b594b9125fb969c xfwm4-4.4.0.ebuild 1217
+SHA256 b876fabb5ae5c9d009151370dbd6a637a54f17e2f74c832887cb7b1918b82381 xfwm4-4.4.0.ebuild 1217
+MISC ChangeLog 10828 RMD160 02fe00df32cec13bd2b6c43d400b49dba7b5f81f SHA1 3bcb6d1f7674af5ef1497a8d983ac23a231b5f35 SHA256 28a9db6b5d22fec6dc1692f2f342c606be3cd59dc03b0d48381ec31efaada0c9
+MD5 04a6eb3718d5659881da3d49b0c7e804 ChangeLog 10828
+RMD160 02fe00df32cec13bd2b6c43d400b49dba7b5f81f ChangeLog 10828
+SHA256 28a9db6b5d22fec6dc1692f2f342c606be3cd59dc03b0d48381ec31efaada0c9 ChangeLog 10828
 MISC metadata.xml 157 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 SHA1 7eae91f2588bdae8667d37a98fb3090d539eeca1 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61
 MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 metadata.xml 157
@@ -31,9 +27,6 @@ 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
deleted file mode 100644
index 818245ad6d2e..000000000000
--- a/xfce-base/xfwm4/files/digest-xfwm4-4.2.3.2-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-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/xfwm4-4.2.3.2-r1.ebuild b/xfce-base/xfwm4/xfwm4-4.2.3.2-r1.ebuild
deleted file mode 100644
index 66ab1a14c224..000000000000
--- a/xfce-base/xfwm4/xfwm4-4.2.3.2-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# 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.6 2007/03/03 13:27:09 nixnut 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
diff --git a/xfce-base/xfwm4/xfwm4-4.4.0.ebuild b/xfce-base/xfwm4/xfwm4-4.4.0.ebuild
index eeab16402f14..5443908a024b 100644
--- a/xfce-base/xfwm4/xfwm4-4.4.0.ebuild
+++ b/xfce-base/xfwm4/xfwm4-4.4.0.ebuild
@@ -1,6 +1,6 @@
 # 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.4.0.ebuild,v 1.12 2007/03/15 13:38:29 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfwm4/xfwm4-4.4.0.ebuild,v 1.13 2007/03/15 15:01:21 drac Exp $
 
 inherit xfce44
 
@@ -28,7 +28,8 @@ RDEPEND="x11-libs/libX11
 	startup-notification? ( x11-libs/startup-notification )
 	>=xfce-base/libxfce4mcs-${XFCE_MASTER_VERSION}
 	>=xfce-base/libxfce4util-${XFCE_MASTER_VERSION}
-	>=xfce-base/libxfcegui4-${XFCE_MASTER_VERSION}"
+	>=xfce-base/libxfcegui4-${XFCE_MASTER_VERSION}
+	>=xfce-base/xfce-mcs-manager-${XFCE_MASTER_VERSION}"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	dev-util/intltool"