Fixed dependencies, see bug #130573. Fixed whitespace.

Package-Manager: portage-2.1.2_rc4

diff --git a/xfce-base/xfce4-session/ChangeLog b/xfce-base/xfce4-session/ChangeLog
index fd244baa444572da15d0443c914d55ba3fcbab79..9e4a4b3be0cd2d076481d3910319f975bbf7384b 100644 (file)
--- a/xfce-base/xfce4-session/ChangeLog
+++ b/xfce-base/xfce4-session/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for xfce-base/xfce4-session
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/ChangeLog,v 1.43 2006/12/08 22:07:25 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/ChangeLog,v 1.44 2006/12/28 04:06:22 nichoj Exp $
+
+  28 Dec 2006; Joshua Nichols <nichoj@gentoo.org>
+  xfce4-session-4.2.3.ebuild, xfce4-session-4.3.99.2-r1.ebuild:
+  Fixed dependencies, see bug #130573. Fixed whitespace.
 
   08 Dec 2006; Joshua Nichols <nichoj@gentoo.org>
   xfce4-session-4.2.3.ebuild, xfce4-session-4.3.99.2-r1.ebuild:

diff --git a/xfce-base/xfce4-session/Manifest b/xfce-base/xfce4-session/Manifest
index 9d1cdc31f8b54bfc9507f4fc76004f5056cb681c..550c4ff41da53b680c0726bb6840b2fbe8ba990d 100644 (file)
--- a/xfce-base/xfce4-session/Manifest
+++ b/xfce-base/xfce4-session/Manifest
@@ -1,17 +1,17 @@
 DIST xfce4-session-4.2.3.tar.gz 1629362 RMD160 e2fa608f13cfa79bfc9db2e2091100f5c145d2c7 SHA1 99e93dcfc3e1eaa403b55b46ec87d7abdc74c949 SHA256 cbf5f6b8d68c0d29f503b805a2143d73b6192f96ce3d667c38521db16f09ca8b
 DIST xfce4-session-4.3.99.2.tar.bz2 1315964 RMD160 f39b2e60408896cedd1a8713b77b5b78b5b269ae SHA1 52f34cbed023108346e9fe333bdbbafe06a20f03 SHA256 d3116019963a3e33e5a51a7da3ead0e345105ce2defc2acbcfe5c335605ef6c4
-EBUILD xfce4-session-4.2.3.ebuild 595 RMD160 186a1897eb7f681d67732abcabdd6a1af69edac1 SHA1 1ff4928d245d0f79210fe8737cd92d375173fcae SHA256 9851df7d52330661ad45e9ef43800599a902186aa38a7d8c2e564339c676fce0
-MD5 26718e1b1c52cafb7243f5cec53464cd xfce4-session-4.2.3.ebuild 595
-RMD160 186a1897eb7f681d67732abcabdd6a1af69edac1 xfce4-session-4.2.3.ebuild 595
-SHA256 9851df7d52330661ad45e9ef43800599a902186aa38a7d8c2e564339c676fce0 xfce4-session-4.2.3.ebuild 595
-EBUILD xfce4-session-4.3.99.2-r1.ebuild 697 RMD160 935df288f600f4357ecdb3eca906e1dda4a5c030 SHA1 f12a617a7f7aae79a26e8adac222be6dca952a98 SHA256 0e051265c55cf733979b0b55feecb26d55a660962473b640d2e95111cc4121f4
-MD5 728518e5145896259425d5b211638af7 xfce4-session-4.3.99.2-r1.ebuild 697
-RMD160 935df288f600f4357ecdb3eca906e1dda4a5c030 xfce4-session-4.3.99.2-r1.ebuild 697
-SHA256 0e051265c55cf733979b0b55feecb26d55a660962473b640d2e95111cc4121f4 xfce4-session-4.3.99.2-r1.ebuild 697
-MISC ChangeLog 5803 RMD160 d0b026f969201764a055ffbe7f0855377a96d433 SHA1 954d218c5398e5256908de9c735be41ff4c693a6 SHA256 62ba0e15ab535320e39e5e37ac6f891a9cdc87bda92eefd418381d3c836faaef
-MD5 b9e31d8e91a240bb8b0b30c0f2fe360d ChangeLog 5803
-RMD160 d0b026f969201764a055ffbe7f0855377a96d433 ChangeLog 5803
-SHA256 62ba0e15ab535320e39e5e37ac6f891a9cdc87bda92eefd418381d3c836faaef ChangeLog 5803
+EBUILD xfce4-session-4.2.3.ebuild 688 RMD160 fb54da3292f8b7a8b581a0850c7ae59c8b7f6bab SHA1 84706115ac3f708475b32ad06ebbaf7f5279d712 SHA256 4bfe4aed6f04e52d3bf59d8986d7101157a93017770f4c4b9b5cfb08f55442d0
+MD5 f4e3db9b15299d6d36ec4178c7f3f010 xfce4-session-4.2.3.ebuild 688
+RMD160 fb54da3292f8b7a8b581a0850c7ae59c8b7f6bab xfce4-session-4.2.3.ebuild 688
+SHA256 4bfe4aed6f04e52d3bf59d8986d7101157a93017770f4c4b9b5cfb08f55442d0 xfce4-session-4.2.3.ebuild 688
+EBUILD xfce4-session-4.3.99.2-r1.ebuild 696 RMD160 c504d255e4de53b0ec8fdc447a704fd7b36ce4f9 SHA1 28223080f3e422c056ca3ee442f4615fc4c32287 SHA256 13abf7ebea71fd2f71e7d07d2de7685baeb973b3d59762419644dbb23260cea5
+MD5 a657f08641a08550a89a8cffc77cb411 xfce4-session-4.3.99.2-r1.ebuild 696
+RMD160 c504d255e4de53b0ec8fdc447a704fd7b36ce4f9 xfce4-session-4.3.99.2-r1.ebuild 696
+SHA256 13abf7ebea71fd2f71e7d07d2de7685baeb973b3d59762419644dbb23260cea5 xfce4-session-4.3.99.2-r1.ebuild 696
+MISC ChangeLog 5975 RMD160 3f2f229d4f42d29d852a19f61abe2cd29835ba6b SHA1 adff33d9c0db1488f12aa6467174bcbb0e6d84ef SHA256 f7234c0c7bb667ae5a9ba4478da41091b199e9857c419a34b6523f33fe041f86
+MD5 fb648a9508135f5ef1f2b603660b4850 ChangeLog 5975
+RMD160 3f2f229d4f42d29d852a19f61abe2cd29835ba6b ChangeLog 5975
+SHA256 f7234c0c7bb667ae5a9ba4478da41091b199e9857c419a34b6523f33fe041f86 ChangeLog 5975
 MISC metadata.xml 157 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 SHA1 7eae91f2588bdae8667d37a98fb3090d539eeca1 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61
 MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 metadata.xml 157

