Version bump, remove old

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

4 files changed, 154 insertions, 207 deletions

diff --git a/app-admin/system-config-printer-common/files/0002-Make-PackageKit-optional-in-cupshelpers-bug-726996-U.patch b/app-admin/system-config-printer-common/files/0002-Make-PackageKit-optional-in-cupshelpers-bug-726996-U.patch
new file mode 100644
index 000000000000..513032dfe02c
--- /dev/null
+++ b/app-admin/system-config-printer-common/files/0002-Make-PackageKit-optional-in-cupshelpers-bug-726996-U.patch
@@ -0,0 +1,39 @@
+From ddf4a4dcec27393e3c0c9efb032032cdb6b69d10 Mon Sep 17 00:00:00 2001
+From: Tim Waugh <twaugh@redhat.com>
+Date: Mon, 1 Aug 2011 10:42:57 +0100
+Subject: [PATCH 2/4] Make PackageKit optional in cupshelpers (bug #726996, Ubuntu #819000).
+
+---
+ cupshelpers/cupshelpers.py |    8 ++++++--
+ 1 files changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/cupshelpers/cupshelpers.py b/cupshelpers/cupshelpers.py
+index 251e0ee..3b95e2f 100755
+--- a/cupshelpers/cupshelpers.py
++++ b/cupshelpers/cupshelpers.py
+@@ -21,8 +21,12 @@
+ 
+ import cups, pprint, os, tempfile, re, string
+ import locale
+-import packagekit.client, packagekit.enums
+ from . import _debugprint
++try:
++    import packagekit.client, packagekit.enums
++    HAVE_PACKAGEKIT=True
++except ImportError:
++    HAVE_PACKAGEKIT=False
+ 
+ class Printer:
+     _flags_blacklist = ["options", "local"]
+@@ -830,7 +834,7 @@ def missingPackagesAndExecutables(ppd):
+     """
+     executables = missingExecutables(ppd)
+     packages = []
+-    if executables:
++    if executables and HAVE_PACKAGEKIT:
+         unresolved_executables = []
+         client = packagekit.client.PackageKitClient ()
+         for executable in executables:
+-- 
+1.7.3.4
+
diff --git a/app-admin/system-config-printer-common/files/0004-Removed-PackageKit-client-code-in-missingPackagesAnd.patch b/app-admin/system-config-printer-common/files/0004-Removed-PackageKit-client-code-in-missingPackagesAnd.patch
new file mode 100644
index 000000000000..3ba4b1e50685
--- /dev/null
+++ b/app-admin/system-config-printer-common/files/0004-Removed-PackageKit-client-code-in-missingPackagesAnd.patch
@@ -0,0 +1,58 @@
+From b1420ee264d6c462454919492f53a506d7bce0e1 Mon Sep 17 00:00:00 2001
+From: Tim Waugh <twaugh@redhat.com>
+Date: Tue, 2 Aug 2011 15:43:11 +0100
+Subject: [PATCH 4/4] Removed PackageKit client code in missingPackagesAndExecutables (bug #726938).
+
+The PackageKit Python client module is hard-coded to set a default
+GLib main loop on import, which means it cannot be imported by a
+module that might be used by an application using a different main
+loop implementation, such as KDE's printer-applet.
+---
+ cupshelpers/cupshelpers.py |   24 +-----------------------
+ 1 files changed, 1 insertions(+), 23 deletions(-)
+
+diff --git a/cupshelpers/cupshelpers.py b/cupshelpers/cupshelpers.py
+index 3b95e2f..bf6eda2 100755
+--- a/cupshelpers/cupshelpers.py
++++ b/cupshelpers/cupshelpers.py
+@@ -22,11 +22,6 @@
+ import cups, pprint, os, tempfile, re, string
+ import locale
+ from . import _debugprint
+-try:
+-    import packagekit.client, packagekit.enums
+-    HAVE_PACKAGEKIT=True
+-except ImportError:
+-    HAVE_PACKAGEKIT=False
+ 
+ class Printer:
+     _flags_blacklist = ["options", "local"]
+@@ -833,24 +828,7 @@ def missingPackagesAndExecutables(ppd):
+     missing executables
+     """
+     executables = missingExecutables(ppd)
+-    packages = []
+-    if executables and HAVE_PACKAGEKIT:
+-        unresolved_executables = []
+-        client = packagekit.client.PackageKitClient ()
+-        for executable in executables:
+-            if not executable.startswith ("/"):
+-                executable = "/usr/bin/" + executable
+-
+-            result = client.search_file ([executable],
+-                                         packagekit.enums.FILTER_NOT_INSTALLED)
+-            if result:
+-                packages.extend (set (map (lambda x: x.name, result)))
+-            else:
+-                unresolved_executables.append (executable)
+-
+-        executables = unresolved_executables
+-        
+-    return (packages, executables)
++    return ([], executables)
+ 
+ def _main():
+     c = cups.Connection()
+-- 
+1.7.3.4
+
diff --git a/app-admin/system-config-printer-common/files/system-config-printer-common-1.1.13-split.patch b/app-admin/system-config-printer-common/files/system-config-printer-common-1.1.13-split.patch
deleted file mode 100644
index 620aa21729b3..000000000000
--- a/app-admin/system-config-printer-common/files/system-config-printer-common-1.1.13-split.patch
+++ /dev/null
@@ -1,164 +0,0 @@
-diff -ru ../system-config-printer-1.1.12/configure.in ./configure.in
---- ../system-config-printer-1.1.12/configure.in	2009-08-25 18:01:27.000000000 +0200
-+++ ./configure.in	2009-08-28 18:32:45.000000000 +0200
-@@ -1,6 +1,6 @@
- AC_INIT(system-config-printer, 1.1.12)
- AC_CONFIG_SRCDIR(system-config-printer.py)
--AM_INIT_AUTOMAKE([dist-xz dist-bzip2 subdir-objects 1.6])
-+AM_INIT_AUTOMAKE([dist-bzip2 subdir-objects 1.6])
- IT_PROG_INTLTOOL
- AM_GNU_GETTEXT([external])
- AM_PATH_PYTHON
-diff -ru ../system-config-printer-1.1.12/Makefile.am ./Makefile.am
---- ../system-config-printer-1.1.12/Makefile.am	2009-08-25 18:01:27.000000000 +0200
-+++ ./Makefile.am	2009-08-28 18:57:38.000000000 +0200
-@@ -70,84 +70,22 @@
- 	rm -f .stamp-distutils-in-builddir
- 
- nobase_pkgdata_SCRIPTS=				\
--	my-default-printer.py			\
--	pysmb.py				\
--	system-config-printer.py		\
--	troubleshoot/__init__.py		\
--	applet.py
-+	pysmb.py
- 
- nobase_pkgdata_DATA=					\
--	AdvancedServerSettings.py			\
--	authconn.py					\
- 	config.py					\
--	cupspk.py					\
- 	debug.py					\
--	errordialogs.py					\
--	HIG.py						\
--	glade.py					\
--	GroupsPane.py					\
--	GroupsPaneModel.py				\
--	gtkinklevel.py					\
--	gtkspinner.py					\
- 	installpackage.py				\
--	jobviewer.py					\
- 	monitor.py					\
--	options.py					\
--	optionwidgets.py				\
- 	PhysicalDevice.py				\
- 	ppdippstr.py					\
- 	probe_printer.py				\
--	gtk_label_autowrap.py				\
- 	SearchCriterion.py				\
- 	smburi.py					\
- 	statereason.py					\
--	timedops.py					\
--	ToolbarSearchEntry.py				\
--	userdefault.py					\
- 	XmlHelper.py					\
--	glade/AboutDialog.glade				\
--	glade/ConnectDialog.glade				\
--	glade/ConnectingDialog.glade			\
--	glade/InstallDialog.glade				\
--	glade/JobsWindow.glade				\
--	glade/NewPrinterName.glade				\
--	glade/NewPrinterWindow.glade			\
--	glade/PrinterPropertiesDialog.glade		\
--	glade/PrintersWindow.glade				\
--	glade/ServerSettingsDialog.glade			\
--	glade/SMBBrowseDialog.glade			\
--	glade/statusicon_popupmenu.glade			\
--	glade/WaitWindow.glade				\
--	icons/i-network-printer.png			\
--	troubleshoot/base.py				\
--	troubleshoot/CheckLocalServerPublishing.py	\
--	troubleshoot/CheckNetworkServerSanity.py	\
--	troubleshoot/CheckPPDSanity.py			\
--	troubleshoot/CheckPrinterSanity.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/Welcome.py
--
--bin_SCRIPTS=\
--	system-config-printer			\
--	system-config-printer-applet		\
--	my-default-printer
-+	smburi.py					\
-+	statereason.py
- 
- if UDEV_RULES
- udevrulesdir=$(sysconfdir)/udev/rules.d
-@@ -162,61 +100,16 @@
- 	udev/udev-add-printer
- endif
- 
--man_MANS=					\
--	man/system-config-printer.1		\
--	man/system-config-printer-applet.1
--
- dbus_DATA =\
- 	newprinternotification.conf
- dbusdir = $(sysconfdir)/dbus-1/system.d/
- 
--desktop_DATA =\
--	system-config-printer.desktop \
--	print-applet.desktop \
--	manage-print-jobs.desktop \
--	my-default-printer.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)$(desktopdir)		\
--	  --add-category System			\
--	  --add-category Monitor		\
--	  --add-category GTK			\
--	  manage-print-jobs.desktop
--	desktop-file-install $(DESKTOP_VENDOR)	\
--	  --dir $(DESTDIR)$(desktopdir)		\
--	  --add-category Settings		\
--	  --add-category HardwareSettings	\
--	  --add-category GTK			\
--	  my-default-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)$(desktopdir)/$(DESKTOP_PREFIX)manage-print-jobs.desktop
--	rm -f $(DESTDIR)$(desktopdir)/$(DESKTOP_PREFIX)my-default-printer.desktop
--	rm -f $(DESTDIR)$(autostartdir)/$(DESKTOP_PREFIX)print-applet.desktop
--
- EXTRA_DIST=\
- 	$(nobase_pkgdata_SCRIPTS) \
- 	$(nobase_pkgdata_DATA) \
diff --git a/app-admin/system-config-printer-common/files/system-config-printer-common-1.2.2-split.patch b/app-admin/system-config-printer-common/files/system-config-printer-common-1.3.5-split.patch
index 6257fd0ee71a..263956fb00f0 100644
--- a/app-admin/system-config-printer-common/files/system-config-printer-common-1.2.2-split.patch
+++ b/app-admin/system-config-printer-common/files/system-config-printer-common-1.3.5-split.patch
@@ -1,19 +1,25 @@
-diff -ru ../system-config-printer-1.2.2/Makefile.am ./Makefile.am
---- ../system-config-printer-1.2.2/Makefile.am	2010-05-07 16:19:03.000000000 +0200
-+++ ./Makefile.am	2010-05-17 20:36:37.657216914 +0200
-@@ -70,91 +70,20 @@
+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=					\
--	AdvancedServerSettings.py			\
 -	asyncconn.py					\
 -	asyncipp.py					\
 -	asyncpk1.py					\
