Version bump, remove old, bug 319989

(Portage version: 2.2_rc67/cvs/Linux x86_64)

4 files changed, 67 insertions, 34 deletions

diff --git a/app-admin/system-config-printer-gnome/ChangeLog b/app-admin/system-config-printer-gnome/ChangeLog
index ee36dbacf8ae..9489137e6ce4 100644
--- a/app-admin/system-config-printer-gnome/ChangeLog
+++ b/app-admin/system-config-printer-gnome/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-admin/system-config-printer-gnome
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-gnome/ChangeLog,v 1.5 2010/05/16 14:58:28 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-gnome/ChangeLog,v 1.6 2010/05/17 19:12:39 reavertm Exp $
+
+*system-config-printer-gnome-1.2.2 (17 May 2010)
+
+  17 May 2010; Maciej Mrozowski <reavertm@gentoo.org>
+  -system-config-printer-gnome-1.1.18-r1.ebuild,
+  -files/system-config-printer-gnome-1.1.18-split.patch,
+  +system-config-printer-gnome-1.2.2.ebuild,
+  +files/system-config-printer-gnome-1.2.2-split.patch:
+  Version bump, remove old, bug 319989
 
   16 May 2010; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Fix maintainer's email.
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
new file mode 100644
index 000000000000..a62e1106f47e
--- /dev/null
+++ b/app-admin/system-config-printer-gnome/files/system-config-printer-gnome-1.2.2-cupspk-fileget-tmp.patch
@@ -0,0 +1,29 @@
+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.1.18-split.patch b/app-admin/system-config-printer-gnome/files/system-config-printer-gnome-1.2.2-split.patch
index 546583592f73..9a7ba2d1fc12 100644
--- a/app-admin/system-config-printer-gnome/files/system-config-printer-gnome-1.1.18-split.patch
+++ b/app-admin/system-config-printer-gnome/files/system-config-printer-gnome-1.2.2-split.patch
@@ -1,18 +1,7 @@
-diff -ru ../system-config-printer-1.1.18/configure.in ./configure.in
---- ../system-config-printer-1.1.18/configure.in	2010-03-10 10:33:54.000000000 +0100
-+++ ./configure.in	2010-03-11 02:52:12.740702738 +0100
-@@ -1,6 +1,6 @@
- AC_INIT(system-config-printer, 1.1.18)
- 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.18/Makefile.am ./Makefile.am
---- ../system-config-printer-1.1.18/Makefile.am	2010-03-10 10:33:45.000000000 +0100
-+++ ./Makefile.am	2010-03-11 02:54:55.390957640 +0100
-@@ -2,78 +2,9 @@
+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 @@
  
  SUBDIRS=po
  
@@ -53,7 +42,6 @@ diff -ru ../system-config-printer-1.1.18/Makefile.am ./Makefile.am
 -	  -e "s|\@localedir\@|$(localedir)|" \
 -	  -e "s|\@VERSION\@|$(VERSION)|" \
 -	  -e "s|\@PACKAGE\@|$(PACKAGE)|" \
--	  -e "s|\@WITH_POLKIT_1\@|$(WITH_POLKIT_1)|" \
 -	  $< > $@
 -
 -# Use distutils to build the module.
@@ -85,26 +73,25 @@ diff -ru ../system-config-printer-1.1.18/Makefile.am ./Makefile.am
 -	rm -f .stamp-distutils-in-builddir
 -
  nobase_pkgdata_SCRIPTS=				\
- 	my-default-printer.py			\
  	check-device-ids.py			\
 -	pysmb.py				\
  	system-config-printer.py		\
  	troubleshoot/__init__.py		\
  	applet.py
-@@ -85,9 +16,7 @@
- 	asyncpk0.py					\
+@@ -82,9 +14,7 @@
+ 	asyncipp.py					\
  	asyncpk1.py					\
  	authconn.py					\
 -	config.py					\
  	cupspk.py					\
 -	debug.py					\
+ 	dnssdresolve.py					\
  	errordialogs.py					\
  	HIG.py						\
- 	firewall.py					\
-@@ -96,22 +25,13 @@
- 	GroupsPaneModel.py				\
+@@ -95,23 +25,14 @@
  	gtkinklevel.py					\
  	gtkspinner.py					\
+ 	installdriver.py				\
 -	installpackage.py				\
  	jobviewer.py					\
 -	monitor.py					\
@@ -112,6 +99,7 @@ diff -ru ../system-config-printer-1.1.18/Makefile.am ./Makefile.am
  	optionwidgets.py				\
 -	PhysicalDevice.py				\
 -	ppdippstr.py					\
+ 	ppdsloader.py					\
 -	probe_printer.py				\
  	gtk_label_autowrap.py				\
 -	SearchCriterion.py				\
@@ -121,15 +109,18 @@ diff -ru ../system-config-printer-1.1.18/Makefile.am ./Makefile.am
  	ToolbarSearchEntry.py				\
  	userdefault.py					\
 -	XmlHelper.py					\
- 	glade/AboutDialog.glade				\
- 	glade/ConnectDialog.glade			\
- 	glade/ConnectingDialog.glade			\
-@@ -173,8 +93,6 @@
+ 	ui/AboutDialog.glade				\
+ 	ui/ConnectDialog.glade				\
+ 	ui/ConnectingDialog.glade			\
+@@ -173,11 +94,6 @@
  	man/system-config-printer.1		\
  	man/system-config-printer-applet.1
  
--dbus_DATA =\
--	newprinternotification.conf
- dbusdir = $(sysconfdir)/dbus-1/system.d/
- 
+-dbus_DATA =					\
+-	newprinternotification.conf		\
+-	printerdriversinstaller.conf
+-dbusdir = $(sysconfdir)/dbus-1/system.d/
+-
  desktop_DATA =\
+ 	system-config-printer.desktop \
+ 	print-applet.desktop \
diff --git a/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.1.18-r1.ebuild b/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.2.2.ebuild
index 4603d22869db..a519f0bfc801 100644
--- a/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.1.18-r1.ebuild
+++ b/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.2.2.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2010 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.1.18-r1.ebuild,v 1.3 2010/03/31 14:50:50 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.2.2.ebuild,v 1.1 2010/05/17 19:12:39 reavertm Exp $
 
 EAPI="3"
+
 PYTHON_DEPEND="2"
 inherit python autotools
 
@@ -10,7 +11,7 @@ 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.1/${MY_P}.tar.bz2"
+SRC_URI="http://cyberelk.net/tim/data/system-config-printer/1.2/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~x86"
@@ -51,6 +52,9 @@ pkg_setup() {
 src_prepare() {
 	epatch "${FILESDIR}/${P}-split.patch"
 
+	# Upstream bug #587744
+	epatch "${FILESDIR}/${P}-cupspk-fileget-tmp.patch"
+
 	eautoreconf
 }
 
@@ -72,7 +76,7 @@ src_install() {
 
 	emake DESTDIR="${D}" install || die "emake install failed"
 
-	python_convert_shebangs -q -r $(python_get_version) "${D}"usr/share/system-config-printer
+	python_convert_shebangs -q -r $(python_get_version) "${D}"
 }
 
 pkg_postrm() {