pin dep <libxfce4ui-4.12 bug 549780

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x7EF137EC935B0EAF

3 files changed, 26 insertions, 21 deletions

diff --git a/xfce-base/xfce4-settings/ChangeLog b/xfce-base/xfce4-settings/ChangeLog
index a94315cf83c6..7d8f394dceeb 100644
--- a/xfce-base/xfce4-settings/ChangeLog
+++ b/xfce-base/xfce4-settings/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for xfce-base/xfce4-settings
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-settings/ChangeLog,v 1.127 2015/03/08 15:06:38 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-settings/ChangeLog,v 1.128 2015/05/31 13:33:04 perfinion Exp $
+
+  31 May 2015; Jason Zaman <perfinion@gentoo.org> xfce4-settings-4.10.1.ebuild:
+  pin dep <libxfce4ui-4.12 bug 549780
 
 *xfce4-settings-4.12.0 (08 Mar 2015)
 
diff --git a/xfce-base/xfce4-settings/Manifest b/xfce-base/xfce4-settings/Manifest
index d41910c76af1..47757625b931 100644
--- a/xfce-base/xfce4-settings/Manifest
+++ b/xfce-base/xfce4-settings/Manifest
@@ -4,27 +4,27 @@ Hash: SHA256
 DIST xfce4-settings-4.10.1.tar.bz2 777735 SHA256 118a6959ea50e3a533d7aa18ec5a878a47a30608b3ce9ce59a93c3888f4e13d5 SHA512 cf2d3255a0c862b0d016a8653fd1ba94c86b9da36b894dd7ad733d6758b9e023807aa93b1e43deeb0f6a34c6db23507f6fe32b6b7a98fa3e0d3bc7577da429f7 WHIRLPOOL 82f6e28e5d6519fc37c2265efc759054d7208fe38374acb07b40f281f7b802e47e5230a78066e7dac0727453ed14017abc8b0c6afd069eed1f164c607ff1f2ad
 DIST xfce4-settings-4.11.3.tar.bz2 928068 SHA256 f9e40c039f3a06111b5b596abfe462ee067d98e46c6640bf33d3b6e76bc6cd34 SHA512 edde5cd41e42da1a5a20a89f906907fef3e09bc795c3713426e1e7a38570aabeca3cda33a768455f5c5c866cb3842eec771109e3e10cc8431b0c01b512a06e06 WHIRLPOOL 0f1fefaa501c3b4b472b0796f150e7e897472c6fd8856a25ee35f3827af75a408706d4e35289f958199e8c104bb0dd7be5571c535dc54561813188b6b554ec57
 DIST xfce4-settings-4.12.0.tar.bz2 973324 SHA256 04becef105c19d0266cfe8dbf42619e7233c3b9fa99b43dbfc9c6a5959501f81 SHA512 4a61c16f1f03de98c9968a00b50595e2934aaf28b80613c59403d33a293a7f8ef9ebb6fad98b0eeb97a6590b9100e91f73dd6363133d5d8bd06714f1126d8856 WHIRLPOOL 52a66c1b99f67b1e92ccbc223535617a6edff67857032d7c19581fe38e4b5b7e2b32a42bb5263f92ec02596035dd76f6a8f6387f17e524b035def717eda373ff
