Allow only system-config-printer, not system-config-printer-gnome, to help portage dep resolution (bug #553128, thanks to Marek Bartosiewicz).

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x18E5B6F2D8D5EC8D

4 files changed, 31 insertions, 27 deletions

diff --git a/gnome-extra/cinnamon-control-center/ChangeLog b/gnome-extra/cinnamon-control-center/ChangeLog
index 976c9b8364b4..b8b519a3fd3f 100644
--- a/gnome-extra/cinnamon-control-center/ChangeLog
+++ b/gnome-extra/cinnamon-control-center/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-extra/cinnamon-control-center
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-control-center/ChangeLog,v 1.20 2015/06/14 01:57:50 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-control-center/ChangeLog,v 1.21 2015/06/29 03:41:57 tetromino Exp $
+
+  29 Jun 2015; Alexandre Rostovtsev <tetromino@gentoo.org>
+  cinnamon-control-center-2.4.2-r2.ebuild,
+  cinnamon-control-center-2.6.0.ebuild:
+  Allow only system-config-printer, not system-config-printer-gnome, to help
+  portage dep resolution (bug #553128, thanks to Marek Bartosiewicz).
 
 *cinnamon-control-center-2.6.0 (13 Jun 2015)
 
diff --git a/gnome-extra/cinnamon-control-center/Manifest b/gnome-extra/cinnamon-control-center/Manifest
index ee7983507023..c0c68fb369ef 100644
--- a/gnome-extra/cinnamon-control-center/Manifest
+++ b/gnome-extra/cinnamon-control-center/Manifest
@@ -1,31 +1,31 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX cinnamon-control-center-2.2.5-optional.patch 3164 SHA256 409d944613f8e66cc413673239888d5fc8bb2e56f635909b14fd9f26d33474ba SHA512 587e93d79386f32ab122b329042e971eda6ba41a3bbf53ce300ba312701a817254cea1814ab777ded2689f29b974af02d07cf827ec5e801dcf47aab23664c5b1 WHIRLPOOL dcb1ab88b0b00e3d091d2b64778a9f37cfcf601dff6641d9aa8c3f365c10a694f3fc937d3cbea04285b9e07f716dee3f8e5ffb1af238e23d1d859769b23b49d9
 AUX cinnamon-control-center-2.4.2-networkmanager-version.patch 1570 SHA256 9b42ea89bfd7206e6131e720a026ddc7074c54a1d8cb460f5dd35818b07e05a9 SHA512 ca040071c60326ec686f7bccc5a1a8650299227c965bb4e41fc6b2e27ef7a965f6ed58bc764bdc45e09b263be444b4575c2c457f70a6807405c8e4218a0bbd58 WHIRLPOOL ef8eaefceac0b2d3aea0a1eda9dd72489d41ad8ea41363596969b462b3852a9f343a6736ddab341b484d9c8d8f117347c0e14bf42f64e5fae9730ac1734cceca
 AUX cinnamon-control-center-2.6.0-optional.patch 3343 SHA256 19e76ccce6ab38287dad72f3f51396cd74c78b4bfba56db67d43b85c58b0b04a SHA512 542b9b2e52354340c0c048f1b9884a5e5473f7300cd2ec9dfa05cb1cf4cb4daec50dfeb374b91c6e107090ab23a83f13ec468bc0e73f487716ab29aa95b1423a WHIRLPOOL cbcc049324de0aa671bd192692d16c1a25599bea79b36f239fb1afd3849ab8b8be582951f29f96c9ba181f1d46fc6783bad282514fa69540284d729c823aef74
 DIST cinnamon-control-center-2.4.2.tar.gz 4305006 SHA256 7d25193a3cc13c12f22864f3c9a907acfaa616392cb2b7ab4e0624f0d200f188 SHA512 c3b4e5af84b7e6e01deaae51ed29e184158860c5effa2550b9d285902c2c35b690cb867ae747b437ed2ac2d0e75b0e6b36c97f9af3c5bf3f4621bdf304d5c253 WHIRLPOOL 41a32cb1c97f0fd3c57d67891c66082b66db6dc5a43737d50fdc6a17819c64d9b58ac2b679baa7f9bdd906643c02c161b4a72fd208b48561cdd43807a58f5621
 DIST cinnamon-control-center-2.6.0.tar.gz 4169903 SHA256 bbc39ac8ddcbc06b6aada1ef271f95f5f0d0fe439bec38b9cd847af420305c49 SHA512 ed383484b751a9d98de7f136c21c5eb6ce7cfe1418945bd0725aa9e9f08397eb78854b38db258434ed8895dbadd2ce29b5a423a9025dea17fb4876f8847ff125 WHIRLPOOL 7e6d3373e97116d5b531f4fcff85984050fd5d7ad343137b76e30089b3c6f4ff5409f68867289f3967a257a67cd04059f2aa02c48a4e0e4c29b43755d6f4cd84
-EBUILD cinnamon-control-center-2.4.2-r2.ebuild 3050 SHA256 c0c409dce6ea4860df177f0216f86d56365c38d58ad7bc05a115431e76cf95ce SHA512 043a7b5bc9f76fbcf09a7e42ec3b2b2ee5549e265815aea1641ed6d4c9b318a25716358918d1b96a085435c229bf538003c40dcae831ebcca0bec34f50cae008 WHIRLPOOL e009e85c3245d6ca21635647732edb85ab28c6e005dd6bc31b9a7242d2aab0e53d368264fc42d73c60730d27b20d3982e4898c92ec52d39b7bcd5538d203eaef
-EBUILD cinnamon-control-center-2.6.0.ebuild 2861 SHA256 610557512898af7db7a6fd47ad441e79ad2e53a6abf72890d552579109d410d2 SHA512 919a7671601332566c54586e175748f89fc59a9069fd0242e4215c67a57825bcc0d58b380e4ae213e7c1dc0de7cd0981338e7405d744a21543d36fdd910deb9a WHIRLPOOL a3ad44136b4722bd4dfa2599db5625c18c3b194f144f72ea973b82672b5850cefe54f4e90f5698933e37d657cf4cbc2bff289b6532c0de7662a0ee0c2ca225b3
-MISC ChangeLog 4197 SHA256 9f25bd36202a7d2ebf991fe76bc3333f45a2bd99a56a6c557ec22632da090614 SHA512 f361a3ed391ef56e852be50b24ba064cfbf5bd9433da64ccb35dce8012ab8d77fe5b416a0681e4512b58da364adc9f61bc10f9594a9f72d1d0b1c6b460192892 WHIRLPOOL ec61ad502e9d7b953b8a9a118e7f9c27faebda6a2684115e561aef6f5bdb83d6f2603967ebfb09f9375d52ab44b561f8319af78df4c287f01864d760f77f08e9
+EBUILD cinnamon-control-center-2.4.2-r2.ebuild 2998 SHA256 1106130f029f6f17611ae8d5246a3f220078e894760973e5f4e843d65c5dd2f9 SHA512 4f4aa1a0bff2244c6f8fe7f43c5cbbfb9b6b9a92fe0bc961950e35507529ff9b7d955e51021e4d79a0b0860ef4c5804be3bbbd6a3e5b0e66d521097028be9e58 WHIRLPOOL 285ab2e3f5239b09ac6b2999e50c70f92b9b6f4f3f39863eb45d8e090e05370a9c935d9680d742524265aa917ca66e95391809394030326b8c815932d8d488e2
+EBUILD cinnamon-control-center-2.6.0.ebuild 2805 SHA256 a0fc763b3be949437b9bcd11474700ad139b580e46ae954597022038695b85eb SHA512 999f33509e9f0e6ef62ee54889fc57c9df2dbedda8f39216bebaca6191b968bc0ea540f79564ecd73720453988f15d0334bdeed99c6a0aad1e2c95d6965e2766 WHIRLPOOL 36a123912a0209eaae011c880ce47bf8802e411461d99b7ac5edd8a5c9b3941bdac185446707ec7198b20d2fc9c58a4e4031c9663c9604cf795c09cd3e0cf13c
+MISC ChangeLog 4487 SHA256 b335df0e1568ef3f209989d3da1a88130825f585f5d47ed585f0392d77cdf995 SHA512 4315e5aaaa4ffd269339818c1d14fd433e7113f43c04bca9898a275145e595dc648daa1e5982e9e2b5606b1f6d9b96064bee3b8bf2108f872c98b26f72419298 WHIRLPOOL 5683f89bd3c1f798f52b46715ed76a61b68e67edbcadfef4c33e07f287f3e17d267565f15bc2d8cd583f4f030fbed24d7465c5a8709bb7d42eb88f4072dadb1b
 MISC metadata.xml 362 SHA256 014d51487f2a52410b5d8e064df9c20d8499f9c4d6e901b9301519c29e44204f SHA512 b6dc4f2bb6e32ff89e82bde730fe400d58abd755173f8188b07c56e6d303bb0fe9a0a3e25561b6d65523532d5938c822ca3a70632f3f6358a339232f6393d0bb WHIRLPOOL 31e61eac733b24abb065b7c4da492f8ec19d7a9e305ddeb853ab84fbb918d06578dc24e8a5643c805686ccd9fe2c55679619048877450b2252ea7fc420e86713
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2.1
 
-iQJ8BAEBCgBmBQJVfszhXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiGKYP/1YNq/SJGwd71ObaUSIczuqU
-7urHM+DZEkqJ6ZXR+mfCDN0DAxVI0slF0/FUJuIIn6V67M6gKMU/jZ4CQ+2zTBsv
-ffjaj+0sv+PzVYLTMcwJ9qacIjmwPfw7aLEZoZdfvYMyQ79j5vBI0Qxzbh0kpChf
-B27k5yvksrBwYHnuBuKjeJbzwpwI8ScyzfNEMa77Iiq8FLTQ96EbLlOeAshVpZfw
-Vu/ofbEOFtqqpX0KuUXpWJvvfr3qdh3+TpitLZ4fTWwLxSlNp25zLJ3WJH10iXoq
-+czZGfMor6sQkd+OhIcNSYzSR+SwveRoy+d2VxPd9qHyZ2M4RjvsSyEh9N1/YZqD
-9XUx4Tc4JGk5TlUvQ7l10tc4Maffpi2EfXP/y5V5lS7K/oVmJbJMuQktAkBnqEIZ
-qZopdZAmGlQP3+Sc7ymAUf2Kifvc+Khy0soaGqySfjZPoELpPdFkrhMhy3p8co3U
-3vISR2eG0Y9mqxrwMZW5xJ9V6UeHyhNtu1LgtsqiYf79qlT4qDkcMhmvj83k1YmS
-r5C307xqoeuarLNoIasbQ4/rN8DmRrI3e1JBOfWx9fx6E9It+XjaXWbNpeE+vkA+
-vl+y9Yt6ec6XTDESkEOainiX3IAMB52VbQ1U3rS78uBT2L9XI5FoLPxvoh39HEck
-5t+WG63MmAWdy85flmAa
-=YDys
+iQJ8BAEBCABmBQJVkL6GXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1RTNCRkUzRDRBNkI2MEEwQkYwQzMyOEEx
+OEU1QjZGMkQ4RDVFQzhEAAoJEBjltvLY1eyN5OkP/0MO0PEYjkZNFWGmxhH9hSxg
+kXCCHH6gV4ex6jDrAQS+/hJglaEwB7Vg0EUKZlwkITh0LT9gGBJKeUqbrYVgU8r9
+bBJ+/7MFZrM+KeSzcQarjd1n3eQbtlDa4w2bwrVAlitxQoBJ3Pgb+aawEDn9WyZx
+BVgOFWOp6GLUka+OqBT1Z9HvNyhiotFl34dmQMTcby7XR209XfWl8IVjbeQqzKjH
+vIvoPpt+g12HjRJPcqZ9XD/B/WzjgaZhlfFR5Yq23F/LHUtNrP8i7znfy6ANtfT8
+LdAoUqgKjjWjW/2G1KBgBrkgisze5egPi91Ro721nvy6mpvv5y6XN2JNIAhXouU9
+c+D2lakGRizkqxbVwG1lfnGR328cPevsVU1rJbyjSDnNmuvyCmkUdonW5aGGt9Zi
+S/CplFQtOryFqvAqMTf1FDewXZyOqJkFAQr434cczHVEdnt5DBwrcXSRYZ1qWS5n
+nt6hpTdPZB1y5IxyE782gNLt7dDaFGYl82Ho8/Fyy0yO7s43i9EzNltJEloWkLuy
+v70mMG2HBsQCEM6LSPbdHAPKOHA0b1pwNb6ZT+W1KpPp2tBTWOoCsBRDFxWt0Zx2
+ZJtUJcrZHoxt5zL3jop0o7kAOAdagQrULhzxKJseP4O9J9xBew1jxysr7qhU5s0d
+Ml1YmvbCT7eorQBEZ4cX
+=fGGE
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.4.2-r2.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.4.2-r2.ebuild
index 1877ea350f16..8c2b70855c22 100644
--- a/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.4.2-r2.ebuild
+++ b/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.4.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.4.2-r2.ebuild,v 1.4 2015/05/12 18:44:43 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.4.2-r2.ebuild,v 1.5 2015/06/29 03:41:57 tetromino Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
@@ -58,8 +58,7 @@ RDEPEND="${COMMON_DEPEND}
 	x11-themes/gnome-icon-theme-symbolic
 	colord? ( >=gnome-extra/gnome-color-manager-3 )
 	cups? (
-		|| ( >=app-admin/system-config-printer-gnome-1.3.5
-			app-admin/system-config-printer )
+		app-admin/system-config-printer
 		net-print/cups-pk-helper )
 	input_devices_wacom? ( gnome-extra/cinnamon-settings-daemon[input_devices_wacom] )
 "
diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.6.0.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.6.0.ebuild
index 45ef78f212bd..c6dd90e67a92 100644
--- a/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.6.0.ebuild
+++ b/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.6.0.ebuild,v 1.1 2015/06/14 01:57:50 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.6.0.ebuild,v 1.2 2015/06/29 03:41:57 tetromino Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
@@ -57,8 +57,7 @@ RDEPEND="${COMMON_DEPEND}
 	x11-themes/gnome-icon-theme-symbolic
 	colord? ( >=gnome-extra/gnome-color-manager-3 )
 	cups? (
-		|| ( >=app-admin/system-config-printer-gnome-1.3.5
-			app-admin/system-config-printer )
+		app-admin/system-config-printer
 		net-print/cups-pk-helper )
 	input_devices_wacom? ( gnome-extra/cinnamon-settings-daemon[input_devices_wacom] )
 "