Fix depends for bug 163244. Fix meta builds.

Package-Manager: portage-2.1.2-r1

diff --git a/xfce-base/xfce4/ChangeLog b/xfce-base/xfce4/ChangeLog
index d5c44c4271690da1809f4970dea3c17232edaec2..9151c21f4492547f455bf1e4321a33a99f77405e 100644 (file)
--- a/xfce-base/xfce4/ChangeLog
+++ b/xfce-base/xfce4/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for xfce-base/xfce4
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4/ChangeLog,v 1.77 2007/01/23 17:32:34 welp Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4/ChangeLog,v 1.78 2007/01/23 20:59:08 welp Exp $
+
+  23 Jan 2007; Peter Weller <welp@gentoo.org> xfce4-4.4.0.ebuild:
+  Fix depends for bug 163244. Fix meta builds.
 
   23 Jan 2007; Peter Weller <welp@gentoo.org> xfce4-4.4.0.ebuild:
   Removing usage of virtual/x11,  and hardcoding in depends. Minor clean ups.

diff --git a/xfce-base/xfce4/Manifest b/xfce-base/xfce4/Manifest
index 50cbf642056bdc5b5fb910eb024e25e2ef07a337..db527af07543b3ebc661c506ed6c15f7575dba4d 100644 (file)
--- a/xfce-base/xfce4/Manifest
+++ b/xfce-base/xfce4/Manifest
@@ -6,14 +6,14 @@ EBUILD xfce4-4.3.99.2-r1.ebuild 1088 RMD160 9cc91d6fb18470ee0a6d205f04143cbe1cab
 MD5 41d549390c5e769213ed0d2c73a8cade xfce4-4.3.99.2-r1.ebuild 1088
 RMD160 9cc91d6fb18470ee0a6d205f04143cbe1cabde2c xfce4-4.3.99.2-r1.ebuild 1088
 SHA256 1959f14e3ab7db6ab095609951653c6cfc4183dc11c7bf4d2460958c209e73bd xfce4-4.3.99.2-r1.ebuild 1088
-EBUILD xfce4-4.4.0.ebuild 1497 RMD160 d58f3765431626710b20c0fc9b5ed5106f490823 SHA1 5ddede18888e313da9c0ef61501b5bd00dbb8212 SHA256 7eed9084673dac0d1233aa549b85adaa93adabc18aa1d15c07b2cc5db0c99cf3
-MD5 f67e2ff48ec55d115afea284c9c1a46d xfce4-4.4.0.ebuild 1497
-RMD160 d58f3765431626710b20c0fc9b5ed5106f490823 xfce4-4.4.0.ebuild 1497
-SHA256 7eed9084673dac0d1233aa549b85adaa93adabc18aa1d15c07b2cc5db0c99cf3 xfce4-4.4.0.ebuild 1497
-MISC ChangeLog 9215 RMD160 5592ab22209ea9bed60cc43ce2a505c378776bd8 SHA1 866f7f2607c5a19401bd32204eb8d61bc6e65b53 SHA256 dce7888826f8f360a692df7912b55127ea232eb14a4dc2392c1813e019172090
-MD5 9640b1dcc4fcb67089047358c230f426 ChangeLog 9215
-RMD160 5592ab22209ea9bed60cc43ce2a505c378776bd8 ChangeLog 9215
-SHA256 dce7888826f8f360a692df7912b55127ea232eb14a4dc2392c1813e019172090 ChangeLog 9215
+EBUILD xfce4-4.4.0.ebuild 1612 RMD160 c9d98c5c7bbc50009f319b0485a6269bae938fe2 SHA1 e38b3be46a38b2d43142829e9702073720f25106 SHA256 9f2fe1c3dc61a1cdf5dd4efed2244c8eb8c9ff6f6be2d2e66d209d5319d19c54
+MD5 b0edd3131e0128723df47bd5fcd97f3a xfce4-4.4.0.ebuild 1612
+RMD160 c9d98c5c7bbc50009f319b0485a6269bae938fe2 xfce4-4.4.0.ebuild 1612
+SHA256 9f2fe1c3dc61a1cdf5dd4efed2244c8eb8c9ff6f6be2d2e66d209d5319d19c54 xfce4-4.4.0.ebuild 1612
+MISC ChangeLog 9329 RMD160 9e23d0a336347f8c392c8104cef1b83d2cf42826 SHA1 8b643c8f71bed61b3a67b031dee65671bcebed07 SHA256 1f4ba7214b3dbdcc7147454ccffd3b485fee953a4559079441183eb045ffa097
+MD5 de46e897e6d2c81fd58bab826c4654a7 ChangeLog 9329
+RMD160 9e23d0a336347f8c392c8104cef1b83d2cf42826 ChangeLog 9329
+SHA256 1f4ba7214b3dbdcc7147454ccffd3b485fee953a4559079441183eb045ffa097 ChangeLog 9329
 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/xfce4-4.4.0.ebuild b/xfce-base/xfce4/xfce4-4.4.0.ebuild
index 977a69049508d9f8d89cb69a6b94b9f52f0fbd3c..48fa103f195eeb82c83d1e0c2cc2cce9c29bcb2a 100644 (file)
--- a/xfce-base/xfce4/xfce4-4.4.0.ebuild
+++ b/xfce-base/xfce4/xfce4-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/xfce4/xfce4-4.4.0.ebuild,v 1.2 2007/01/23 17:32:34 welp Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4/xfce4-4.4.0.ebuild,v 1.3 2007/01/23 20:59:08 welp Exp $
 
 inherit xfce44
 
@@ -33,6 +33,12 @@ RDEPEND="${DEPEND}
                    >=xfce-extra/xfwm4-themes-${XFCE_MASTER_VERSION}
                    >=xfce-extra/terminal-0.2.6 )"
 
+# hack to avoid exporting function from eclass.
+# we need eclass to get _MASTER_VERSION.
+src_compile() { 
+       echo
+}
+
 src_install() {
        dodir /etc/X11/Sessions
        echo startxfce4 > ${D}/etc/X11/Sessions/Xfce4