Temporarily let xfce-base/libxfce4ui >= 4.9 be a replacement for xfce-base/xfce-utils while waiting for 4.10 meta package.

Package-Manager: portage-2.2.0_alpha96/cvs/Linux x86_64

4 files changed, 30 insertions, 19 deletions

diff --git a/xfce-base/xfce4-meta/ChangeLog b/xfce-base/xfce4-meta/ChangeLog
index 8bc40c43e628..e6416a363291 100644
--- a/xfce-base/xfce4-meta/ChangeLog
+++ b/xfce-base/xfce4-meta/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for xfce-base/xfce4-meta
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-meta/ChangeLog,v 1.26 2012/02/20 21:00:10 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-meta/ChangeLog,v 1.27 2012/03/31 05:28:24 ssuominen Exp $
+
+  31 Mar 2012; Samuli Suominen <ssuominen@gentoo.org> xfce4-meta-4.8.ebuild:
+  Temporarily let xfce-base/libxfce4ui >= 4.9 be a replacement for
+  xfce-base/xfce-utils while waiting for 4.10 meta package.
 
   22 Dec 2011; Samuli Suominen <ssuominen@gentoo.org> xfce4-meta-4.8.ebuild:
   Pull SLOT="0" of x11-themes/gtk-engines-xfce to get GTK+-2.x engine instead
diff --git a/xfce-base/xfce4-meta/Manifest b/xfce-base/xfce4-meta/Manifest
index 8980a31d413e..c7f0e2a4ce7d 100644
--- a/xfce-base/xfce4-meta/Manifest
+++ b/xfce-base/xfce4-meta/Manifest
@@ -1,17 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-EBUILD xfce4-meta-4.8.ebuild 873 RMD160 277fada4f85503d2bf4d1a7a422f5c31e6eca961 SHA1 b0592e18357f78c0e76f50fd39b1d815a2e574e0 SHA256 6b69cb25d088a4c84dc68a59276efb9934532f3e226e7470d50333986d4a9348
-MISC ChangeLog 3598 RMD160 fb96a193bef8bf764b556496683c37b503b23974 SHA1 677466ed26a196e8729355f89c135413b9dba02a SHA256 80c9ba118abf904593e2242de2e184c327d9012744cbf3da935c70b8efa21b50
+EBUILD xfce4-meta-4.8.ebuild 986 RMD160 e2d50978d8f0fe1750b5d5eb8f18b421f8fea727 SHA1 d5022e586fb02fe71ac87ff6e1cba6d9e7186a06 SHA256 28d847be7e3a0aeef47e529b89c6ef983f2a1c2e091a1dbc0eb410e6ae2f336c
+MISC ChangeLog 3803 RMD160 d437880d234992375b748e34aa1c27a49f8c16b4 SHA1 18d41441d9e1e3dd76118c24ab75855708fbb88e SHA256 21abf6eecbfcca85114803b0af6def828d36803a57cc592ddf5523563c7aba23
 MISC metadata.xml 159 RMD160 43722935bd7b4db7fe8db681054f2e53c4a5f7ce SHA1 15958ad72e234ba572c9534533c21532eb6bc0fd SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPQrOJAAoJEEdUh39IaPFN49QIAI1ameBN/qJ7wuoSqMZszYNJ