@@ -21,46 +27,46 @@ diff -ru ../system-config-printer-1.2.2/Makefile.am ./Makefile.am
  	config.py					\
 -	cupspk.py					\
  	debug.py					\
--	dnssdresolve.py					\
+ 	dnssdresolve.py					\
 -	errordialogs.py					\
 -	HIG.py						\
--	firewall.py					\
+ 	firewall.py					\
 -	gui.py						\
--	GroupsPane.py					\
--	GroupsPaneModel.py				\
 -	gtkinklevel.py					\
 -	gtkspinner.py					\
--	installdriver.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					\
+-	statereason.py					\
 -	timedops.py					\
 -	ToolbarSearchEntry.py				\
 -	userdefault.py					\
--	XmlHelper.py					\
--	ui/AboutDialog.glade				\
--	ui/ConnectDialog.glade				\
--	ui/ConnectingDialog.glade			\
--	ui/InstallDialog.glade				\
--	ui/JobsWindow.glade				\
--	ui/NewPrinterName.glade				\
--	ui/NewPrinterWindow.glade			\
--	ui/PrinterPropertiesDialog.glade		\
--	ui/PrintersWindow.glade				\
--	ui/ServerSettingsDialog.glade			\
--	ui/SMBBrowseDialog.glade			\
--	ui/statusicon_popupmenu.glade			\
--	ui/WaitWindow.glade				\
+-	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	\
@@ -86,17 +92,25 @@ diff -ru ../system-config-printer-1.2.2/Makefile.am ./Makefile.am
 -	troubleshoot/SchedulerNotRunning.py		\
 -	troubleshoot/ServerFirewalled.py		\
 -	troubleshoot/Shrug.py				\
