More strict block to force uninstall of not compliant scp-gnome, add pycurl dependency.

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

3 files changed, 182 insertions, 5 deletions

diff --git a/app-admin/system-config-printer-common/ChangeLog b/app-admin/system-config-printer-common/ChangeLog
index 8be68b6b762a..d70ead1f4666 100644
--- a/app-admin/system-config-printer-common/ChangeLog
+++ b/app-admin/system-config-printer-common/ChangeLog
@@ -1,6 +1,15 @@
 # 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.61 2012/03/05 22:41:50 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-common/ChangeLog,v 1.62 2012/03/07 01:25:30 reavertm Exp $
+
+*system-config-printer-common-1.3.9-r1 (07 Mar 2012)
+
+  07 Mar 2012; Maciej Mrozowski <reavertm@gentoo.org>
+  +files/system-config-printer-common-1.3.9-split.patch,
+  +system-config-printer-common-1.3.9-r1.ebuild,
+  -system-config-printer-common-1.3.9.ebuild:
+  More strict block to force uninstall of not compliant scp-gnome, add pycurl
+  dependency.
 
 *system-config-printer-common-1.3.9 (05 Mar 2012)
 
diff --git a/app-admin/system-config-printer-common/files/system-config-printer-common-1.3.9-split.patch b/app-admin/system-config-printer-common/files/system-config-printer-common-1.3.9-split.patch
new file mode 100644
index 000000000000..c4accba60582
--- /dev/null
+++ b/app-admin/system-config-printer-common/files/system-config-printer-common-1.3.9-split.patch
@@ -0,0 +1,168 @@
+diff -ruN system-config-printer-1.3.9/Makefile.am my/Makefile.am
+--- system-config-printer-1.3.9/Makefile.am	2011-10-26 14:14:19.000000000 +0200
++++ my/Makefile.am	2012-03-07 00:24:32.843305586 +0100
+@@ -1,4 +1,4 @@
+-CFLAGS=-g -O2 -Wall
++CFLAGS=-Wall
+ 
+ SUBDIRS=po
+ 
+@@ -83,88 +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
++	check-device-ids.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
+ 
+@@ -172,11 +105,6 @@
+ cupshelpers_DATA=\
+ 	xml/preferreddrivers.xml
+ 
+-bin_SCRIPTS=					\
+-	system-config-printer			\
+-	system-config-printer-applet		\
+-	dbus/scp-dbus-service
+-
+ if UDEV_RULES
+ udevrulesdir=$(sysconfdir)/udev/rules.d
+ udevrules_DATA=udev/70-printers.rules
+@@ -201,56 +129,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/system-config-printer-common-1.3.9.ebuild b/app-admin/system-config-printer-common/system-config-printer-common-1.3.9-r1.ebuild
index c618fddfc117..e33c0b3b29b6 100644
--- a/app-admin/system-config-printer-common/system-config-printer-common-1.3.9.ebuild
+++ b/app-admin/system-config-printer-common/system-config-printer-common-1.3.9-r1.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.ebuild,v 1.1 2012/03/05 22:41:50 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-common/system-config-printer-common-1.3.9-r1.ebuild,v 1.1 2012/03/07 01:25:30 reavertm Exp $
 
 EAPI="3"
 
@@ -28,6 +28,7 @@ COMMON_DEPEND="
 	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-1.4.6[dbus]
 	>=sys-fs/udev-164-r2
@@ -39,8 +40,7 @@ DEPEND="${COMMON_DEPEND}
 	doc? ( dev-python/epydoc )
 "
 RDEPEND="${COMMON_DEPEND}
-	!app-admin/system-config-printer:0
-	!<app-admin/system-config-printer-gnome-${PV}
+	!<app-admin/system-config-printer-gnome-${PVR}
 	policykit? ( sys-auth/polkit )
 "
 
@@ -51,7 +51,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.3.5-split.patch"
+	epatch "${FILESDIR}/${PN}-1.3.9-split.patch"
 	eautoreconf
 }