-EBUILD xfce4-settings-4.10.1.ebuild 1419 SHA256 efe4385a1b5cdbd574454280736f274005b2be13dc89d814043274e027bbb14e SHA512 a9a22e04566405d987199fbf8855854e6022dbc60698d8ab3a72966b681fdf70b4e0df562719b2ea2d9e6cb71ff9ba013d269734bf0af1e61cbc3542b1d62083 WHIRLPOOL e5acf5ac8f8587ea4d34023bbda1afc7123305d4c9f0ff8f188cfa181269ed571c93053bc267af8c761f4bf29d544920e626e26bc0bc0a59416855f7ad51cc44
+EBUILD xfce4-settings-4.10.1.ebuild 1485 SHA256 359a111c2e2509555c017ee58630c3927cc0db5cf433a453410e52d7d1e1b521 SHA512 0a6d4525af3e569fef8e7528b9ded7c543fecdc9dfdb0a6264e8fd2752c9dcc56a9aedc2d8b96b7670bec3cfd11f85cef95cd93902609da8d3608d7f271c3b32 WHIRLPOOL 4076971d0e4561ed74a904115986064eba57ec8ea91dbcf4ba01b7e88ea6f4382333197ab56f1f98c8d7b29f4297527be517a645d1b76443027e05b76741b97b
 EBUILD xfce4-settings-4.11.3.ebuild 1549 SHA256 c47168f53923b2f5d366dcb8f4cc48e868319a8c8bf6f6261e723d25dc237108 SHA512 f3cbecc507d647bba0a569f543f5072c6d14f7e261125d1b45095dc957e8f32cdd017175b7362f5bb828e2ac7080bf494976ed230139908cb141e05a4684e7fe WHIRLPOOL e5f243ffb5c0ce829f81d0312014668e8f775dbc06cd751791cc312b9aa6465bb05a5d72b9d1e1308ad013c216d356ffcc0e0f94548ca1675db90b7bb1fe7729
 EBUILD xfce4-settings-4.12.0.ebuild 1646 SHA256 cf3ad849549642f2e8a5e48b3fe813eb6426276da4ef3869c27f9acc089680bf SHA512 c36aef878a988aafedfaa28eb51125d59a93120eb0b95bd4cd20571e6cd7f2bffb9bebb84a29dad5e708592d057175d83bc014585edbf5a2aae72711b099dda4 WHIRLPOOL dbb2b179dedf1755c86bde8963e9cdfa2f5489f7bc242f95a31e02f7c87bb95b339e7bd2510120652bbd93ef7bbc6d0a2cfd21161258e9c757ef65e87d038a6e
-MISC ChangeLog 16814 SHA256 b02187e737aea9852e85df0a0b09055de21f01e3580070f15d0a22cf87dc1c8b SHA512 16f393e1ed6aff159ee298aa0936d3edd8711ce7016aa11adc382647ff085ab445efd64db9f9e982dede0ab1db3f6ea38c4f7402174d4ff712f5ccebed50b048 WHIRLPOOL 1b854bee8d34753521b4464df8eb3a317caf40a16e933ff03a7cf3dcb1e7c9a86c9571abd38538ecdedf8a6e4cd2165484cadc10e33512d58e5be0f1f2ce76d0
+MISC ChangeLog 16936 SHA256 92603d3c4ede9d889a5c4c35450c116af1a039bc77ee1500d4d0363f92f59ae0 SHA512 af230377036c04a2c82e6d81fd1b63af8f34b226567f064fdd85e91e0a96e00f4949e5319f8ba1369ad51daa97b473ddfffe086a152ac8320992a9618562d4f6 WHIRLPOOL 70e639d69bce7682fca6eaca8a675e6c8ba3f88267e1243ee099e15e52a83408f043bf37f4223fff28c9d94e36ce4e01784d2e4da6984e65bca6463c7343dcfd
 MISC metadata.xml 505 SHA256 ce2bfb5c8f2b4ca75e51b1221b1eb45ce0008f3316e43fc038109122d8f9b13f SHA512 fe51a4a26d14f02521863e577546111c3af7e265ec956d97d6ee7711bff1eca7a7482679539057fb0e3b662dfb637eafa683e6eee3d9efac92c46e0c11caf855 WHIRLPOOL a2fe37b5330fc52d60e0bdad78ca6962d1755819825aa244cd6b347b580ad7bbaa7e6a3f47c5b34c7aadc00434ea6a1cfb68321b378deadb8e8209dec35b424c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJU/GWIXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOzTQQAM6XlPmKPsweA7MNrzyWn7G3