--	troubleshoot/Welcome.py
+-	troubleshoot/VerifyPackages.py			\
+-	troubleshoot/Welcome.py				\
+-	xml/preferreddrivers.rng			\
+-	xml/validate.py
+-
+-cupshelpersdir=$(sysconfdir)/cupshelpers
+-cupshelpers_DATA=\
+-	xml/preferreddrivers.xml
 -
--bin_SCRIPTS=\
+-bin_SCRIPTS=					\
 -	system-config-printer			\
--	system-config-printer-applet
-+	XmlHelper.py
+-	system-config-printer-applet		\
+-	dbus/scp-dbus-service
++	statereason.py
  
  if UDEV_RULES
- udevrulesdir=/lib/udev/rules.d
-@@ -169,56 +98,17 @@
- 	udev/udev-add-printer
+ udevrulesdir=$(sysconfdir)/udev/rules.d
+@@ -201,56 +123,17 @@
+ 
  endif
  
 -man_MANS=					\
@@ -104,14 +118,21 @@ diff -ru ../system-config-printer-1.2.2/Makefile.am ./Makefile.am
 -	man/system-config-printer-applet.1
 -
  dbus_DATA =					\
- 	newprinternotification.conf		\
- 	printerdriversinstaller.conf
+ 	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 \
--	manage-print-jobs.desktop
+-	print-applet.desktop
  desktopdir = $(datadir)/applications/
  autostartdir = $(sysconfdir)/xdg/autostart/
  
