Add version that builds with any cups including 1.6, make others depend on <cups-1.6

Package-Manager: portage-2.2.0_alpha118/cvs/Linux x86_64

8 files changed, 434 insertions, 19 deletions

diff --git a/app-admin/system-config-printer-common/ChangeLog b/app-admin/system-config-printer-common/ChangeLog
index d483145ef89e..9245da2c0b4a 100644
--- a/app-admin/system-config-printer-common/ChangeLog
+++ b/app-admin/system-config-printer-common/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for app-admin/system-config-printer-common
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-common/ChangeLog,v 1.75 2012/07/15 16:19:28 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-common/ChangeLog,v 1.76 2012/07/18 21:11:29 dilfridge Exp $
+
+*system-config-printer-common-1.3.9-r4 (18 Jul 2012)
+
+  18 Jul 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  system-config-printer-common-1.3.6.ebuild,
+  system-config-printer-common-1.3.7.ebuild,
+  system-config-printer-common-1.3.9-r2.ebuild,
+  system-config-printer-common-1.3.9-r3.ebuild,
+  +system-config-printer-common-1.3.9-r4.ebuild,
+  +files/system-config-printer-common-1.3.9-cups16.patch:
+  Add version that builds with any cups including 1.6, make others depend on
+  <cups-1.6
 
   15 Jul 2012; Raúl Porcel <armin76@gentoo.org>
   system-config-printer-common-1.3.9-r2.ebuild:
diff --git a/app-admin/system-config-printer-common/Manifest b/app-admin/system-config-printer-common/Manifest
index 8bbf47eabe7f..bd45b2ebd19f 100644
--- a/app-admin/system-config-printer-common/Manifest
+++ b/app-admin/system-config-printer-common/Manifest
@@ -1,23 +1,35 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX system-config-printer-common-1.3.5-split.patch 4624 SHA256 fc865303bf8c40b8a2964fed7cad48c6e943312be1be631951cca5b3b81a490d SHA512 b639fea7597e6d34a86bc910f24629192d8394f04dce13598fb88521915326fcea51da1e7fc3159325e0f339d1fed060f12427f9ab8941e28983dda11afaf1ae WHIRLPOOL ca6ecbce0480e7292655eacbfbbcf2c61137d65b05918b055b5fd86aec735300d5f81d244e9132983ecfc26b3f6656a815047155842816050d76359869027538
+AUX system-config-printer-common-1.3.9-cups16.patch 10378 SHA256 162f213efaf82af5cdbab593f34b91c6f4ea0b988f77583ba66d39fe0ae24116 SHA512 2ed583ac7646261d703729f5e61bb6a456f6d0f8a4349098beae1e3266d1890a957e6877b50885a61c04da32a4d4cb7dc79b4cb24cbf280f6081fc2881b6be5b WHIRLPOOL 71d337d2201e09ddb9974fcabc23200c3f0396f04dbdd8693aba3ad9a4dce626d9196d129ae302191bc4f886d82d5338d9a0b1bd26bf1630db0fd835572a960f
 AUX system-config-printer-common-1.3.9-cups_filters_path.patch 962 SHA256 ca11a0ab5b9ce124a0433d79b0c4ac9ce995f73ce12c39ca1e886b76e41b29df SHA512 6f9780fb87cb506788776dcc630a5bf30d071da9e2384c9fe8c7bb5bfa5bf81c67259da90666dde8b41b7230b480c76f6ccaddb4e3275b201cdf6f1e9c850636 WHIRLPOOL 7307c429ae0c1aae8cd6d6369765b67d7215c8eb0a64352ffad433de69ec0b631f70a61cf5647578dbf12105f37a00bdb5f3b87737f0ded8f51a134e7aadaf37
 AUX system-config-printer-common-1.3.9-split.patch 4636 SHA256 bcd20fcd357ce1730e172b753b67a34679342b82881395bc72afc2feded20558 SHA512 34df931edf965afcc93ba7951c3162b1f04d00a5263844b798771baa6860614c112fc18236ed1301a3cdd4732f2a2870b4703cbed75a8696e426fabc2e3fb2a7 WHIRLPOOL bff116ddee7d5b79778a27b83eb0343769513fa06f4dbe22f409ccb0cf56d3c15ab39e681d52823dffa812442e71ed75ffff1af5afec465dc757dbf068ee8241
 AUX system-config-printer-common-1.3.9-udev185.patch 1420 SHA256 ea2f55276a91b2d186d7c01439af65febf0f6bdd7503763196a540aa483df221 SHA512 b324235922f5a27e1d1c91d0b913622e3c9861e66483f04bae4211d5ae44d09b18526b8c2d1c089c8669e0d4faa9478b2dc72e014f110943f81882cdfdc373f0 WHIRLPOOL a9ea7f28500aa90993c3bf0fcddaf330295cc737903c19d18801c904abf217721519b714d6df5cbd3420dbd726cefb4c6824d882b172f14ea7f131cfa5ebdbf5
 DIST system-config-printer-1.3.6.tar.xz 988332 SHA256 412f38c45d13763f69872b737f9b7885f0633704a4ef71eaae7b8c30e6dd7013 SHA512 22556b44ac56ef4100753c27d3c5e26ff772f305d54bb13753b7c7a965e31d155e8893a0c4688119fd575a17962f22154bb2e518830121498f98dfc1f95d4978 WHIRLPOOL 94b3bdb2ecf08091c2a0d7953136cff86d305c2ce08d990d61841d753f6a2b1d2308384a020789189acf1506f66e2c9f19285f0d4e69aa6ad85cd96950c27ac4
 DIST system-config-printer-1.3.7.tar.xz 990392 SHA256 bd2d16b1b00e94b05178697c566b4434288557df8faf56a65a71fc4994cd5e4a SHA512 396a1f7dd346c10bda7cfe509a66e69232b55913275fb6026c1c3120a5ce0f37360776ca54c614c14fec83fa4d7af02a1467bc3623ee059b109d09012095ae5d WHIRLPOOL ffeae0a0d61ab11369f959c3d1fd0e0658b90de12c4dbd773c6f7825cc55e1f4834f5cb75af6629baa416a02cf9d2bc55a14e7dc98958decf8bd7f117c91ebd6
 DIST system-config-printer-1.3.9.tar.xz 992152 SHA256 86a655d6599484cafe57f11694d9e2d9767ece03328a8fc8254aa92c8162dfe0 SHA512 98ffcbd36ee7c70fc349a945a75b5d2ed70cc1d08b2fe4eb2dc66d0ca887675956c6dc31728a2ba0e15b5742159dd6a9b11af204090a84d5b54f3237bcae62f1 WHIRLPOOL bd81593a7bc7082157ba9e9635aa3df9d0fe6c8fcd5886933781df3d93de9c889e51df5645d3bea6bd9b8448f57d65ef37ce88445cb695b734155772b794bb23
