Version bump, remove old

(Portage version: 2.2.0_alpha120/cvs/Linux x86_64)

8 files changed, 17 insertions, 795 deletions

diff --git a/app-admin/system-config-printer-common/ChangeLog b/app-admin/system-config-printer-common/ChangeLog
index 9245da2c0b4a..1c139411f291 100644
--- a/app-admin/system-config-printer-common/ChangeLog
+++ b/app-admin/system-config-printer-common/ChangeLog
@@ -1,6 +1,19 @@
 # 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.76 2012/07/18 21:11:29 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-common/ChangeLog,v 1.77 2012/08/06 00:10:17 reavertm Exp $
+
+*system-config-printer-common-1.3.11 (06 Aug 2012)
+
+  06 Aug 2012; Maciej Mrozowski <reavertm@gentoo.org>
+  +system-config-printer-common-1.3.11.ebuild,
+  -files/system-config-printer-common-1.3.5-split.patch,
+  -files/system-config-printer-common-1.3.9-cups16.patch,
+  -files/system-config-printer-common-1.3.9-udev185.patch,
+  -system-config-printer-common-1.3.6.ebuild,
+  -system-config-printer-common-1.3.7.ebuild,
+  -system-config-printer-common-1.3.9-r3.ebuild,
+  -system-config-printer-common-1.3.9-r4.ebuild:
+  Version bump, remove old
 
 *system-config-printer-common-1.3.9-r4 (18 Jul 2012)
 
@@ -423,4 +436,3 @@
   +system-config-printer-common-1.1.8.ebuild,
   +files/system-config-printer-common-1.1.8-split.patch, +metadata.xml:
   new ebuild from kde-testing overlay
