summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--xfce-base/xfce4-meta/ChangeLog7
-rw-r--r--xfce-base/xfce4-meta/Manifest18
-rw-r--r--xfce-base/xfce4-meta/xfce4-meta-4.8.ebuild5
3 files changed, 14 insertions, 16 deletions
diff --git a/xfce-base/xfce4-meta/ChangeLog b/xfce-base/xfce4-meta/ChangeLog
index e6416a363291..26f27fee287e 100644
--- a/xfce-base/xfce4-meta/ChangeLog
+++ b/xfce-base/xfce4-meta/ChangeLog
@@ -1,10 +1,9 @@
# 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.27 2012/03/31 05:28:24 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-meta/ChangeLog,v 1.28 2012/04/02 11:06:09 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.
+ 02 Apr 2012; Samuli Suominen <ssuominen@gentoo.org> xfce4-meta-4.8.ebuild:
+ Replace xfce-utils dependency with xfce4-appfinder for Xfce 4.10 layout.
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 c7f0e2a4ce7d..cafb3eba21f0 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 986 RMD160 e2d50978d8f0fe1750b5d5eb8f18b421f8fea727 SHA1 d5022e586fb02fe71ac87ff6e1cba6d9e7186a06 SHA256 28d847be7e3a0aeef47e529b89c6ef983f2a1c2e091a1dbc0eb410e6ae2f336c
-MISC ChangeLog 3803 RMD160 d437880d234992375b748e34aa1c27a49f8c16b4 SHA1 18d41441d9e1e3dd76118c24ab75855708fbb88e SHA256 21abf6eecbfcca85114803b0af6def828d36803a57cc592ddf5523563c7aba23
+EBUILD xfce4-meta-4.8.ebuild 912 RMD160 9b68e337d2c303a88c33a40449be3d64538ca340 SHA1 6a2dfdc1f1949b163d4c0a2910974ba1ef38badc SHA256 359afa0c04032e5a2e2b88ab8ff645bb3bf7c9ad2e2a7ce4f68b4bc4678084d7
+MISC ChangeLog 3751 RMD160 b7235511bb4c0106dfdd2ac44dfccb371fe28c80 SHA1 90e864d1118cdc49e597177ac9d17a851d379436 SHA256 17ef1048fa90460c5e225c0dbd7be5c2986e618193c8df0ce7ad9d6a5c1de6ef
MISC metadata.xml 159 RMD160 43722935bd7b4db7fe8db681054f2e53c4a5f7ce SHA1 15958ad72e234ba572c9534533c21532eb6bc0fd SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iQEcBAEBAgAGBQJPdpXsAAoJEEdUh39IaPFN2uwIAJlc78zY7Xcp5XZbV8rwPkwC
-a0858eR7k9bsw70qXxWa0gPE2DdSrbnCXAJxqC+elRY01rer+W1MyXHpC3dVajZN
-S3AahegYqfWsEZ2m56KFBCl7+qlKatLF3FDD3UWNOe7avYvUGSIwh41DWVRfCnmf
-lU9EwBmqTz8xUgIDmeWaJ1AbJX+OMedYfQ+9DkiXo1B9yccjFR/L6Jnk9ntsc+JB
-frAjbxotVqgBQDBFWr+S/7pGoP9aswEzMX/Ag7FzrTS6dUlh5pyJfobIedoYd8BG
-i38p0EXaUlARCoVAwzi9b2BEFmT/RnljLVItXIwERXl2+rnk6RM6VeArSDgdMZk=
-=CJAJ
+iQEcBAEBAgAGBQJPeYgKAAoJEEdUh39IaPFNLgMH+wYUcat7T0w+Q5NANKSAouZS
+pa4yHL2KtYXA/7ZLEqTLw1iEWU2XErvgx2fkVSZAyvJDDjqDw4O/IRwJlC9+7s+n
+EDGkICg/RxravKe2RjXHdxcUfM8JImMd/ESHlUnJdYurg3wqNW7ntlIpWkQnmHqV
+CBq15diS+GGLuqQpZJvO8HJqm5nqyDtfO6LYD6Dh7QmDQhBAWmzV1TB22Q7wOb5u
+Sd7V0TwOavupVTefT8QXV5Akw8gTzDnxS+3G7WsrZz2swjWFCNkRjB6b41YkFg5X
+HRM1OC6hX6EEzlxknQB+LDGD2498LslvKIvOrCfZ6pygD69zrMes2oipb9Nlvks=
+=wm6z
-----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 b501b9b8dcae..709e19e0dad7 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.13 2012/03/31 05:28:24 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-meta/xfce4-meta-4.8.ebuild,v 1.14 2012/04/02 11:06:09 ssuominen Exp $
EAPI=4
@@ -13,11 +13,10 @@ 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/libxfce4ui-4.9 >=xfce-base/xfce-utils-4.8 )
+ || ( >=xfce-base/xfce4-appfinder-4.9 >=xfce-base/xfce-utils-4.8 )
>=xfce-base/xfdesktop-4.8
>=xfce-base/xfce4-settings-4.8
x11-themes/hicolor-icon-theme