-EBUILD system-config-printer-common-1.3.6.ebuild 2042 SHA256 0e5f543aa37a51f5b9f3dc1e3f845a4292cba1253751fe7d62a702a33968544f SHA512 69c3996fe7c640442fa1d553b574c929f6bfdfc18d8b41900066cc486d1025eeff7665ae3202c29f79daf7eddf47c7a6f3955b091be93f78d04cef5c4f275274 WHIRLPOOL fd049828a1425ac619d6ee0fee080ce8773dcb0e77e792347f970914cd75a95af59c509d712b500df1d4b7c304d32a63691bd3ebe47f8dd0eb82a2bdef62bc0f
-EBUILD system-config-printer-common-1.3.7.ebuild 2051 SHA256 61bf233fc1e67e46c6c94723ffa328a2c87b1ccf9afcc9c9f94dac9371c7e842 SHA512 9d12453611d3dd9bc18fabd9dffa39533ccfd5ef46f013252235d9a68e6dd9441c6f069b1ab63015dd65a0321413496a78208f5ecacd4ee2103b69f88003486e WHIRLPOOL 71bdda338dda73efc1f4cab3ca87d5e964b1e704d2e538352656d67bcd9b0803fa359a5216fe1b7cd5d5fc758ec9de250e069bf54fbe1ab68b2b577ebe129b33
-EBUILD system-config-printer-common-1.3.9-r2.ebuild 2092 SHA256 e424bada99bafc1fd389ccc0632b99781119dc3cc519f0a23386b1c8ff7f2f57 SHA512 cecab7ee79edd85bdb07884ef2304fcb7e841ce30c7c072ecb671210bd6e3290c97a53eed045337ed7d34862d858440701e85fec66b0cb0ffd105dc2224b8195 WHIRLPOOL 3ebfc856125609810afbf5e25fc447a3b2f911879108ee5356f730127ba8f2420b63bf8c995bcd1eaaeed34bf1f1e32ff3807ffacf2de9be86928155ecfb96de
-EBUILD system-config-printer-common-1.3.9-r3.ebuild 2014 SHA256 980613d011d378087a8ab1628e7489f1354f43d39623cdad82c7b4829fe4f2ff SHA512 87cb47c3ba54c858916b88d9a64533f14568868247bb8b95597fe35bcc7bd9ff383ece5a63776f996efcf00dde48276f5566e786584b8f5944f3a1e74a5f434a WHIRLPOOL 05a430e6d6a56a9819e9698ad436f773575c2c123a5bf55ed8ece5f22836738606cbec056efe0d97f8e8bd53e12b289376445d0c36433dd3fb59fada405eb424
-MISC ChangeLog 15127 SHA256 7a3b35b6cd97cfb5010e79cb21887d50b17bb6ae0943ab186f5a02263f188ced SHA512 bb9beeda772f381815202223618bbeaf947f6ade65c747fc8240ec3542a6417148afbd50fc5865319baa99fda05cb5c1d414e35ac1ec2528f2fee9445574a643 WHIRLPOOL 5e010a1af17124d196b62d87e7ee6350382cb451394402e29a338dd79c0f67423d776ff4cb90f19dc402e1c1beac70152ad0e4896b46f966c055891fafbd141b
+EBUILD system-config-printer-common-1.3.6.ebuild 2041 SHA256 23a04ab74de5347c8841908278d467b7990ed0ef40e637f96040731005513337 SHA512 10c4a7459057e2bf3cefba718a55bf75211f6e7cfcd1acaa12ccbd9491483262f0f332d3759f15c90d4d9e9fb1d24388b2ffbeb8e77f6067ca5a5f0cf3fbbc8f WHIRLPOOL 3be3e3a51650537043ad3f058b1c587b34432bd387c0338e97ab42112082d8d4857742239bfe7288512701deb5b5fa74bdc901155cf4a7a9b543f4d4fca85f8b
+EBUILD system-config-printer-common-1.3.7.ebuild 2050 SHA256 da435a87995d5236ce9392067df8a1f48aa287bb06b765f30f3b2820adc0baaa SHA512 c75859ea49fa95f2cfd63daa3f477bdd305649245f7ef528f002d76068cef55de59cfc80f86d0229af579ed2aef10fcccf9f3b8cef1ecb312387ed75b2ac349d WHIRLPOOL cc1c6cafd55a54ad3e7763c5264442fcd8f8bcdafea36a71791c718a8b16238cbbdbfac30d87b1b575089d7992916077ccdee06f567ee1ab3558e26f131ce589
+EBUILD system-config-printer-common-1.3.9-r2.ebuild 2093 SHA256 c6f31ffbea94b869d34c70790fcf40a3e94086595a8de1ef03560d5301383c10 SHA512 6ea49ab7d1c48476ba24f3f6b60a390a7eb47cf673fb2c175d7e54d17f513874c1fed0d987c8244c0d0cab523c1a2dfef6ab32628d45773f7eff30abab14c865 WHIRLPOOL 9ecaf7b4fe3c8e8d04c888122710fe0d76ba2988307ad3527c321802440595edbfeb82423a0bb31dc0dfa64f09de80797cf43c3e0fe8211a1ccccd4b5b686c5f
+EBUILD system-config-printer-common-1.3.9-r3.ebuild 2013 SHA256 96207cca22e1ef4d5009604d5504845344a705ed0d252e5b8af5e9feefb8f7e5 SHA512 7f56a652a607725c857746f77720edad4ed7bd2be433bbf4e14e35b7b57ac6b41d89e9b892b3d341cac1ab4bae7f116fd79b564875b915508cdba481ef73eb0d WHIRLPOOL 38a50b41ed2e33dc0487fb61c5ee4f0e62838dcc0c92b191929b1673f10a5e783f45fbf1c203372590d0bc14cf1ca938ca99e74829cd0cdfcde541d42a8d2aa8
+EBUILD system-config-printer-common-1.3.9-r4.ebuild 2049 SHA256 21454e948d966e294e5c63cd5414ed0361bdfc7994fc7b04e8b1876b7765d3e5 SHA512 1a69bb4493858b553afa90ed3fb97a90adb5bfacc81b56789a30384cd6446350d4c4d5a5dac4993035a92b1b66a7488c3fc759f4c47d12e3d3869603f2648ec1 WHIRLPOOL 499f6be07b41ad6ffede5bd1f86d621badfb2fc907ff5a14380c96d6b0ccbc4d90b9a9515dc838c3d1a7a48a4e447b1ee52229a396886feadadd54ec709a8a07
+MISC ChangeLog 15623 SHA256 fe4d4b56dea920e48461092979432517d6318c645726a5c39c3eaaf80365e9fa SHA512 d8399cf84b3a99126794a25caaa86918fec694cb42c45c5193e56a03b896d48ff387bca52481c8abc03db06e1e4a4f90b94e01d23f8dc232d4f25d945a8601f3 WHIRLPOOL bb22b7ced37dd2e198654a6fc415ee0efdb7fe00f0cdc0cfa9752967693e0f37275ff984aa166d067c4f57bd6e32446e17bc3ca7b7589de6452dcca731ccdbb5
 MISC metadata.xml 269 SHA256 4093e60c94c1276d3fce2608e758ed73b067ae7af175d26df104f4df0fbe3e8a SHA512 2e9634524d34d3ca8b09f3212921325a7460449aff6d5307a7ee547a9d386207d772198d762ef0338325864449474a16c92653547cbdceb214ec5c9a0d9d417d WHIRLPOOL 4a6977f8e8520c7d8d5ce51b169c13d3f7fbf7bdaaaf43e03f827aa7e89017a7119ffc3b944ca5fb8ee0cff35f81a7e3d3c92682a58bc53cc361516b19c717e4
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAlAC7ZYACgkQuQc30/atMkAZiACfUeYEmQtKO0KmgoNFIu9dNZuV
-a28Ani2deNXk1LuhATQDt/hATJc6OZSQ
-=DHJ3
+iQIcBAEBCAAGBQJQBybbAAoJENwGBM22xffeXbEQAJIYpElrPFoWJrkPD2ETBQPi
+22jQew9zHG/xxxK+nlplb6Ut3shUZpIwCse7Vfx118JxG9lEQ9pnV+3Jv62APDTk
+NfJ/BrOhR92SuLdg8htArb16+USuDb/nJkdPCtoun6sAmdGfKRByTznwPwsfWUHY
+EcKLMdflRQAKiiD2nPcImoi5NpjI+R6grIXLlr085ZswXJWpShXkEPSSwqIJn1bx
+T5jSou3ivfphtXVQieunOlBs9zi0K0FZp+JKONwnEcWLmDZVT8FFfzHtKQlw6HSO
+LA2IhuJy4vzCJjPZX1vVlQJcs8zwHtVYwq00ER77lnUOVWTGXl/Rn2dv6j9RmooR
+H3yLpGdq92DtrTxhbC2e5q6KhOs4rLOd4TLTynE4X1T/o9BsWCc3R9Ou24GjBnk9
++q846ycoO7eMsKztricrMAyt7RMdlTCAd+KhA4N/DZ3y4r9LcZB1cD2bpPbkt6Ij
+WTAGBVp8FubuxWQ48Z9O2OQ9AK1JcNdlqXcicWGotJWaZL7wmgiP6i17jDT85hKx
+udAzCbQLvKG2cdAZjbIZqMBfYKMVCMSMR9mz1+JmVVO8p+g96RH3oTh4jwcKtPHp
+TjGgjGy2RQvjNsffcLya40yqRbE7KFkX/2FfJDAWrsAs7K36xPp/z7qkHaTYq+75
+cnmLwHTofRN1EoeLrzBD
+=Fs/L
 -----END PGP SIGNATURE-----
