Allow only system-config-printer, not system-config-printer, 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

5 files changed, 33 insertions, 28 deletions

diff --git a/gnome-base/gnome-control-center/ChangeLog b/gnome-base/gnome-control-center/ChangeLog
index 4a3a35bed50c..60619c7c9c09 100644
--- a/gnome-base/gnome-control-center/ChangeLog
+++ b/gnome-base/gnome-control-center/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-base/gnome-control-center
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/ChangeLog,v 1.170 2015/06/26 09:21:51 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/ChangeLog,v 1.171 2015/06/29 03:36:10 tetromino Exp $
+
+  29 Jun 2015; Alexandre Rostovtsev <tetromino@gentoo.org>
+  gnome-control-center-3.14.2-r1.ebuild, gnome-control-center-3.14.5.ebuild,
+  gnome-control-center-3.16.2.ebuild:
+  Allow only system-config-printer, not system-config-printer, to help portage
+  dep resolution (bug #553128, thanks to Marek Bartosiewicz).
 
   26 Jun 2015; Agostino Sarubbo <ago@gentoo.org>
   gnome-control-center-3.14.5.ebuild:
diff --git a/gnome-base/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest
index 02de787414ea..07e32e43b2d4 100644
--- a/gnome-base/gnome-control-center/Manifest
+++ b/gnome-base/gnome-control-center/Manifest
@@ -10,25 +10,27 @@ AUX gnome-control-center-3.16.0-networkmanager.patch 4043 SHA256 684e6c01bc2d61e
 DIST gnome-control-center-3.14.2.tar.xz 6938572 SHA256 b15e188b3d45c86d71f4d8cb297829cf190be81f22ce76dc74c7b4232bd0652a SHA512 c5bcdcae87f32cf4b0f9d99709dfe7fcb48e5086945d1685ce94c3996022ff5bf4c82994bbec28e0cf91c9c85309638225536e1dcca06b96cdbaf1ff38f2ae6b WHIRLPOOL 3188ff540a8a01a6479c529f4fe629d2b695b185f762291691a6aefd0f815af382afca2ed8c4ff56e4e5161b3cabe751d507625e4638856034982d2e408000a5
 DIST gnome-control-center-3.14.5.tar.xz 6984452 SHA256 66ffaf4b1eb0a745a2928035bc1b1e1eac7ea3775941e3a06bfb68ae4c1404c4 SHA512 ef9fa7a8d95bf37bce4e67521db7c35145f9de7bc9e5a9428d1aa0b0031698e38706529b509534e68dbc4cc8c54ba3482cf439e386fe64f3374432efa637512d WHIRLPOOL 15a83613f80cc3e236fd602d5c84a9a844a236de6556b742ee25147ccecfe207914cb2e4c1ac4029065a6bf19bd81ff8257cbd26163ad7df757849c2e0865f38
 DIST gnome-control-center-3.16.2.tar.xz 7027220 SHA256 2c2636af27a07a064669abdf79a8b0580a9a611fa4f108900167100473028a3d SHA512 29c7b87ac2f713a46e20e596f69b343e9d98991c3449e79eb3f77e5d0b14f5250902caa2e481192d6da77f22a309bb7ab5fe4e4eb3c2a9e92d8b672c6b99bb09 WHIRLPOOL e1deb4f228058d5d49c9592a9d4f219190bd8909cccf803a45df767311f3d38bf79d56893f2628475a9d807ef68d57176c89972ec4b63aa81c6d0a35b9d25d60
-EBUILD gnome-control-center-3.14.2-r1.ebuild 5177 SHA256 22d0d929ce4213204b70b119534d64ed172dff192defb5e41f2151e17f240b1f SHA512 59cfd63d958f24258c6a00d8f76b4fb81a8c51da1841bc6bde0f0ec4e98ba000800e644ed494906913a021dfea25be40a774edc35600d1abb48e951a4b1a55de WHIRLPOOL e62db5e96d3e2f88a84e284072201f39c9ddb469303dcc6d713d3b97156da164e432357b627992e118597b20b9d967f36eb399815e5f0a2afde315c3bd7e80ba
-EBUILD gnome-control-center-3.14.5.ebuild 4282 SHA256 2ef07c2b73898c9cfafd1c23c1af92bfc292d8a2c4d1d4c07bc6b94794ebbc52 SHA512 a1f96dbc285e0dfd8948a8748ef55cb2d3e5f4219f00ebc2f3834a19fc08435f03a47a71eb998436e35b9b9bae562662262fea79ec180532604a75df1b8493b7 WHIRLPOOL 33a97c67ac339a0d9545af6c22cc9fb97174d35ecd81ea330055a830d335732dfef378c65e4ef001cc58fbd4e8fd2b118cbe9ea38096253ec7fa69bdd9521f88
-EBUILD gnome-control-center-3.16.2.ebuild 4771 SHA256 338945b1f51bc77e7f02ec058a97506feb4368cfaa4503c44adc18eb543f48cf SHA512 bc70b17fa96ed0b38b1bf082065627ff66d037f38dfed15756dcbf518b52a26259054d2e9ac24ce14739c7554d76e6bc7b5d90469925bc67908610775891e418 WHIRLPOOL 609333cdbf559f95d63c94afb5b0fba512b296c35cc5b3b19102efa2b36098457b28506f752130036cd9b263d5bda9696a583904ae8474d0950c9e1a1d0ac86e
-MISC ChangeLog 72858 SHA256 faf43cb23164be8be9fdef59072c8d51fb70e0e17c42d6d1b495985c3f402b7c SHA512 75dc821990e32794f39bb9eb19435e87e6d8bbe0feee583f89a5edc497adcbe7a4894f5f09ae868e04fab04dcb4ac32dec4b30a83521762787e6ccb1f7d7501f WHIRLPOOL c7012db42cb57a47c11bb3f2765a1de7d0606692ce6032958ea1d83393608ae4eac6a1953939137bbded2dddbb20f700d48731fbd040fc74f894377e350738d1
+EBUILD gnome-control-center-3.14.2-r1.ebuild 5121 SHA256 343f41654d6a9e42a3984d1f99cf8a063419b204ba49b66e961cf056786e9659 SHA512 fe915a5512be8520168a51d9f14b1683918f7db8d21b7f129dbe6b4d96ae4f907cf3d4993e4fb88349b513b8bbab337889581dd6272d4e6c1af83c12d28d845f WHIRLPOOL ec908ed61860c9c8e96d01cad0640db761f174534b5489917bf76ef9dd126f544f564e7d7b69c7eca25d8aaa026baef74a810d454c659fd82628cdb376f6512d
+EBUILD gnome-control-center-3.14.5.ebuild 4232 SHA256 2bbabc474b528d2017c30f698d78838f47929cec3da6eb05e7777d46c272ea1a SHA512 e272cc66472e198933aad284f538f39bbcf3779b6c6851397c44edfa4e6ca583743e4822eedce0350543d5c5bcac4c4d44b76172a5d1e171377d487ade64cb1d WHIRLPOOL f72037da9811d70e5d374955bfbf979e78c0606d921bb56fffce0c14d90ce702715a7ae20c32ba704c3c51b79b914832cf1faf12b0a2296c2671506374e95fe3
+EBUILD gnome-control-center-3.16.2.ebuild 4721 SHA256 41caed851ef0eda17cf5af4aa58b32e1a2760636b1b2aa218960d5b75ae28904 SHA512 83786918a251629cde580aa08314748d6efe20e8abcb897845bc5cbe2c3573a7a5c50ad3da859b8d3e2ee35a0a76acd6a52d699477005f59148ac209814d75f0 WHIRLPOOL f6ca5d87fe28c3a79f9df3215eabb8696618a2dd3408ff5afb9a36b9a0c5e351189e6c6e59e5c74cc53ef0aab95d4926d17b9244a11815b742ab2c395388056b
+MISC ChangeLog 73180 SHA256 701064742b2883e55d780db468e042a8b3bdc7ae8108d2e7f04fd4de947c86e0 SHA512 d6f1ffa7881bfbcbb7729859179b36ade60990354b5a5466e6e33b8a73b230a0a8897376efc73298274da01a8dc61d565318d5c615963d745d91fb1c479612c8 WHIRLPOOL 4f0f2fc54974efa8642a7927b3a6f28d849e3eda36b906a60af5326c00d134ef4805c18f4e1596f8a45a8391027e5aecdea50a6b0ed2a423a946d6009747fc19
 MISC metadata.xml 498 SHA256 fb46c54dc3e3ce2c8297d67292cd0ecadbdadf8c22a50437f8a03fd5b6ec9dc2 SHA512 ae1ff3489b7d037af4d1a550538e0cadfa815f6afcaa76b73afb3fa7d87d888c1ae5b3642416e9eb0cf0c2ba4f70a5ed1f5a9ccbb1d63320fc444ac3c3aed2d3 WHIRLPOOL 94896b01f55c9a411cf85eda67cdebba03f2e32a723094f9f839e04c5096d09b63b4ac0895b7ddb70bc0ba3ef2ea4aeb6eba650e926fbaef155554a768fad970
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iQIcBAEBCAAGBQJVjRmwAAoJELp701BxlEWfMF4P/38t8+ZhtphnlACC/Tf3Asqm
-iqikb0z5YEdXls64UJPI1nB+peHJ543e5D8zP7h6mSYKKZ0/YysQmMR4mjBV59Fe
-BIdkn1At1rOzShw2FVA/nK7Kgses6zsfzNYdLMh9WmUeeW2laaGAQDLwDTqLndLK
-K6MXbehTRxIDDtp0jd3XGc1atz6ek7T3CpJMCzSDI44LIav+HEM+ANEyX7QeQ98v
-dUfWa0iOdmOJ7DAfZ8fLvkJdtecR5UTNnlM4cHpT6uJPwN1SxRLa/xrlSmXtEs/b
-YIpM/v/jpYMIJLBj+0HmppcZXVzl9agnoHGJ6Gl5wBGvB80Jdb8+PVzVZPpfAvTb
-TDsnW5HJBIrWt0KTZgaENZiYMLZjq55kASC5e/SKKcvbdqXabLozpQuolGREJ53d
-hNxtBRGd+/lfIgRKDucGnqEnbSk5Vl2SLWbQhQC/6sqnNr6l1HmNIwfS89NYwn0J
-Pu5GSsd02BJbue3m0GFNUiJSmCSVIIUCBGIERaOHSkFfKRCbVOYkZLElS/pAiN95
-Gv9/okv23EE7W7pjvexeGXRmS93NeOIXAoP4b0VRtXfxuLiLAibI0eNy7QCYjwzC
-1yY2KMlE7++7Jesc457+fIq71ZXYREbZs7FAcBtwcAtJqZeL6t7qwPNhbhzxWkyO
-pnP0ditV8VOmdRKGtY28
-=qLhL
+iQJ8BAEBCABmBQJVkL0sXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1RTNCRkUzRDRBNkI2MEEwQkYwQzMyOEEx
+OEU1QjZGMkQ4RDVFQzhEAAoJEBjltvLY1eyNqxYP/1JB0UBPFnLveIuYT1TiVKRZ
+rvwt99fI1ALTqkt3lEJ8m8lsjPcbcWwAin5dmZBIjb8h8H4RGRvO4bUjDlmuqFiY
+ndJPmM0l9ixvlI3W95umRNNnoUfli1vMFkYIN0XpOXjinCt5kcfd+VYZ5QBPdoSq
++cOu1+s9Qyed1EXgcAmW/Jl6N4Z2xEz+MOJsCCQWvIpyY/I6vDZymfjeEUJ6sqRR
+tCkWCkwOW4dsp0ITHSayvdgj3/UTfiF4LyBhaayGpYkmXFjta7JruNL7UPbu6mwy
+Aa+ZDrtH+a9di55hEQH8jFuToG9n3w9JV4fRdPrkD02Hd9219Fv5Zz4lWKP0HjpW
+nvQg6Myvt+yGOGF1TFPDmXcfGjKJRaYi71Ovl2D4Fw6+n/kMDCqTMn4THUyNWbP6
+dMZ1hQLSicLWv88B4SCqwCEB3t2sutfhhgffLFO6ghjZFZ1O4Xgi1l81WXIUB5Ir
+rMqyZ7yKY6MHPSu81SFSjRhWBeiAIwohJv56ezgDwxELkjC2toeYFyMz2SxG4d4B
+zDqdq1Q2jRWnz7mZMRO4HziY3TxmnDRAY3ZQqrTssxWujsinhDtUnBU6XJNAtAcj
+W06R+wdZwLwrbu2tv7ooHl323SvhYKm2U+EbFAVaxIjHesHex6wRGgKL6jeCIEeg
+MRCKzfW/GdYtMjziedSv
+=gdkm
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.14.2-r1.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.14.2-r1.ebuild
index 3cc62b8712d9..c99d7d4761f0 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-3.14.2-r1.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.14.2-r1.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-base/gnome-control-center/gnome-control-center-3.14.2-r1.ebuild,v 1.4 2015/06/25 02:44:53 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/gnome-control-center-3.14.2-r1.ebuild,v 1.5 2015/06/29 03:36:10 tetromino Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
@@ -88,8 +88,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-base/gnome-settings-daemon[input_devices_wacom] )
 	i18n? ( >=gnome-base/libgnomekbd-3 )
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.14.5.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.14.5.ebuild
index 0c3c26e56769..a4ba34328e6f 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-3.14.5.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.14.5.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-base/gnome-control-center/gnome-control-center-3.14.5.ebuild,v 1.4 2015/06/26 09:21:51 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/gnome-control-center-3.14.5.ebuild,v 1.5 2015/06/29 03:36:10 tetromino Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
@@ -82,8 +82,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-base/gnome-settings-daemon[input_devices_wacom] )
 	i18n? ( >=gnome-base/libgnomekbd-3 )
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.16.2.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.16.2.ebuild
index df945f5d637d..e71a5cf48008 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-3.16.2.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.16.2.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-base/gnome-control-center/gnome-control-center-3.16.2.ebuild,v 1.1 2015/06/09 15:41:36 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/gnome-control-center-3.16.2.ebuild,v 1.2 2015/06/29 03:36:10 tetromino Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
@@ -89,8 +89,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-base/gnome-settings-daemon[input_devices_wacom] )
 	i18n? ( >=gnome-base/libgnomekbd-3 )