-jZwmiYfs9MMmt2hVwHGyzkWenCl04dGw49/4lrjiuxV2JynktIZ5HPaqgNHwAlb+
-BKwHzo1ssCRcWnHFRM3oa+6zOLwctkqZUTduhLcT8BnQs25Zuf6/bQT26E9hzVsm
-tC+nCGEESlfs/nA4QxrY5m/PRpIEJsUM+PFAb1D++0SbFNqME0QopuZHGCTngh6g
-XjzvFyyQt6wJyIjcdkjCdtGd/olEaMKyOKPh6OOXBr2EwcknLXAazVE6+AwSE+c4
-aHwvWEzq3y3hD0GV48hQrEMQQwwP2exEFn2e4VMrUKrSSARLIZafWJhzeFlS4BE=
-=Vc1U
+iQEcBAEBAgAGBQJPdpXsAAoJEEdUh39IaPFN2uwIAJlc78zY7Xcp5XZbV8rwPkwC
+a0858eR7k9bsw70qXxWa0gPE2DdSrbnCXAJxqC+elRY01rer+W1MyXHpC3dVajZN
+S3AahegYqfWsEZ2m56KFBCl7+qlKatLF3FDD3UWNOe7avYvUGSIwh41DWVRfCnmf
+lU9EwBmqTz8xUgIDmeWaJ1AbJX+OMedYfQ+9DkiXo1B9yccjFR/L6Jnk9ntsc+JB
+frAjbxotVqgBQDBFWr+S/7pGoP9aswEzMX/Ag7FzrTS6dUlh5pyJfobIedoYd8BG
+i38p0EXaUlARCoVAwzi9b2BEFmT/RnljLVItXIwERXl2+rnk6RM6VeArSDgdMZk=
+=CJAJ
 -----END PGP SIGNATURE-----
diff --git a/xfce-base/xfce4-meta/xfce4-meta-4.8.ebuild b/xfce-base/xfce4-meta/xfce4-meta-4.8.ebuild
index ede56f0a1d39..b501b9b8dcae 100644
--- a/xfce-base/xfce4-meta/xfce4-meta-4.8.ebuild
+++ b/xfce-base/xfce4-meta/xfce4-meta-4.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-meta/xfce4-meta-4.8.ebuild,v 1.12 2012/02/20 21:00:10 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-meta/xfce4-meta-4.8.ebuild,v 1.13 2012/03/31 05:28:24 ssuominen Exp $
 
 EAPI=4
 
@@ -13,10 +13,11 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
 IUSE="minimal +session +svg"
 
+# Temporarily hacked to workaround xfce-utils blockers for development series.
 RDEPEND="x11-themes/gtk-engines-xfce:0
 	>=xfce-base/xfce4-panel-4.8
 	>=xfce-base/xfwm4-4.8
-	>=xfce-base/xfce-utils-4.8
+	|| ( >=xfce-base/libxfce4ui-4.9 >=xfce-base/xfce-utils-4.8 )
 	>=xfce-base/xfdesktop-4.8
 	>=xfce-base/xfce4-settings-4.8
 	x11-themes/hicolor-icon-theme
diff --git a/xfce-base/xfdesktop/Manifest b/xfce-base/xfdesktop/Manifest
index 49833c8dcd80..9fdab346c132 100644
--- a/xfce-base/xfdesktop/Manifest
+++ b/xfce-base/xfdesktop/Manifest
@@ -1,18 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 DIST xfdesktop-4.8.1.tar.bz2 2717331 RMD160 2a0189467051ac4eb042a6dbc46aedfc0390c746 SHA1 18fbce10018c29b4942b90583615e7ce42510262 SHA256 596483b9faf0c7617f265a8f30981f205aa1eecbd27d2d9428921cf9700740b8
 DIST xfdesktop-4.8.3.tar.bz2 2693819 RMD160 8cb76ca82c5993daba902af40ddc2830b1c1ea20 SHA1 b3af72a69627f860f22b37d021efd81e4e37eb55 SHA256 e58460f52ae96c389402f6db62c46db61cd51cdb550a42bd97c0ab2a5b62f424
 DIST xfdesktop-4.9.0.tar.bz2 1905911 RMD160 149489ae9d4c21ad9d4c03285a1a4d44c4cf4a71 SHA1 8ea0a45d6a38aab1fd73a7b60ea8872a89037bd4 SHA256 a065dffc020d23e85ac9bedbc374c444e5950f274f3290da171297aa0879d77d
