diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2012-03-31 05:28:24 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2012-03-31 05:28:24 +0000 |
commit | fb219c467a4f2e651af5cac41278a1ceca0298c1 (patch) | |
tree | 2ebd3dd833b0230016a46167618f4fd015e1c775 /xfce-base/xfce4-meta | |
parent | Drop in a blocker left out from yesterdays bump (diff) | |
download | historical-fb219c467a4f2e651af5cac41278a1ceca0298c1.tar.gz historical-fb219c467a4f2e651af5cac41278a1ceca0298c1.tar.bz2 historical-fb219c467a4f2e651af5cac41278a1ceca0298c1.zip |
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
Diffstat (limited to 'xfce-base/xfce4-meta')
-rw-r--r-- | xfce-base/xfce4-meta/ChangeLog | 6 | ||||
-rw-r--r-- | xfce-base/xfce4-meta/Manifest | 20 | ||||
-rw-r--r-- | xfce-base/xfce4-meta/xfce4-meta-4.8.ebuild | 5 |
3 files changed, 18 insertions, 13 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 |