Allow system-config-printer dep in old ebuild (bug #553198, thanks to Patrick Lauer).

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

3 files changed, 27 insertions, 11 deletions

diff --git a/gnome-base/gnome-control-center/ChangeLog b/gnome-base/gnome-control-center/ChangeLog
index ef42e7dc24a5..e2c457eb841c 100644
--- a/gnome-base/gnome-control-center/ChangeLog
+++ b/gnome-base/gnome-control-center/ChangeLog
@@ -1,6 +1,11 @@
 # 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.168 2015/06/21 12:05:32 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/ChangeLog,v 1.169 2015/06/25 02:44:53 tetromino Exp $
+
+  25 Jun 2015; Alexandre Rostovtsev <tetromino@gentoo.org>
+  gnome-control-center-3.14.2-r1.ebuild:
+  Allow system-config-printer dep in old ebuild (bug #553198, thanks to Patrick
+  Lauer).
 
   21 Jun 2015; Mikle Kolyada <zlogene@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 87d53ed5db0e..3a1bcb539caf 100644
--- a/gnome-base/gnome-control-center/Manifest
+++ b/gnome-base/gnome-control-center/Manifest
@@ -10,17 +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 5131 SHA256 1f57155c7dae5f0db839f32aba875e4e23f89923273ec71d64bd448a6c320e81 SHA512 4d4013fdcee974cb36445cd980397fff4453734d79b80c21fa8a27dc5c977d0c90d762b4d488c334e764462ca2d525043c62e0c39433182f69f2ee80572785f8 WHIRLPOOL 1df36a1d6d08b325a6773f88c11dcc6e0dfe111f2dfb3e0c4bfdd9a7c7db0fc801f598340aad1d0b80a342f840e73e4cca264463ec77658cc7a33bcef7adf29c
+EBUILD gnome-control-center-3.14.2-r1.ebuild 5177 SHA256 22d0d929ce4213204b70b119534d64ed172dff192defb5e41f2151e17f240b1f SHA512 59cfd63d958f24258c6a00d8f76b4fb81a8c51da1841bc6bde0f0ec4e98ba000800e644ed494906913a021dfea25be40a774edc35600d1abb48e951a4b1a55de WHIRLPOOL e62db5e96d3e2f88a84e284072201f39c9ddb469303dcc6d713d3b97156da164e432357b627992e118597b20b9d967f36eb399815e5f0a2afde315c3bd7e80ba
 EBUILD gnome-control-center-3.14.5.ebuild 4287 SHA256 64f46e3c5924956e11ee31655af58d06e1426dc1adffa9f1c3f630098766a38e SHA512 6d81ce5b4fe3cc77f54e6b7564541c8a589653e6354ca1a6ea41d556142effcec236f63ddcf383fefc048751d7317021f980b32b5f5325d89687d4dbcdfb5b24 WHIRLPOOL c3e1a68a3cac4fa24e5b254117aaa7dbccb2793ac647b933f43859d0e99f0e690fcfc82466bfec7f3bf4b8f598971beaa50c5b312e41bc3eab11dc80bab0ec23
 EBUILD gnome-control-center-3.16.2.ebuild 4771 SHA256 338945b1f51bc77e7f02ec058a97506feb4368cfaa4503c44adc18eb543f48cf SHA512 bc70b17fa96ed0b38b1bf082065627ff66d037f38dfed15756dcbf518b52a26259054d2e9ac24ce14739c7554d76e6bc7b5d90469925bc67908610775891e418 WHIRLPOOL 609333cdbf559f95d63c94afb5b0fba512b296c35cc5b3b19102efa2b36098457b28506f752130036cd9b263d5bda9696a583904ae8474d0950c9e1a1d0ac86e
-MISC ChangeLog 72549 SHA256 f4d2e8262505950eb9dc47542fed34352c0073bdab89814cd34b72b16ec3da53 SHA512 fa38713c8ba9afa24e44bb03d4976b2b9e67f0ea85e9d938a7fbcd6ae564d9932a8dccb3ede42796ce2c020b99cc39f4a7acba549ecacf49a230671525268d26 WHIRLPOOL 7a6142e223cdc9fdb705b799d5d2b6fae9e7cf5741e9bfa178e5375242f1a0865c76f2c4c9804efc2a37093845f68bfc646a50412c9431d1d9084564b85df8d5
+MISC ChangeLog 72742 SHA256 a4e2142dbac1083c9b59af42743ad5f3e932c26cbc9b5a1bba199d8ab5416b4c SHA512 6a5a02eff5f7bae293c91fca479dfe3563e2de2d7b9a4206cd61eae8aef28c5dd8766def381c628fc8b8fb47508be1a9e590e50e023b6062689d942a06aeadf9 WHIRLPOOL 4c4850937d227104640f25eec5aab6c54668320a6cec81a1b565d810d330dbded88341354deb332472e645192b8ef45bac491153124830cf41f538e755e65f02
 MISC metadata.xml 498 SHA256 fb46c54dc3e3ce2c8297d67292cd0ecadbdadf8c22a50437f8a03fd5b6ec9dc2 SHA512 ae1ff3489b7d037af4d1a550538e0cadfa815f6afcaa76b73afb3fa7d87d888c1ae5b3642416e9eb0cf0c2ba4f70a5ed1f5a9ccbb1d63320fc444ac3c3aed2d3 WHIRLPOOL 94896b01f55c9a411cf85eda67cdebba03f2e32a723094f9f839e04c5096d09b63b4ac0895b7ddb70bc0ba3ef2ea4aeb6eba650e926fbaef155554a768fad970
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iJwEAQEIAAYFAlWGqAoACgkQG9wOWsQutdYVdQP/U28+gOiD781K3N3h+Ef5su/B
-IdC6pEFeu3Zpg27MJl8QKDo1/nKP/eROGRodM4leJq8CkAzhCu4opF3rHefTRHne
-ZXIcOoQ+CAuCuNV/pfGPeoaFGn5bGukqoHJ/JYShNjYOXwMDpiXQkdELC4XIJVLb
-ESmnGqUJrPjEF4Tnb6E=
-=zuVE
+iQJ8BAEBCABmBQJVi2s5XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1RTNCRkUzRDRBNkI2MEEwQkYwQzMyOEEx
+OEU1QjZGMkQ4RDVFQzhEAAoJEBjltvLY1eyNUsEQAIfxeKLaZszXK4q6Eehi34v2
+Lg22PPJESan2rv/jxSRptzTqBZV9jUGlPy2FxD0pJAhzvLD7NA1R7s7BT+ar5qeK
+5lqKB25zWYLPGTpBeyIsbHyjfTt6LubGQhQkaqgmEDhaEQHYta2ON+yn4QIyGxxg
+3yT0NWmMYdsjadm1490hjHm+clEUzr4jGkxuFRMlizKo2cuzPpIwULJnvR8IH4wx
+Up8HH+MQirZRA7NPq4Ibv1X0T5jqSPCAFtfRgD+WcC3DZhrkGLI89tSY2moBVCk1
+7YGxiWxaXN27lRjhYShiPnapyEWaxuqHFUp5sm/O4U4GbKtf2WxSyHcwhRfVIhS+
+tQxHQdzCzgoTIXe5DcQqxQ72gIUEGwOKLVzBsid/+oxNL1x2eZlUVAM1baEgobb+
+lVkuR4OSR9/HpR21j6GOjdaHGctDfy3bEHXFZ6urD6Y0MiLezZkYcrGBNecGGa4E
+ag5sRE6ekW+nKPp7xLU0muzjeMuFNj5ppzZvzzek4gK3eZpuID42eMaCri6r7z1E
+cra33G5vnUuBhwtykrfk97qV3HEIP5Af2Tv2zqvbBhz6s33QUkGZDb/yZV3is7RN
+NII/ZAGxqvLoiFMUdoVx85arkYh8gig2IWc7IKTw5Cp2fUJO40DmHsSw93d+/pHK
+6zJkHt0eQBIIdsdj4yLL
+=5Lea
 -----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 42e200214177..3cc62b8712d9 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.3 2015/03/15 13:22:17 pacho Exp $
+# $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 $
 
 EAPI="5"
 GCONF_DEBUG="yes"
@@ -88,7 +88,8 @@ 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-gnome-1.3.5
+			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 )