Version bump, remove old

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

6 files changed, 160 insertions, 68 deletions

diff --git a/app-admin/system-config-printer-gnome/ChangeLog b/app-admin/system-config-printer-gnome/ChangeLog
index a39f457eb21a..d7e0edb909e6 100644
--- a/app-admin/system-config-printer-gnome/ChangeLog
+++ b/app-admin/system-config-printer-gnome/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for app-admin/system-config-printer-gnome
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-gnome/ChangeLog,v 1.27 2011/07/24 09:49:24 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-gnome/ChangeLog,v 1.28 2011/08/09 23:56:08 reavertm Exp $
+
+*system-config-printer-gnome-1.3.5 (09 Aug 2011)
+
+  09 Aug 2011; Maciej Mrozowski <reavertm@gentoo.org>
+  +files/0001-Avoid-global-name-dbus-is-not-defined-traceback-in-s.patch,
+  +files/0003-Properties-dialog-make-OK-button-sensitive-even-when.patch,
+  -system-config-printer-gnome-1.2.2.ebuild,
+  -files/system-config-printer-gnome-1.2.2-cupspk-fileget-tmp.patch,
+  -files/system-config-printer-gnome-1.2.2-split.patch,
+  +system-config-printer-gnome-1.3.5.ebuild,
+  +files/system-config-printer-gnome-1.3.5-split.patch:
+  Version bump, remove old
 
   24 Jul 2011; Markos Chandras <hwoarang@gentoo.org>
   system-config-printer-gnome-1.3.3.ebuild:
