Restore fix for bug #525202 that was accidentally lost in the version bump.

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x06B1F38DCA45A1EC!

3 files changed, 43 insertions, 21 deletions

diff --git a/kde-base/print-manager/ChangeLog b/kde-base/print-manager/ChangeLog
index f46f6f67e965..0da1a9e2610e 100644
--- a/kde-base/print-manager/ChangeLog
+++ b/kde-base/print-manager/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/print-manager
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/print-manager/ChangeLog,v 1.89 2014/11/16 12:21:30 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/print-manager/ChangeLog,v 1.90 2014/11/17 08:37:32 kensington Exp $
+
+  17 Nov 2014; Michael Palimaka <kensington@gentoo.org>
+  print-manager-4.14.3.ebuild:
+  Restore fix for bug #525202 that was accidentally lost in the version bump.
 
 *print-manager-4.14.3 (16 Nov 2014)
 
diff --git a/kde-base/print-manager/Manifest b/kde-base/print-manager/Manifest
index ac9a335abc68..88135e3c24a7 100644
--- a/kde-base/print-manager/Manifest
+++ b/kde-base/print-manager/Manifest
@@ -7,23 +7,24 @@ DIST print-manager-4.14.2.tar.xz 92516 SHA256 84196e4725f145298c62956189149f4276
 DIST print-manager-4.14.3.tar.xz 92484 SHA256 081736f273c7f13806828497caddf83d36d5e083d56b277dc363360614fbc135 SHA512 2cddb8b254125fc095fe0ea87f37a07c99edab8fd2dd115c4cc91a766e2e69b5c2e2061c7fa6eac64aa7d5bb3ba9c23db93ee78dcc898050496c553f41ff02f4 WHIRLPOOL 5cc136bcda948541089d2487e69b5bf8b8b874110d3f653d8844f586566296e5594b91ed2d06670d63115670c65e5f38ce79c6df1b4205438b1f7f260c268622
 EBUILD print-manager-4.12.5.ebuild 576 SHA256 13990254597f7a280a18e913753bc997e74c98eb20b80e21302f7ad8d2f8f43a SHA512 349853c249b5f34cca333193879ae0fac94c3d153593f8fb5c001569609db9031f94a7f44b84ff03b2a51f052f5635505f030a5bd9900ab8d290e7197868727c WHIRLPOOL 89de76d086d99b5fe85ae146d14d298a7cc58290e6247db14d494bf3009fb3ca5d8efe97ff718bce327478bb5dce255e6e363d7bbaffff324e370df1c71d551d
 EBUILD print-manager-4.14.2.ebuild 1198 SHA256 b0da136c37af9b2728d03e33ec6ad5da9c7915e90fe9b0228124d546cb451f34 SHA512 03f81366aa21666cc1408b1c78d40bdd0800c3aedc2409515d6e4353b149cfe32bf405e91b2ba269994f5b665b13d94950ad2d449903524c0739ddab9f4b63a2 WHIRLPOOL c7196a417967bf06e887a6db85521aa450c8ef30c31506bb9ab8b7323c82fbc2de337631b57e5753a088705883f8a50efc5b46689e882608f666b131d8ba6a73