-pnsYmmS1zh5JDg2O9weKXE4oZFq7mm8pWWVuee8Kaeh2aiwarCfFR0j7xVvEr72a
-yKfW1HRE0u8LcMSOZ3YbLUK1Jmx/jMs5eYPzeIjmh6IGRyuv3lWSf16DGCuObvih
-y7LoSojxuQStQbq8jmZ36Nsk0Zmh9XiCIQTE3Ts//w8BPuotV8uby5x6hQZSBs+N
-3iMzygceARSiw9N5Ej/n1m+xtNHSg9OyfGSgstlZho6kvAymFlrzIL+YQ0I21YkN
-OUgtnB4Jw/jQTSv++BiuJ6/e6K3PAm+anUI2qmne9lleLoG72b1HmN1TYvV3VOiB
-HBooSDOK0xcFJj0JLUMMfdunCT64NIoGF22K3kj6MYWz1hHpf0nvBwSP2bGzeOLc
-t9QyAQ79cdb6jflDlfuvgcTCQ8Mz9ArkJh6acFmvdy2GXmi/ium6idYwsYYt756b
-Nj7PdzI+bU7zOQwqoj+HTB9FFUVzc6XMNd+jQCUdgB5cD9nIcYDZmSjB+y6Os2hI
-G10QKGuyEetUOoKLZO3YAVoL5rO/GtSJsVEjbyOaCJIZG78Ip7D/Ahjem8MVLGe4
-VqcCO45yrsKKMuZDCEYpLyt63oqdHTJyG4UiQ+7WxYIip5dJV32Mc3+L2XDY8fiG
-OGghHIunfan6QJAoWQU6
-=nW78
+iQJ8BAEBCABmBQJVaw2VXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRFMTYyREVBRDFDQ0REMTEzRjA0QjNENDky
+QkJFRDlDQjFBNjhFRjU1AAoJECu+2csaaO9VWkAP/15c821HwgV8JzyKjTMABnAX
+OQBmXzxzi8DWzVRYk6a7sQHPgDHFHFkXrjjTZaDYqNnQqSHyVrfY+N83J6yG9BDP
+UpTEd5W6ldy/MYDmEIhZrIB1QkGKDPFl3bqJckyQ/lRrcHxLHh6z7a1IfC/8nknT
+IVlRJ+x8k0TmMOJdSL6WDVNLyjzarOkY8sXil6b7cS8KUt76kWgkjzwiAUYGXY/Z
+LYohEGkGRFgN45uM+T4wMzTscRGEIVIzw/svgMWH/vpnLrHnG5DTMtezG/o/6IRC
+Axsr48vQEQ7PTfg+KJxk1tRcDhzgihvuv6OlrOo6Jot69KL5iNOyZQOqcoWxuMYB
+TZAfFTWfnbaAKTY4tVY+4/cTcRDJRp4zU/vyfU21R2N3ODFsMOJXJC87oGYxEWJJ
+ID1QhmhklhhIyT7HUelVuI0/0YdhgeCw61oOD1zeSChw0+rU357ylQEamRtdufXU
+eK70WzDH79UYRF7wVU3XVNz+QZiXntDZ9RwDKVeFIIojrD1LBnn601Rv6rtnUZ9V
+X8cw8Ybb+G+DBgQ5Z1HFEGN8pAASRXZ8GUqDmnLgq5Fzymwol8KSofY6AyBzp+xM
+p6oE69kCC1YXlxAV2Yo3mqPZTQAf72hYNwLRQ8zPovbSgckoia3LgAJJBuftcYMM
+Y51IJAToEFDPDqMxcTD8
+=8xE8
 -----END PGP SIGNATURE-----
diff --git a/xfce-base/xfce4-settings/xfce4-settings-4.10.1.ebuild b/xfce-base/xfce4-settings/xfce4-settings-4.10.1.ebuild
index b8e36327df79..150b7bdd1507 100644
--- a/xfce-base/xfce4-settings/xfce4-settings-4.10.1.ebuild
+++ b/xfce-base/xfce4-settings/xfce4-settings-4.10.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-settings/xfce4-settings-4.10.1.ebuild,v 1.10 2014/04/19 17:46:13 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-settings/xfce4-settings-4.10.1.ebuild,v 1.11 2015/05/31 13:33:04 perfinion Exp $
 
 EAPI=5
 inherit xfconf
@@ -14,6 +14,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
 IUSE="debug libcanberra libnotify +xklavier"
 
+# <libxfce4ui-4.12 - bug 549780
 RDEPEND=">=dev-libs/dbus-glib-0.100
 	>=dev-libs/glib-2.24
 	media-libs/fontconfig
@@ -25,6 +26,7 @@ RDEPEND=">=dev-libs/dbus-glib-0.100
 	>=xfce-base/garcon-0.2
 	>=xfce-base/exo-0.8
 	>=xfce-base/libxfce4ui-4.10
+	<xfce-base/libxfce4ui-4.12
 	>=xfce-base/libxfce4util-4.10
 	>=xfce-base/xfconf-4.10
 	libcanberra? ( >=media-libs/libcanberra-0.25[sound] )