diff --git a/app-admin/system-config-printer-common/files/system-config-printer-common-1.3.9-cups16.patch b/app-admin/system-config-printer-common/files/system-config-printer-common-1.3.9-cups16.patch
new file mode 100644
index 000000000000..a8fd5f18c16f
--- /dev/null
+++ b/app-admin/system-config-printer-common/files/system-config-printer-common-1.3.9-cups16.patch
@@ -0,0 +1,297 @@
+From a5d0ea6141d6317a5cafe5ee0398b4eb23041076 Mon Sep 17 00:00:00 2001
+From: Jiri Popelka <jpopelka@redhat.com>
+Date: Wed, 11 Jul 2012 14:04:47 +0200
+Subject: [PATCH] Use IPP API accessors. (trac #226)
+
+CUPS 1.6 makes various structures private and
+introduces these ippGet and ippSet functions
+for all of the fields in these structures.
+http://www.cups.org/str.php?L3928
+
+We define (same signatures) our own accessors when CUPS < 1.6.
+---
+ udev/udev-configure-printer.c |  157 ++++++++++++++++++++++++++++++-----------
+ 1 file changed, 116 insertions(+), 41 deletions(-)
+
+diff --git a/udev/udev-configure-printer.c b/udev/udev-configure-printer.c
+index 8d349e4..90b1cc5 100644
+--- a/udev/udev-configure-printer.c
++++ b/udev/udev-configure-printer.c
+@@ -52,6 +52,81 @@
+ #define MATCH_ONLY_DISABLED 1
+ #define USB_URI_MAP "/var/run/udev-configure-printer/usb-uris"
+ 
++#if (CUPS_VERSION_MAJOR > 1) || (CUPS_VERSION_MINOR > 5)
++#define HAVE_CUPS_1_6 1
++#endif
++
++/*
++ * CUPS 1.6 makes various structures private and
++ * introduces these ippGet and ippSet functions
++ * for all of the fields in these structures.
++ * http://www.cups.org/str.php?L3928
++ * We define (same signatures) our own accessors when CUPS < 1.6.
++ */
++#ifndef HAVE_CUPS_1_6
++const char *
++ippGetName(ipp_attribute_t *attr)
++{
++  return (attr->name);
++}
++
++ipp_op_t
++ippGetOperation(ipp_t *ipp)
++{
++  return (ipp->request.op.operation_id);
++}
++
++ipp_status_t
++ippGetStatusCode(ipp_t *ipp)
++{
++  return (ipp->request.status.status_code);
++}
++
++ipp_tag_t
++ippGetGroupTag(ipp_attribute_t *attr)
++{
++  return (attr->group_tag);
++}
++
++ipp_tag_t
++ippGetValueTag(ipp_attribute_t *attr)
++{
++  return (attr->value_tag);
++}
++
++int
++ippGetInteger(ipp_attribute_t *attr,
++              int             element)
++{
++  return (attr->values[element].integer);
++}
++
++const char *
++ippGetString(ipp_attribute_t *attr,
++             int             element,
++             const char      **language)
++{
++  return (attr->values[element].string.text);
++}
++
++ipp_attribute_t	*
++ippFirstAttribute(ipp_t *ipp)
++{
++  if (!ipp)
++    return (NULL);
++  return (ipp->current = ipp->attrs);
++}
++
++ipp_attribute_t *
++ippNextAttribute(ipp_t *ipp)
++{
++  if (!ipp || !ipp->current)
++    return (NULL);
++  return (ipp->current = ipp->current->next);
++}
++
++#endif
++
+ struct device_uris
+ {
+   size_t n_uris;
+@@ -475,7 +550,7 @@ device_id_from_devpath (const char *devpath,
+     }
+ 
+   /* For devices discovered via the usblp kernel module we read out the number
+-   * of the /dev/usb/lp* device file, as there can be queues set up with 
++   * of the /dev/usb/lp* device file, as there can be queues set up with
+    * non-standard CUPS backends based on the /dev/usb/lp* device file and
+    * we want to avoid that an additional queue with a standard CUPS backend
+    * gets set up.
+@@ -767,15 +842,15 @@ cupsDoRequestOrDie (http_t *http,
+   if (answer == NULL)
+     {
+       syslog (LOG_ERR, "failed to send IPP request %d",
+-	      request->request.op.operation_id);
++	      ippGetOperation (request));
+       exit (1);
+     }
+ 
+-  if (answer->request.status.status_code > IPP_OK_CONFLICT)
++  if (ippGetStatusCode (answer) > IPP_OK_CONFLICT)
+     {
+       syslog (LOG_ERR, "IPP request %d failed (%d)",
+-	      request->request.op.operation_id,
+-	      answer->request.status.status_code);
++	      ippGetOperation (request),
++	      ippGetStatusCode (answer));
+       exit (1);
+     }
+ 
+@@ -843,26 +918,26 @@ find_matching_device_uris (struct device_id *id,
+   answer = cupsDoRequestOrDie (cups, request, "/");
+   httpClose (cups);
+ 
+-  for (attr = answer->attrs; attr; attr = attr->next)
++  for (attr = ippFirstAttribute (answer); attr; attr = ippNextAttribute (answer))
+     {
+       const char *device_uri = NULL;
+       struct device_id this_id;
+       this_id.full_device_id = this_id.mfg = this_id.mdl = this_id.sern = NULL;
+ 
+-      while (attr && attr->group_tag != IPP_TAG_PRINTER)
+-	attr = attr->next;
++      while (attr && ippGetGroupTag (attr) != IPP_TAG_PRINTER)
++	attr = ippNextAttribute (answer);
+ 
+       if (!attr)
+ 	break;
+ 
+-      for (; attr && attr->group_tag == IPP_TAG_PRINTER; attr = attr->next)
++      for (; attr && ippGetGroupTag (attr) == IPP_TAG_PRINTER; attr = ippNextAttribute (answer))
+ 	{
+-	  if (attr->value_tag == IPP_TAG_URI &&
+-	      !strcmp (attr->name, "device-uri"))
+-	    device_uri = attr->values[0].string.text;
+-	  else if (attr->value_tag == IPP_TAG_TEXT &&
+-		   !strcmp (attr->name, "device-id"))
+-	    parse_device_id (attr->values[0].string.text, &this_id);
++	  if (ippGetValueTag (attr) == IPP_TAG_URI &&
++	      !strcmp (ippGetName (attr), "device-uri"))
++	    device_uri = ippGetString (attr, 0, NULL);
++	  else if (ippGetValueTag (attr) == IPP_TAG_TEXT &&
++		   !strcmp (ippGetName (attr), "device-id"))
++	    parse_device_id (ippGetString (attr, 0, NULL), &this_id);
+ 	}
+ 
+       /* Only use device schemes in our preference order for matching
+@@ -1173,9 +1248,9 @@ for_each_matching_queue (struct device_uris *device_uris,
+       exit (1);
+     }
+ 
+-  if (answer->request.status.status_code > IPP_OK_CONFLICT)
++  if (ippGetStatusCode (answer) > IPP_OK_CONFLICT)
+     {
+-      if (answer->request.status.status_code == IPP_NOT_FOUND)
++      if (ippGetStatusCode (answer) == IPP_NOT_FOUND)
+ 	{
+ 	  /* No printer queues configured. */
+ 	  ippDelete (answer);
+@@ -1183,7 +1258,7 @@ for_each_matching_queue (struct device_uris *device_uris,
+ 	}
+ 
+       syslog (LOG_ERR, "CUPS-Get-Printers request failed (%d)",
+-	      answer->request.status.status_code);
++	      ippGetStatusCode (answer));
+       exit (1);
+     }
+ 
+@@ -1203,7 +1278,7 @@ for_each_matching_queue (struct device_uris *device_uris,
+ 	      usblpdevstr1, usblpdevstr2);
+     }
+ 
+-  for (attr = answer->attrs; attr; attr = attr->next)
++  for (attr = ippFirstAttribute (answer); attr; attr = ippNextAttribute (answer))
+     {
+       const char *this_printer_uri = NULL;
+       const char *this_device_uri = NULL;
+@@ -1213,27 +1288,27 @@ for_each_matching_queue (struct device_uris *device_uris,
+       char *this_device_uri_n, *device_uri_n;
+       const char *ps1, *ps2, *pi1, *pi2;
+ 
+-      while (attr && attr->group_tag != IPP_TAG_PRINTER)
+-	attr = attr->next;
++      while (attr && ippGetGroupTag (attr) != IPP_TAG_PRINTER)
++	attr = ippNextAttribute (answer);
+ 
+       if (!attr)
+ 	break;
+ 
+-      for (; attr && attr->group_tag == IPP_TAG_PRINTER; attr = attr->next)
++      for (; attr && ippGetGroupTag (attr) == IPP_TAG_PRINTER; attr = ippNextAttribute (answer))
+ 	{
+-	  if (attr->value_tag == IPP_TAG_URI)
++	  if (ippGetValueTag (attr) == IPP_TAG_URI)
+ 	    {
+-	      if (!strcmp (attr->name, "device-uri"))
+-		this_device_uri = attr->values[0].string.text;
+-	      else if (!strcmp (attr->name, "printer-uri-supported"))
+-		this_printer_uri = attr->values[0].string.text;
++	      if (!strcmp (ippGetName (attr), "device-uri"))
++		this_device_uri = ippGetString (attr, 0, NULL);
++	      else if (!strcmp (ippGetName (attr), "printer-uri-supported"))
++		this_printer_uri = ippGetString (attr, 0, NULL);
+ 	    }
+-	  else if (attr->value_tag == IPP_TAG_TEXT &&
+-		   !strcmp (attr->name, "printer-state-message"))
+-	    printer_state_message = attr->values[0].string.text;
+-	  else if (attr->value_tag == IPP_TAG_ENUM &&
+-		   !strcmp (attr->name, "printer-state"))
+-	    state = attr->values[0].integer;
++	  else if (ippGetValueTag (attr) == IPP_TAG_TEXT &&
++		   !strcmp (ippGetName (attr), "printer-state-message"))
++	    printer_state_message = ippGetString (attr, 0, NULL);
++	  else if (ippGetValueTag (attr) == IPP_TAG_ENUM &&
++		   !strcmp (ippGetName (attr), "printer-state"))
++	    state = ippGetInteger (attr, 0);
+ 	}
+ 
+       if (!this_device_uri)
+@@ -1254,8 +1329,8 @@ for_each_matching_queue (struct device_uris *device_uris,
+ 	     level USB (libusb) we cannot simply compare URIs, must
+ 	     consider also URIs as equal if one has an "interface"
+ 	     or "serial" attribute and the other not. If both have
+-	     the attribute it must naturally match. We check which attributes 
+-             are there and this way determine up to which length the two URIs 
++	     the attribute it must naturally match. We check which attributes
++             are there and this way determine up to which length the two URIs
+              must match. Here we can assume that if a URI has an "interface"
+ 	     attribute it has also a "serial" attribute, as this URI is
+ 	     an URI obtained via libusb and these always have a "serial"
+@@ -1278,13 +1353,13 @@ for_each_matching_queue (struct device_uris *device_uris,
+ 	  syslog (LOG_DEBUG, "URI of detected printer: %s, normalized: %s",
+ 		  device_uris->uri[i], device_uri_n);
+ 	  if ((!strncmp (device_uris->uri[i], this_device_uri, l)) ||
+-	      (strstr (device_uri_n, this_device_uri_n) == 
++	      (strstr (device_uri_n, this_device_uri_n) ==
+ 	       device_uri_n) ||
+-	      (strstr (this_device_uri_n, device_uri_n) == 
++	      (strstr (this_device_uri_n, device_uri_n) ==
+ 	       this_device_uri_n) ||
+ 	      ((strlen(usblpdev) > 0) &&
+ 	       ((strstr (this_device_uri, usblpdevstr1) != NULL) ||
+-	       (strstr (this_device_uri, usblpdevstr2) != NULL)))) 
++	       (strstr (this_device_uri, usblpdevstr2) != NULL))))
+ 	    {
+ 	      matched++;
+ 	      syslog (LOG_DEBUG, "Queue %s has matching device URI",
+@@ -1330,7 +1405,7 @@ enable_queue (const char *printer_uri, void *context)
+       return;
+     }
+ 
+-  if (answer->request.status.status_code > IPP_OK_CONFLICT)
++  if (ippGetStatusCode (answer) > IPP_OK_CONFLICT)
+     syslog (LOG_ERR, "IPP-Resume-Printer request failed");
+   else
+     syslog (LOG_INFO, "Re-enabled printer %s", printer_uri);
+@@ -1517,7 +1592,7 @@ remove_queue (const char *printer_uri)
+       return;
+     }
+ 
+-  if (answer->request.status.status_code > IPP_OK_CONFLICT)
++  if (ippGetStatusCode (answer) > IPP_OK_CONFLICT)
+     syslog (LOG_ERR, "IPP-Delete-Printer request failed");
+   else
+     syslog (LOG_INFO, "Deleted printer %s as the corresponding device "
+@@ -1551,7 +1626,7 @@ disable_queue (const char *printer_uri, void *context)
+       return;
+     }
+ 
+-  if (answer->request.status.status_code > IPP_OK_CONFLICT)
++  if (ippGetStatusCode (answer) > IPP_OK_CONFLICT)
+     syslog (LOG_ERR, "IPP-Pause-Printer request failed");
+   else
+     syslog (LOG_INFO, "Disabled printer %s as the corresponding device "
+-- 
+1.7.9.2
+
diff --git a/app-admin/system-config-printer-common/system-config-printer-common-1.3.6.ebuild b/app-admin/system-config-printer-common/system-config-printer-common-1.3.6.ebuild
index b43e183dc5bd..e7b37ec5de71 100644
--- a/app-admin/system-config-printer-common/system-config-printer-common-1.3.6.ebuild
+++ b/app-admin/system-config-printer-common/system-config-printer-common-1.3.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-common/system-config-printer-common-1.3.6.ebuild,v 1.12 2012/05/21 17:36:38 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-common/system-config-printer-common-1.3.6.ebuild,v 1.13 2012/07/18 21:11:29 dilfridge Exp $
 
 EAPI="3"
 
@@ -29,7 +29,7 @@ COMMON_DEPEND="
 	dev-python/dbus-python
 	>=dev-python/pycups-1.9.53
 	>=dev-python/pygobject-2.21.5:2
-	>=net-print/cups-1.4.6[dbus]
+	<net-print/cups-1.6.0[dbus]
 	sys-fs/udev
 	virtual/libusb:0
 "
diff --git a/app-admin/system-config-printer-common/system-config-printer-common-1.3.7.ebuild b/app-admin/system-config-printer-common/system-config-printer-common-1.3.7.ebuild
index db929bd9cab3..d6345fb8dad5 100644
--- a/app-admin/system-config-printer-common/system-config-printer-common-1.3.7.ebuild
+++ b/app-admin/system-config-printer-common/system-config-printer-common-1.3.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-common/system-config-printer-common-1.3.7.ebuild,v 1.12 2012/05/21 17:36:38 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-common/system-config-printer-common-1.3.7.ebuild,v 1.13 2012/07/18 21:11:29 dilfridge Exp $
 
 EAPI="3"
 
@@ -29,7 +29,7 @@ COMMON_DEPEND="
 	dev-python/dbus-python
 	>=dev-python/pycups-1.9.53
 	>=dev-python/pygobject-2.21.5:2
-	>=net-print/cups-1.4.6[dbus]
+	<net-print/cups-1.6.0[dbus]
 	>=sys-fs/udev-164-r2
 	virtual/libusb:0
 "
diff --git a/app-admin/system-config-printer-common/system-config-printer-common-1.3.9-r2.ebuild b/app-admin/system-config-printer-common/system-config-printer-common-1.3.9-r2.ebuild
index 4876ecdbc050..39c7ac2f99fa 100644
--- a/app-admin/system-config-printer-common/system-config-printer-common-1.3.9-r2.ebuild
+++ b/app-admin/system-config-printer-common/system-config-printer-common-1.3.9-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-common/system-config-printer-common-1.3.9-r2.ebuild,v 1.3 2012/07/15 16:19:28 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-common/system-config-printer-common-1.3.9-r2.ebuild,v 1.4 2012/07/18 21:11:29 dilfridge Exp $
 
 EAPI="3"
 
@@ -30,7 +30,7 @@ COMMON_DEPEND="
 	>=dev-python/pycups-1.9.60
 	dev-python/pycurl
 	>=dev-python/pygobject-2.21.5:2
-	>=net-print/cups-1.4.6[dbus]
+	<net-print/cups-1.6.0[dbus]
 	>=sys-fs/udev-164-r2
 	virtual/libusb:0
 "
diff --git a/app-admin/system-config-printer-common/system-config-printer-common-1.3.9-r3.ebuild b/app-admin/system-config-printer-common/system-config-printer-common-1.3.9-r3.ebuild
index 381fe5728eab..eb40ace7e50c 100644
--- a/app-admin/system-config-printer-common/system-config-printer-common-1.3.9-r3.ebuild
+++ b/app-admin/system-config-printer-common/system-config-printer-common-1.3.9-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-common/system-config-printer-common-1.3.9-r3.ebuild,v 1.1 2012/07/05 09:09:03 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-common/system-config-printer-common-1.3.9-r3.ebuild,v 1.2 2012/07/18 21:11:29 dilfridge Exp $
 
 EAPI=4
 
@@ -31,7 +31,7 @@ COMMON_DEPEND="
 	>=dev-python/pycups-1.9.60
 	dev-python/pycurl
 	>=dev-python/pygobject-2.21.5:2
-	>=net-print/cups-1.4.6[dbus]
+	<net-print/cups-1.6.0[dbus]
 	>=sys-fs/udev-164-r2
 	virtual/libusb:0
 "
diff --git a/app-admin/system-config-printer-common/system-config-printer-common-1.3.9-r4.ebuild b/app-admin/system-config-printer-common/system-config-printer-common-1.3.9-r4.ebuild
new file mode 100644
index 000000000000..693341924445
--- /dev/null
+++ b/app-admin/system-config-printer-common/system-config-printer-common-1.3.9-r4.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-common/system-config-printer-common-1.3.9-r4.ebuild,v 1.1 2012/07/18 21:11:29 dilfridge Exp $
+
+EAPI=4
+
+PYTHON_DEPEND="2:2.6"
+WANT_AUTOMAKE="1.11"
+
+inherit autotools eutils python
+
+MY_P=${PN%-common}-${PV}
+
+DESCRIPTION="Common modules of Red Hat's printer administration tool"
+HOMEPAGE="http://cyberelk.net/tim/software/system-config-printer/"
+SRC_URI="http://cyberelk.net/tim/data/${PN/-common}/${PV%.*}/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+SLOT="0"
+IUSE="doc policykit"
+
+# Needs cups running, bug 284005
+RESTRICT="test"
+
+# system-config-printer split since 1.1.3
+COMMON_DEPEND="
+	>=dev-libs/glib-2
+	dev-libs/libxml2[python]
+	dev-python/dbus-python
+	>=dev-python/pycups-1.9.60
+	dev-python/pycurl
+	>=dev-python/pygobject-2.21.5:2
+	net-print/cups[dbus]
+	>=sys-fs/udev-164-r2
+	virtual/libusb:0
+"
+DEPEND="${COMMON_DEPEND}
+	dev-util/intltool
+	virtual/pkgconfig
+	doc? ( dev-python/epydoc )
+"
+RDEPEND="${COMMON_DEPEND}
+	!<app-admin/system-config-printer-gnome-${PV}
+	policykit? ( >=sys-auth/polkit-0.104-r1 )
+"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-1.3.9-split.patch \
+		"${FILESDIR}"/${PN}-1.3.9-cups_filters_path.patch \
+		"${FILESDIR}"/${PN}-1.3.9-udev185.patch \
+		"${FILESDIR}"/${PN}-1.3.9-cups16.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-nls \
+		--with-udev-rules
+}
+
+src_compile() {
+	emake
+	use doc && emake html
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		udevhelperdir=/lib/udev \
+		udevrulesdir=/lib/udev/rules.d \
+		install
+
+	dodoc AUTHORS ChangeLog README
+	use doc && dohtml -r html/
+
+	python_convert_shebangs -q -r $(python_get_version) "${ED}"
+}
+
+pkg_postinst() {
+	python_mod_optimize cupshelpers
+}
+
+pkg_postrm() {
+	python_mod_cleanup cupshelpers /usr/share/system-config-printer
+}