-EBUILD print-manager-4.14.3.ebuild 584 SHA256 20b32190c778caf4e3ee91e4d6a5c14c3cc501c1db79eb545d78a450085f61f9 SHA512 b2c6ff568273518c7acdb210c54ae4c7e6d58f7b7593fb2a92d8c8915218eeaf590cd6f7214330fcaeede0cf211281842397c60344cd80765e126527d401fd1b WHIRLPOOL 6c6ef855790dec4dfe0258c5e8a78aef92ea1db7f2d6c31eaf0966050c38398c7963a61c813bedfc778126788955ced4891208cb995c20039abaa762cdf74422
-MISC ChangeLog 11192 SHA256 20558b629588a2b3387fc79862283d375b98c91fe82d5776a015bdf59d2d3c78 SHA512 aea64004884496db8d73ae88e484e648c8a7f4f551eee0f3ac83b4c730b4ab82cdb169a540325e0c348140ff7f089bf4c1d926759c4734e96bc977fd9c642fed WHIRLPOOL 7322cf041f2e47a7945c2dc16866dec35c2af6150531659247f8ded6f158b18aebea84b9b332b208c5700bbd7ee79ce756250dbd972c344fdfe1c2531db3ed21
+EBUILD print-manager-4.14.3.ebuild 1145 SHA256 e7a343af6e53a5985d1f767b01417406cc8d79ae454c49ee7504b533760b9065 SHA512 f9b8a835ea29af229929fcf0c635c220a68254687382255a44e3e7ce16f2156e16a870ecafc1ca590b9af6952e352007085d36b857e89e60f43fa8b94be5858b WHIRLPOOL d113b1da83314f00d1f68393cd0005eca8479fdb1031b98f7d8a9b9dcdad5b2dd21e49676239ec1ef1cfd56b96716119c1b6a04c966e6bb6f31c893556d638f9
+MISC ChangeLog 11362 SHA256 9a7c46fcbb0eb58689c72aafcecfba7f086834b997bb17aa777c6b866720f956 SHA512 5b0ff01d0671a23f1d645ea7dc20a4f791b22517b1807fdfb43b8a0c7a17bb59b592b0a0728ea9797dd758e28cae656f0af2ebfa118a9da8643e05552544f1a7 WHIRLPOOL 7f86e078d2f618e6966500b717c74c897571c4f7f40fdd962b4e03c8db059dd1d209ce6a2d2da75385792cbe690358ad8cde05801f25faf80acc1d025b441ee2
 MISC metadata.xml 156 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a SHA512 0dcd7cfb246c4518ed1653cb06f5d2c7220ea90160a4b1a1da43edf5124b76d7104fe35a545178b6b3df19f5f3a3eb3f31ac1b4d169e3ca90d78be3e20e58b05 WHIRLPOOL df162e3d521df7decdd84d980e4bc71531bb8e05486c07102c554b529c10a1fb3374dda79d56b13bc037a2d230b4b8ff25702c7a1b86d703a24e8bfe7fe57642
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJUaJdlAAoJEOf+E+/4L5LmNgMP/iSMD0YrSoKkL/9CzZb8AkGx
-+BdK46D6y0lXISTyTo+bW1PxpPIoYcIPsb406qLwvC7maTEuRcRw7o3VNIP3EyhP
-6+cyj+EqvQcp4+fKkai+HuI+/Lj1em+nN2t96S8c9T1dHXIewTM2bSm3Rg9jJzUV
-gXk/0HD0WEbmn2P0GGg7yUGR6Hxf4h5yTo83517t+7rTNpUJsKhJj9YN6/PzorKe
-anKdfq68wvrjKkJadtT/r1BgJE3WdQJP65hruWrO2Uo72PmMdY/R9z1QFrt/E0Pg
-W+s5vgST19d8OVLY+ugp7fue97wIBgkCkoKQUwd9czFykROCF1qjsoJ02WjS4OmK
-5W9K6bdB6VsZ4yZoXfKVZTeGGKBASWz77fO0sMouDjU2n+GNW0FFEIdB3+djF2Vu
-PPC4s+x/R8jHDvSV4q6C9doJgww/yvL1Rl79zc36wPhLSuAv2x+SlZuXGGNebg/S
-diMQBPsbg7am63FoX86oYlCqepV9hH1SSmqfAgLxSN9hQhELC4S6obD6P1NvBN7J
-2oBX69Jo1jqn6X/q+lANwOwOFW7C7M8tAhmhcw1UkD80SG2KshOorMzVBLUoeawE
-GFeqWEgFFIGKn5Q3A6F9fahjpGpMeq2ySXxZiVeeoxZU6WOzYP2hrY/rm8GKk9tK
-IUoMs64xEE2h4kpNXQ17
-=UjCg
+iQJiBAEBCABMBQJUabPaRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
+MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
+7KS5D/9tz0+i7KCPfUXBeVnjogFSh7LFsbfly3fZh1wNEoZUYw1qQt0bpnKXXeUs
+LVpNI5TCYPew2WqFJtWDpb3EzmtGe/QvXVlDFwACcbluRh6XvpWXjsDXAT4zrCNB
+ByQccR+ug8On+cKzd29BqeEVvTTw6R7aGkQJ6B0aXoyFksPtkh10hjD3JSBH1RrX
+gDHIpoDJoSj/VZyJWtYw16P11l1Dn9De87OzolmDqxTh+cW0KXykzedH5elMRgPk
+uAqw7Ybz0xGX2H230x9dlcjrZS9pf2AYsnwQ0DPlLub+6Afah8GQdQI4yKeIP2lx
+pLAmHHkg3bZhqVvmFjTr6qhuJ0y7ukuJJUnjEjU0WFTlYmzsxpRj8jyrg1Eanjma
+UqTKVqS7LOFbdBbxKDcpka+X2Wv1OL/tK1oQR7it2KbiiyJlBDdA8J+cO2Ni5oGq
+ewroMniocSpg3f1qfstlY67aUWrGLbnpkV0WL04pmnQ7N26vYXh5zzRgop+E2OB3
+zGdKNrkXvC0xKv9YnZ+fSO65mBy1EhEMdBELj6NBSuhtFiRp30JV0XLVE6ISuWnc
+Aoe/uIp8xO1tLCDtykVMWHCqUv35eIjaMRKxSS3x4Ylhnc5xk3ksbUcW2dxnDQBG
+TxOfTCUhZeMAWq39TcI4Z5/TKVkE+QHSPGtn0y5Xqp5kh3rxwA==
+=+D0/
 -----END PGP SIGNATURE-----
diff --git a/kde-base/print-manager/print-manager-4.14.3.ebuild b/kde-base/print-manager/print-manager-4.14.3.ebuild
index 335978307c39..4034e0cdb8ea 100644
--- a/kde-base/print-manager/print-manager-4.14.3.ebuild
+++ b/kde-base/print-manager/print-manager-4.14.3.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/print-manager/print-manager-4.14.3.ebuild,v 1.1 2014/11/16 12:21:30 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/print-manager/print-manager-4.14.3.ebuild,v 1.2 2014/11/17 08:37:32 kensington Exp $
 
 EAPI=5
 
 inherit kde4-base
 
 DESCRIPTION="Manage print jobs and printers in KDE"
-KEYWORDS=" ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug +gtk"
 
 DEPEND="
 	>=net-print/cups-1.5.0[dbus]
@@ -17,5 +17,22 @@ RDEPEND="${DEPEND}
 	!kde-base/printer-applet:4
 	!kde-base/system-config-printer-kde:4
 	!kde-misc/print-manager
-	app-admin/system-config-printer-gnome
+	gtk? ( app-admin/system-config-printer-gnome )
 "
+
+pkg_postinst(){
+	if ! use gtk ; then
+		ewarn
+		ewarn "By switching off \"gtk\" USE flag, you have chosen to do without"
+		ewarn "an important, though optional, runtime dependency:"
+		ewarn
+		ewarn "app-admin/system-config-printer-gnome"
+		ewarn
+		ewarn "${PN} will work nevertheless, but is going to be less comfortable"
+		ewarn "and will show the following error status during runtime:"
+		ewarn
+		ewarn "\"Failed to group devices: 'The name org.fedoraproject.Config.Printing"
+		ewarn "was not provided by any .service files'\""
+		ewarn
+	fi
+}