@@ -130,12 +151,6 @@ diff -ru ../system-config-printer-1.2.2/Makefile.am ./Makefile.am
 -	  --add-category GTK			\
 -	  system-config-printer.desktop
 -	desktop-file-install $(DESKTOP_VENDOR)	\
--	  --dir $(DESTDIR)$(desktopdir)		\
--	  --add-category System			\
--	  --add-category Monitor		\
--	  --add-category GTK			\
--	  manage-print-jobs.desktop
--	desktop-file-install $(DESKTOP_VENDOR)	\
 -	  --dir $(DESTDIR)$(autostartdir)	\
 -	  --add-category System			\
 -	  --add-category Monitor		\
@@ -144,7 +159,6 @@ diff -ru ../system-config-printer-1.2.2/Makefile.am ./Makefile.am
 -
 -uninstall-desktopDATA:
 -	rm -f $(DESTDIR)$(desktopdir)/$(DESKTOP_PREFIX)system-config-printer.desktop
--	rm -f $(DESTDIR)$(desktopdir)/$(DESKTOP_PREFIX)manage-print-jobs.desktop
 -	rm -f $(DESTDIR)$(autostartdir)/$(DESKTOP_PREFIX)print-applet.desktop
 -
 -desktop_in_files = $(desktop_DATA:.desktop=.desktop.in)