-
diff --git a/app-admin/system-config-printer-common/files/system-config-printer-common-1.3.5-split.patch b/app-admin/system-config-printer-common/files/system-config-printer-common-1.3.5-split.patch
deleted file mode 100644
index 263956fb00f0..000000000000
--- a/app-admin/system-config-printer-common/files/system-config-printer-common-1.3.5-split.patch
+++ /dev/null
@@ -1,168 +0,0 @@
-diff -ruN system-config-printer-1.3.5/Makefile.am my/Makefile.am
---- system-config-printer-1.3.5/Makefile.am	2011-07-28 18:04:13.000000000 +0200
-+++ my/Makefile.am	2011-08-10 00:56:28.296077828 +0200
-@@ -1,4 +1,4 @@
--CFLAGS=-g -O2 -Wall
-+CFLAGS=-Wall
- 
- SUBDIRS=po
- 
-@@ -83,99 +83,21 @@
- 	rm -f .stamp-distutils-in-builddir
- 
- nobase_pkgdata_SCRIPTS=				\
--	check-device-ids.py			\
--	pysmb.py				\
--	scp-dbus-service.py			\
--	system-config-printer.py		\
--	troubleshoot/__init__.py		\
--	applet.py
-+	pysmb.py
- 
- nobase_pkgdata_DATA=					\
--	asyncconn.py					\
--	asyncipp.py					\
--	asyncpk1.py					\
--	authconn.py					\
- 	config.py					\
--	cupspk.py					\
- 	debug.py					\
- 	dnssdresolve.py					\
--	errordialogs.py					\
--	HIG.py						\
- 	firewall.py					\
--	gui.py						\
--	gtkinklevel.py					\
--	gtkspinner.py					\
- 	installpackage.py				\
--	jobviewer.py					\
- 	monitor.py					\
--	newprinter.py					\
--	options.py					\
--	optionwidgets.py				\
- 	PhysicalDevice.py				\
--	ppdcache.py					\
- 	ppdippstr.py					\
--	ppdsloader.py					\
--	printerproperties.py				\
- 	probe_printer.py				\
--	gtk_label_autowrap.py				\
- 	SearchCriterion.py				\
--	serversettings.py				\
- 	smburi.py					\
--	statereason.py					\
--	timedops.py					\
--	ToolbarSearchEntry.py				\
--	userdefault.py					\
--	ui/AboutDialog.ui				\
--	ui/ConnectDialog.ui				\
--	ui/ConnectingDialog.ui				\
--	ui/InstallDialog.ui				\
--	ui/JobsWindow.ui				\
--	ui/NewPrinterName.ui				\
--	ui/NewPrinterWindow.ui				\
--	ui/PrinterPropertiesDialog.ui			\
--	ui/PrintersWindow.ui				\
--	ui/ServerSettingsDialog.ui			\
--	ui/SMBBrowseDialog.ui				\
--	ui/statusicon_popupmenu.ui			\
--	ui/WaitWindow.ui				\
--	icons/i-network-printer.png			\
--	troubleshoot/base.py				\
--	troubleshoot/CheckLocalServerPublishing.py	\
--	troubleshoot/CheckNetworkServerSanity.py	\
--	troubleshoot/CheckPPDSanity.py			\
--	troubleshoot/CheckPrinterSanity.py		\
--	troubleshoot/CheckSELinux.py			\
--	troubleshoot/CheckUSBPermissions.py		\
--	troubleshoot/ChooseNetworkPrinter.py		\
--	troubleshoot/ChoosePrinter.py			\
--	troubleshoot/DeviceListed.py			\
--	troubleshoot/ErrorLogCheckpoint.py		\
--	troubleshoot/ErrorLogFetch.py			\
--	troubleshoot/ErrorLogParse.py			\
--	troubleshoot/Locale.py				\
--	troubleshoot/LocalOrRemote.py			\
--	troubleshoot/NetworkCUPSPrinterShared.py	\
--	troubleshoot/PrinterStateReasons.py		\
--	troubleshoot/PrintTestPage.py			\
--	troubleshoot/QueueNotEnabled.py			\
--	troubleshoot/QueueRejectingJobs.py		\
--	troubleshoot/RemoteAddress.py			\
--	troubleshoot/SchedulerNotRunning.py		\
--	troubleshoot/ServerFirewalled.py		\
--	troubleshoot/Shrug.py				\
--	troubleshoot/VerifyPackages.py			\
--	troubleshoot/Welcome.py				\
--	xml/preferreddrivers.rng			\
--	xml/validate.py
--
--cupshelpersdir=$(sysconfdir)/cupshelpers
--cupshelpers_DATA=\
--	xml/preferreddrivers.xml
--
--bin_SCRIPTS=					\
--	system-config-printer			\
--	system-config-printer-applet		\
--	dbus/scp-dbus-service
-+	statereason.py
- 
- if UDEV_RULES
- udevrulesdir=$(sysconfdir)/udev/rules.d
-@@ -201,56 +123,17 @@
- 
- endif
- 
--man_MANS=					\
--	man/system-config-printer.1		\
--	man/system-config-printer-applet.1
--
- dbus_DATA =					\
- 	dbus/com.redhat.NewPrinterNotification.conf		\
- 	dbus/com.redhat.PrinterDriversInstaller.conf
- dbusdir = $(sysconfdir)/dbus-1/system.d/
- 
--dbusinterfaces_DATA =				\
--	dbus/org.fedoraproject.Config.Printing.xml
--dbusinterfacesdir = $(datadir)/dbus-1/interfaces/
--
--dbusservices_DATA =				\
--	dbus/org.fedoraproject.Config.Printing.service
--dbusservicesdir = $(datadir)/dbus-1/services/
--
--desktop_DATA =\
--	system-config-printer.desktop \
--	print-applet.desktop
- desktopdir = $(datadir)/applications/
- autostartdir = $(sysconfdir)/xdg/autostart/
- 
- DESKTOP_VENDOR=@DESKTOPVENDOR@
- DESKTOP_PREFIX=@DESKTOPPREFIX@
- 
--install-desktopDATA: $(desktop_DATA)
--	mkdir -p $(DESTDIR)$(desktopdir)
--	mkdir -p $(DESTDIR)$(desktopdir)
--	desktop-file-install $(DESKTOP_VENDOR)	\
--	  --dir $(DESTDIR)$(desktopdir)		\
--	  --add-category System			\
--	  --add-category Settings		\
--	  --add-category HardwareSettings	\
--	  --add-category Printing		\
--	  --add-category GTK			\
--	  system-config-printer.desktop
--	desktop-file-install $(DESKTOP_VENDOR)	\
--	  --dir $(DESTDIR)$(autostartdir)	\
--	  --add-category System			\
--	  --add-category Monitor		\
--	  --add-category GTK			\
--	  print-applet.desktop
--
--uninstall-desktopDATA:
--	rm -f $(DESTDIR)$(desktopdir)/$(DESKTOP_PREFIX)system-config-printer.desktop
--	rm -f $(DESTDIR)$(autostartdir)/$(DESKTOP_PREFIX)print-applet.desktop
--
--desktop_in_files = $(desktop_DATA:.desktop=.desktop.in)
--
- EXTRA_DIST=\
- 	$(nobase_pkgdata_SCRIPTS) \
- 	$(nobase_pkgdata_DATA) \
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
deleted file mode 100644
index a8fd5f18c16f..000000000000
--- a/app-admin/system-config-printer-common/files/system-config-printer-common-1.3.9-cups16.patch
+++ /dev/null
@@ -1,297 +0,0 @@
-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/files/system-config-printer-common-1.3.9-udev185.patch b/app-admin/system-config-printer-common/files/system-config-printer-common-1.3.9-udev185.patch
deleted file mode 100644
index 7be5547229f2..000000000000
--- a/app-admin/system-config-printer-common/files/system-config-printer-common-1.3.9-udev185.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From cbacff0c9f7e3e6549c9b33a42e805a935db36e6 Mon Sep 17 00:00:00 2001
-From: Jiri Popelka <jpopelka@redhat.com>
-Date: Tue, 5 Jun 2012 14:28:36 +0200
-Subject: [PATCH] udev: replace udev_get_sys_path() with hard-coded "/sys"
- (trac #223)
-
-udev_get_sys_path() is no longer provided by libudev
----
- udev/udev-configure-printer.c |    6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/udev/udev-configure-printer.c b/udev/udev-configure-printer.c
-index 1d89f9a..8d349e4 100644
---- a/udev/udev-configure-printer.c
-+++ b/udev/udev-configure-printer.c
-@@ -451,7 +451,6 @@ device_id_from_devpath (const char *devpath,
-   struct usb_uri_map_entry *entry;
-   struct udev *udev;
-   struct udev_device *dev, *parent_dev = NULL;
--  const char *sys;
-   const char *idVendorStr, *idProductStr, *serial;
-   char *end;
-   unsigned long idVendor, idProduct;
-@@ -500,8 +499,7 @@ device_id_from_devpath (const char *devpath,
-       *dest = '\0';
-     }
- 
--  sys = udev_get_sys_path (udev);
--  syslen = strlen (sys);
-+  syslen = strlen ("/sys");
-   devpathlen = strlen (devpath);
-   syspath = malloc (syslen + devpathlen + 1);
-   if (syspath == NULL)
-@@ -511,7 +509,7 @@ device_id_from_devpath (const char *devpath,
-       exit (1);
-     }
- 
--  memcpy (syspath, sys, syslen);
-+  memcpy (syspath, "/sys", syslen);
-   memcpy (syspath + syslen, devpath, devpathlen);
-   syspath[syslen + devpathlen] = '\0';
- 
--- 
-1.7.10.2
-
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.11.ebuild
index eb40ace7e50c..eb075f9a851e 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.11.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.2 2012/07/18 21:11:29 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-common/system-config-printer-common-1.3.11.ebuild,v 1.1 2012/08/06 00:10:17 reavertm 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.6.0[dbus]
+	net-print/cups[dbus]
 	>=sys-fs/udev-164-r2
 	virtual/libusb:0
 "
@@ -54,9 +54,7 @@ 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-split.patch
 	eautoreconf
 }
 
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
deleted file mode 100644
index e7b37ec5de71..000000000000
--- a/app-admin/system-config-printer-common/system-config-printer-common-1.3.6.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# 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.13 2012/07/18 21:11:29 dilfridge Exp $
-
-EAPI="3"
-
-PYTHON_DEPEND="2"
-WANT_AUTOMAKE="1.11"
-inherit eutils python autotools
-
-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/system-config-printer/1.3/${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.53
-	>=dev-python/pygobject-2.21.5:2
-	<net-print/cups-1.6.0[dbus]
-	sys-fs/udev
-	virtual/libusb:0
-"
-DEPEND="${COMMON_DEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	doc? ( dev-python/epydoc )
-"
-RDEPEND="${COMMON_DEPEND}
-	!app-admin/system-config-printer:0
-	!<app-admin/system-config-printer-gnome-${PV}
-	policykit? ( sys-auth/polkit )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	python_set_active_version 2
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.3.5-split.patch"
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-nls \
-		--with-udev-rules
-}
-
-src_compile() {
-	emake || die "emake failed"
-	if use doc; then
-		emake html || die "emake html failed"
-	fi
-}
-
-src_install() {
-	dodoc AUTHORS ChangeLog README || die "dodoc failed"
-
-	if use doc; then
-		dohtml -r html/ || die "installing html docs failed"
-	fi
-
-	emake DESTDIR="${ED}" install \
-		udevrulesdir=/lib/udev/rules.d \
-		udevhelperdir=/lib/udev \
-		|| die "emake install failed"
-
-	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
-}
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
deleted file mode 100644
index d6345fb8dad5..000000000000
--- a/app-admin/system-config-printer-common/system-config-printer-common-1.3.7.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# 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.13 2012/07/18 21:11:29 dilfridge Exp $
-
-EAPI="3"
-
-PYTHON_DEPEND="2"
-WANT_AUTOMAKE="1.11"
-inherit eutils python autotools
-
-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/system-config-printer/1.3/${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.53
-	>=dev-python/pygobject-2.21.5:2
-	<net-print/cups-1.6.0[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:0
-	!<app-admin/system-config-printer-gnome-${PV}
-	policykit? ( sys-auth/polkit )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	python_set_active_version 2
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.3.5-split.patch"
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-nls \
-		--with-udev-rules
-}
-
-src_compile() {
-	emake || die "emake failed"
-	if use doc; then
-		emake html || die "emake html failed"
-	fi
-}
-
-src_install() {
-	dodoc AUTHORS ChangeLog README || die "dodoc failed"
-
-	if use doc; then
-		dohtml -r html/ || die "installing html docs failed"
-	fi
-
-	emake DESTDIR="${ED}" install \
-		udevrulesdir=/lib/udev/rules.d \
-		udevhelperdir=/lib/udev \
-		|| die "emake install failed"
-
-	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
-}
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
deleted file mode 100644
index 693341924445..000000000000
--- a/app-admin/system-config-printer-common/system-config-printer-common-1.3.9-r4.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# 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
-}