+DIST xfdesktop-4.9.1.tar.bz2 1915954 RMD160 4893dd32496e269f9432282742eacbc300b8d2d9 SHA1 7aea59a6a63e8f2b75be215dca74dc29f15cc1a4 SHA256 d9c93ef204a2220949b71ec5fe52056a3c22ee36e61f2b499343dd1aee92f6e6
 EBUILD xfdesktop-4.8.1.ebuild 1339 RMD160 fb22bae8face11f97586420db2b5168786713689 SHA1 db94497dabe35d6dc37de3391b265945b0e81be2 SHA256 c6d70d86cdbf83561b56de728e9ced184a74a682ba63d09d0f98117bf81e6390
 EBUILD xfdesktop-4.8.3.ebuild 1347 RMD160 9bc43319c0304e9a674310c82d78651f12cc5f92 SHA1 c367146d7f5b75241d20cbb0a98ba6024263f441 SHA256 d82b5304c63e46b98793ee6a506a7d511daa99fe4cfe8fcd15ed7fe34879f4a9
 EBUILD xfdesktop-4.9.0.ebuild 1307 RMD160 0071d9421f2316931527f35d184a479f30ef018f SHA1 20bcb0987f763bd8342902f44ee67a0d4500bdcd SHA256 5ef051400fc6a082ab9bfccaeac499ed9fbf43c015565ce2c225c4ad2397af62
-MISC ChangeLog 25570 RMD160 700caa979de4a4861ac9554479766f4fdac90390 SHA1 2efc6783979cc937ff5c4d892daf4d8b3064dd5f SHA256 6c52727872e170ddc7a185051528fd22429f0e327537b910139563a0e7a0f51b
+EBUILD xfdesktop-4.9.1.ebuild 1298 RMD160 61af4cf8635c2611cde6144c66df190429d1d677 SHA1 8d57116eb0c5473625fe4921fbccf61249294c57 SHA256 3f9f31eddf53e07bc3c5ed4a4e11a2c7c8713c41b3d3ff490ad397e8a91d7cc7
+MISC ChangeLog 25746 RMD160 0b612da03195f06a526ea01ea0f77acabc5f7335 SHA1 db6b4fddc7f7ec379fd928dd17853f4e01c27d14 SHA256 7dfc59727047f8ad696c55c3690f00e2cee1669757c90881e309b3c64b2d54e3
 MISC metadata.xml 276 RMD160 13b24c1b04cf3019681e2b6a455c4fd196ac7ac2 SHA1 b58ca6fb049d21778094471208bc75b4f9fbe704 SHA256 02ac0bb7333dd11cef3a53b2d3c3cc744406509d104d37bd8bd31641646d8ae4
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAk9s65wACgkQmWq1bYTyC0NUwgEAq8iYJPWCtv0HMwjk+EfC0AEd
-Gx/f3koLvLtuYB+48NgA+gO7G7nu28Kf9q4QKVvNTJCbdB2MVmqoxmiXDZaFiLX7
-=PmEi
+iQEcBAEBAgAGBQJPdpb2AAoJEEdUh39IaPFNz+0IAIclPeu0UJF2OAQV1knO1U5U
+GMT7I1T6KJ4fbgH9xkK6ptmfeuk9/+l7f4kG3CUKrcsaA6sIiJ+9ECGmJKbnx90z
+j+jK0kREPldZpPFXl87+Sb3bfQIbEw0xKhI6MS/YI+Js9bCeknorFPNecBiKMuXk
+8MGnXYf++o/RzswxyAsrrXWYhnBA0k65UgP4MK1cjxzjBEG5UKCw9x5rBijqroYh
+NrryBV9K+f410dMzNcq8qaPypjkGHeUzg384TtdobYGykKynMesGUy6Byon3Bnnz
+yHOcAKei8bHiV4YCHycicxrJ/spzIjN/GErAo0MjwzfbGqgmswIKz/z1mLAcLBI=
+=hf6B
 -----END PGP SIGNATURE-----