diff --git a/xfce-base/xfce4-session/xfce4-session-4.2.3.ebuild b/xfce-base/xfce4-session/xfce4-session-4.2.3.ebuild
index d5871b3948fe1e50a0191c6c484546e0cf291497..fe3eea38d6752f556b0bad52424726a5cf6b8fb2 100644 (file)
--- a/xfce-base/xfce4-session/xfce4-session-4.2.3.ebuild
+++ b/xfce-base/xfce4-session/xfce4-session-4.2.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/xfce4-session-4.2.3.ebuild,v 1.13 2006/12/08 22:07:25 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/xfce4-session-4.2.3.ebuild,v 1.14 2006/12/28 04:06:22 nichoj Exp $
 
 inherit xfce42
 
@@ -9,10 +9,13 @@ KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86 ~x86-fbsd"
 
 RDEPEND="|| ( ( x11-libs/libX11
        x11-libs/libICE
-       x11-libs/libSM 
+       x11-libs/libSM
        x11-apps/iceauth )
        virtual/x11 )
-       ~xfce-base/xfce-utils-${PV}"
+       ~xfce-base/xfce-utils-${PV}
+       >=xfce-base/libxfce4util-4.2.0
+       >=xfce-base/libxfcegui4-4.2.0
+       >=xfce-base/libxfce4mcs-4.2.0"
 DEPEND="${RDEPEND}
        || ( ( x11-libs/libXt
        x11-proto/xproto )

diff --git a/xfce-base/xfce4-session/xfce4-session-4.3.99.2-r1.ebuild b/xfce-base/xfce4-session/xfce4-session-4.3.99.2-r1.ebuild
index b2a151996a97a16459737050df8eb5244ffc9cc6..5a8d1320b15d6a0c4e020d80fe0d2699bb9f7b47 100644 (file)
--- a/xfce-base/xfce4-session/xfce4-session-4.3.99.2-r1.ebuild
+++ b/xfce-base/xfce4-session/xfce4-session-4.3.99.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/xfce4-session-4.3.99.2-r1.ebuild,v 1.4 2006/12/08 22:07:25 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/xfce4-session-4.3.99.2-r1.ebuild,v 1.5 2006/12/28 04:06:22 nichoj Exp $
 
 inherit xfce44
 
@@ -11,7 +11,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="hal"
 
 RDEPEND="|| ( ( x11-libs/libX11
-               x11-libs/libSM 
+               x11-libs/libSM
                x11-apps/iceauth )
                virtual/x11 )
                ~xfce-base/xfce-utils-${PV}