diff --git a/app-admin/system-config-printer-gnome/files/0001-Avoid-global-name-dbus-is-not-defined-traceback-in-s.patch b/app-admin/system-config-printer-gnome/files/0001-Avoid-global-name-dbus-is-not-defined-traceback-in-s.patch
new file mode 100644
index 000000000000..06428896244a
--- /dev/null
+++ b/app-admin/system-config-printer-gnome/files/0001-Avoid-global-name-dbus-is-not-defined-traceback-in-s.patch
@@ -0,0 +1,24 @@
+From 895b66459b34b7f36dba1313212ec224c6662e3c Mon Sep 17 00:00:00 2001
+From: Tim Waugh <twaugh@redhat.com>
+Date: Fri, 29 Jul 2011 15:51:54 +0100
+Subject: [PATCH 1/4] Avoid "global name 'dbus' is not defined" traceback in serversettings.py (bgu #726682).
+
+---
+ serversettings.py |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/serversettings.py b/serversettings.py
+index 05db1ba..62d345f 100644
+--- a/serversettings.py
++++ b/serversettings.py
+@@ -23,6 +23,7 @@
+ import config
+ from gettext import gettext as _
+ import cups
++import dbus
+ import gobject
+ import gtk
+ import os
+-- 
+1.7.3.4
+
diff --git a/app-admin/system-config-printer-gnome/files/0003-Properties-dialog-make-OK-button-sensitive-even-when.patch b/app-admin/system-config-printer-gnome/files/0003-Properties-dialog-make-OK-button-sensitive-even-when.patch
new file mode 100644
index 000000000000..9953fab789f7
--- /dev/null
+++ b/app-admin/system-config-printer-gnome/files/0003-Properties-dialog-make-OK-button-sensitive-even-when.patch
@@ -0,0 +1,39 @@
+From 4ede66364b6987cb3013fa447fcdec09b3a638cb Mon Sep 17 00:00:00 2001
+From: Tim Waugh <twaugh@redhat.com>
+Date: Mon, 1 Aug 2011 14:04:49 +0100
+Subject: [PATCH 3/4] Properties dialog: make OK button sensitive even when no changes to save (Ubuntu #444280).
+
+Only becomes insensitive when there are conflicts.
+---
+ printerproperties.py |    8 +++++---
+ 1 files changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/printerproperties.py b/printerproperties.py
+index ca40f31..9c055f9 100755
+--- a/printerproperties.py
++++ b/printerproperties.py
+@@ -619,7 +619,10 @@ class PrinterPropertiesDialog(GtkGUI):
+ 
+         if (response == gtk.RESPONSE_OK or
+             response == gtk.RESPONSE_APPLY):
+-            failed = self.save_printer (self.printer)
++            if (response == gtk.RESPONSE_OK and len (self.changed) == 0):
++                failed = False
++            else:
++                failed = self.save_printer (self.printer)
+ 
+         if response == gtk.RESPONSE_APPLY and not failed:
+             try:
+@@ -957,8 +960,7 @@ class PrinterPropertiesDialog(GtkGUI):
+ 
+         self.btnPrinterPropertiesApply.set_sensitive (len (self.changed) > 0 and
+                                                       not self.conflicts)
+-        self.btnPrinterPropertiesOK.set_sensitive (len (self.changed) > 0 and
+-                                                   not self.conflicts)
++        self.btnPrinterPropertiesOK.set_sensitive (not self.conflicts)
+ 
+     def save_printer(self, printer, saveall=False, parent=None):
+         if parent == None:
+-- 
+1.7.3.4
+
diff --git a/app-admin/system-config-printer-gnome/files/system-config-printer-gnome-1.2.2-cupspk-fileget-tmp.patch b/app-admin/system-config-printer-gnome/files/system-config-printer-gnome-1.2.2-cupspk-fileget-tmp.patch
deleted file mode 100644
index a62e1106f47e..000000000000
--- a/app-admin/system-config-printer-gnome/files/system-config-printer-gnome-1.2.2-cupspk-fileget-tmp.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -up system-config-printer-1.2.2/asyncpk1.py.cupspk-fileget-tmp system-config-printer-1.2.2/asyncpk1.py
---- system-config-printer-1.2.2/asyncpk1.py.cupspk-fileget-tmp	2010-05-07 15:19:03.000000000 +0100
-+++ system-config-printer-1.2.2/asyncpk1.py	2010-05-13 13:00:57.759093485 +0100
-@@ -153,7 +153,10 @@ class _WriteToTmpFile:
-     def __init__ (self, kwds, reply_handler, error_handler):
-         self._reply_handler = reply_handler
-         self._error_handler = error_handler
--        (tmpfd, tmpfname) = tempfile.mkstemp ()
-+
-+        # Create the temporary file in /tmp to ensure that
-+        # cups-pk-helper-mechanism is able to write to it.
-+        (tmpfd, tmpfname) = tempfile.mkstemp (dir="/tmp")
-         os.close (tmpfd)
-         self._filename = tmpfname
-         debugprint ("Created tempfile %s" % tmpfname)
-diff -up system-config-printer-1.2.2/cupspk.py.cupspk-fileget-tmp system-config-printer-1.2.2/cupspk.py
---- system-config-printer-1.2.2/cupspk.py.cupspk-fileget-tmp	2010-04-15 00:11:33.000000000 +0100
-+++ system-config-printer-1.2.2/cupspk.py	2010-05-13 13:00:57.760093336 +0100
-@@ -385,7 +385,9 @@ class Connection:
-                     filename = None
- 
-         if (not use_pycups) and (fd != None or file_object != None):
--            (tmpfd, tmpfname) = tempfile.mkstemp()
-+            # Create the temporary file in /tmp to ensure that
-+            # cups-pk-helper-mechanism is able to write to it.
-+            (tmpfd, tmpfname) = tempfile.mkstemp(dir="/tmp")
-             os.close (tmpfd)
- 
-             pk_args = (resource, tmpfname)
diff --git a/app-admin/system-config-printer-gnome/files/system-config-printer-gnome-1.2.2-split.patch b/app-admin/system-config-printer-gnome/files/system-config-printer-gnome-1.3.5-split.patch
index 9a7ba2d1fc12..562d5a315764 100644
--- a/app-admin/system-config-printer-gnome/files/system-config-printer-gnome-1.2.2-split.patch
+++ b/app-admin/system-config-printer-gnome/files/system-config-printer-gnome-1.3.5-split.patch
@@ -1,15 +1,22 @@
-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:39:12.278375860 +0200
-@@ -2,76 +2,8 @@
+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 01:11:27.890147909 +0200
+@@ -1,90 +1,9 @@
+-CFLAGS=-g -O2 -Wall
++CFLAGS=-Wall
  
  SUBDIRS=po
  
 -EXPORT_MODULES=					\
 -	cupshelpers/__init__.py			\
 -	cupshelpers/cupshelpers.py		\
+-	cupshelpers/installdriver.py		\
 -	cupshelpers/ppds.py			\
--	cupshelpers/openprinting.py
+-	cupshelpers/openprinting.py		\
+-	cupshelpers/xmldriverprefs.py
+-
+-EXPORT_MODULES_GEN=				\
+-	cupshelpers/config.py
 -
 -### Automake hooks for Distutils.
 -# The distutils module doesn't understand srcdir != builddir,
@@ -18,7 +25,7 @@ diff -ru ../system-config-printer-1.2.2/Makefile.am ./Makefile.am
 -.stamp-distutils-in-builddir:	setup.py $(EXPORT_MODULES)
 -	if [ "$(top_srcdir)" != "$(top_builddir)" ]; then	\
 -		cp $(top_srcdir)/setup.py .;			\
--		mkdir cupshelpers;				\
+-		$(mkdir_p) cupshelpers;				\
 -		for file in $(EXPORT_MODULES); do		\
 -			cp $(top_srcdir)/$$file $$file;		\
 -		done;						\
@@ -44,8 +51,15 @@ diff -ru ../system-config-printer-1.2.2/Makefile.am ./Makefile.am
 -	  -e "s|\@PACKAGE\@|$(PACKAGE)|" \
 -	  $< > $@
 -
+-cupshelpers/config.py: cupshelpers/config.py.in Makefile
+-	$(mkdir_p) cupshelpers
+-	sed \
+-	  -e "s|\@prefix\@|$(prefix)|" \
+-	  -e "s|\@sysconfdir\@|$(sysconfdir)|" \
+-	  $< > $@
+-
 -# Use distutils to build the module.
--all-local: .stamp-distutils-in-builddir config.py
+-all-local: .stamp-distutils-in-builddir config.py cupshelpers/config.py
 -	$(PYTHON) setup.py build
 -
 -# Use distutils to install the module.
@@ -57,8 +71,8 @@ diff -ru ../system-config-printer-1.2.2/Makefile.am ./Makefile.am
 -# doesn't provide a way to do this itself.
 -uninstall-local:
 -	rm -f $(DESTDIR)/$(pythondir)/cupshelpers*.egg-info
--	for file in $(EXPORT_MODULES); do				\
--		rm -f $(DESTDIR)/$(pythondir)/$$file*;			\
+-	for file in $(EXPORT_MODULES) $(EXPORT_MODULES_GEN); do	\
+-		rm -f $(DESTDIR)/$(pythondir)/$$file*;		\
 -	done
 -
 -# Tell distutils to clean up.
@@ -66,7 +80,8 @@ diff -ru ../system-config-printer-1.2.2/Makefile.am ./Makefile.am
 -	-$(PYTHON) setup.py clean --all
 -	if [ "$(top_srcdir)" != "$(top_builddir)" ]; then	\
 -		rm -f setup.py;					\
--		for file in $(EXPORT_MODULES); do		\
+-		for file in $(EXPORT_MODULES)			\
+-			$(EXPORT_MODULES_GEN); do		\
 -			rm -f $$file*;				\
 -		done;						\
 -	fi
@@ -75,52 +90,80 @@ diff -ru ../system-config-printer-1.2.2/Makefile.am ./Makefile.am
  nobase_pkgdata_SCRIPTS=				\
  	check-device-ids.py			\
 -	pysmb.py				\
+ 	scp-dbus-service.py			\
  	system-config-printer.py		\
  	troubleshoot/__init__.py		\
- 	applet.py
-@@ -82,9 +14,7 @@
+@@ -95,33 +14,21 @@
  	asyncipp.py					\
  	asyncpk1.py					\
  	authconn.py					\
 -	config.py					\
  	cupspk.py					\
 -	debug.py					\
- 	dnssdresolve.py					\
+-	dnssdresolve.py					\
  	errordialogs.py					\
  	HIG.py						\
-@@ -95,23 +25,14 @@
+-	firewall.py					\
+ 	gui.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					\
  	timedops.py					\
  	ToolbarSearchEntry.py				\
  	userdefault.py					\
--	XmlHelper.py					\
- 	ui/AboutDialog.glade				\
- 	ui/ConnectDialog.glade				\
- 	ui/ConnectingDialog.glade			\
-@@ -173,11 +94,6 @@
+@@ -177,39 +84,10 @@
+ 	system-config-printer-applet		\
+ 	dbus/scp-dbus-service
+ 
+-if UDEV_RULES
+-udevrulesdir=$(sysconfdir)/udev/rules.d
+-udevrules_DATA=udev/70-printers.rules
+-udev_udev_configure_printer_SOURCES=\
+-	udev/udev-configure-printer.c
+-udev_udev_configure_printer_LDADD=-lcups -ludev -lusb $(GLIB_LIBS)
+-udev_udev_configure_printer_CFLAGS=$(AM_CFLAGS) $(GLIB_CFLAGS)
+-udevhelperdir=$(sysconfdir)/udev
+-udevhelper_PROGRAMS=\
+-	udev/udev-configure-printer
+-udevhelper_SCRIPTS=\
+-	udev/udev-add-printer
+-
+-if HAVE_SYSTEMD
+-%.service: %.service.in
+-	$(AM_V_GEN)sed -e 's,@udevhelperdir\@,$(udevhelperdir),g' $< > $@
+-systemdsystemunit_DATA = \
+-	udev/udev-configure-printer.service
+-CLEANFILES = \
+-	$(systemdsystemunit_DATA)
+-endif
+-
+-endif
+-
+ man_MANS=					\
  	man/system-config-printer.1		\
  	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/
 -
- desktop_DATA =\
- 	system-config-printer.desktop \
- 	print-applet.desktop \
+ dbusinterfaces_DATA =				\
+ 	dbus/org.fedoraproject.Config.Printing.xml
+ dbusinterfacesdir = $(datadir)/dbus-1/interfaces/
diff --git a/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.2.2.ebuild b/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.3.5.ebuild
index b8400750942f..45e73c95751c 100644
--- a/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.2.2.ebuild
+++ b/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.3.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.2.2.ebuild,v 1.9 2011/02/16 19:00:09 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.3.5.ebuild,v 1.1 2011/08/09 23:56:08 reavertm Exp $
 
 EAPI="3"
 
@@ -13,10 +13,10 @@ MY_P="${PN%-gnome}-${PV}"
 
 DESCRIPTION="GNOME frontend for a 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.2/${MY_P}.tar.xz"
+SRC_URI="http://cyberelk.net/tim/data/system-config-printer/1.3/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~sh ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
 SLOT="0"
 IUSE="gnome-keyring"
 
@@ -36,9 +36,9 @@ DEPEND="${RDEPEND}
 	sys-devel/gettext
 "
 
-APP_LINGUAS="ar as bg bn_IN bn bs ca cs cy da de el en_GB es et fa fi fr gu he
-hi hr hu hy id is it ja ka kn ko lo lv mai mk ml mr ms nb nl nn or pa pl pt_BR
-pt ro ru si sk sl sr@latin sr sv ta te th tr uk vi zh_CN zh_TW"
+APP_LINGUAS="ar as bg bn_IN bn br bs ca cs cy da de el en_GB es et fa fi fr gu
+he hi hr hu hy id is it ja ka kn ko lo lv mai mk ml mr ms nb nl nn or pa pl
+pt_BR pt ro ru si sk sl sr@latin sr sv ta te th tr uk vi zh_CN zh_TW"
 for X in ${APP_LINGUAS}; do
 	IUSE="${IUSE} linguas_${X}"
 done
@@ -50,10 +50,10 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}/${P}-split.patch"
-
-	# Upstream bug #587744
-	epatch "${FILESDIR}/${P}-cupspk-fileget-tmp.patch"
+	epatch "${FILESDIR}/${PN}-1.3.5-split.patch"
+	# Picked up from master just after tagging, remove for next release
+	epatch "${FILESDIR}/0001-Avoid-global-name-dbus-is-not-defined-traceback-in-s.patch"
+	epatch "${FILESDIR}/0003-Properties-dialog-make-OK-button-sensitive-even-when.patch"
 
 	eautoreconf
 }
@@ -68,15 +68,18 @@ src_configure() {
 		myconf="${myconf} --enable-nls"
 	fi
 
-	econf ${myconf}
+	econf \
+		--with-desktop-vendor=Gentoo \
+		--without-udev-rules \
+		${myconf}
 }
 
 src_install() {
 	dodoc AUTHORS ChangeLog README || die "dodoc failed"
 
-	emake DESTDIR="${D}" install || die "emake install failed"
+	emake DESTDIR="${ED}" install || die "emake install failed"
 
-	python_convert_shebangs -q -r $(python_get_version) "${D}"
+	python_convert_shebangs -q -r $(python_get_version) "${ED}"
 }
 
 pkg_postrm() {