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

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

5 files changed, 194 insertions, 15 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/Manifest b/app-admin/system-config-printer-common/Manifest
index 1b2d900e7d82..dd3ceeaef5d4 100644
--- a/app-admin/system-config-printer-common/Manifest
+++ b/app-admin/system-config-printer-common/Manifest
@@ -3,18 +3,19 @@ Hash: SHA1
 
 AUX system-config-printer-common-1.3.3-split.patch 4750 RMD160 5570ac03f404556d07c4d4034ed5dd17f29afcf3 SHA1 5bd72fd6b8adb757f089a97784bf1f2c21d25317 SHA256 391cf80675c55787afadb3ffe3556ad7830802b4f959b0e04838f00c5b1d7cbc
 AUX system-config-printer-common-1.3.5-split.patch 4624 RMD160 ec78e57b1cb15f0072193a9f31b2331111286840 SHA1 f0a23a1503d0e928d500dabfeeb530933969884f SHA256 fc865303bf8c40b8a2964fed7cad48c6e943312be1be631951cca5b3b81a490d
+AUX system-config-printer-common-1.3.9-split.patch 4636 RMD160 16e6068c2f26c439fe2a18c1201895e5ab965745 SHA1 4ceb5d0e3847f4922ee2eaa3a0edbdac254f35eb SHA256 bcd20fcd357ce1730e172b753b67a34679342b82881395bc72afc2feded20558
 DIST system-config-printer-1.3.6.tar.xz 988332 RMD160 6981d300468a547877345c7842b5930fbaf4cbb9 SHA1 7c2365b6f3dd0ccdedddcd9788d736227ce7858f SHA256 412f38c45d13763f69872b737f9b7885f0633704a4ef71eaae7b8c30e6dd7013
 DIST system-config-printer-1.3.7.tar.xz 990392 RMD160 26a88af68bd8d376c5aeed2e83a9dadf9b850a5f SHA1 7020aa0f07db4a2d301949468bb67fe4c1867712 SHA256 bd2d16b1b00e94b05178697c566b4434288557df8faf56a65a71fc4994cd5e4a
 DIST system-config-printer-1.3.9.tar.xz 992152 RMD160 ad15cc322eed989232d80c6a30466dc70c6f4720 SHA1 99bbacce31e295f33a72f324e794942219f38397 SHA256 86a655d6599484cafe57f11694d9e2d9767ece03328a8fc8254aa92c8162dfe0
 EBUILD system-config-printer-common-1.3.6.ebuild 2034 RMD160 6a5ce961b091433cf3d5b84a7fac0b88128c963a SHA1 9710025201dcc59b109331fdccc755de6816737d SHA256 b7265ecc347ee9da09518b8d2f8b64f84a8e9cc0bb9dcbe217e827514fab08ef
 EBUILD system-config-printer-common-1.3.7.ebuild 2045 RMD160 b94dbf929bd306fb100489dafe954d7cdc0eda33 SHA1 54723accdc1706fc54915089d6c8c5922c8a0665 SHA256 936dcb3cbb945bbe7e84a270ecb891e6cb023298cda695da17fe2909bb81da7b
-EBUILD system-config-printer-common-1.3.9.ebuild 2052 RMD160 afcdc6a75cead92ade046db41dd8952a45df4f61 SHA1 b89067907cbb42c1be25039148a3c652f10ae781 SHA256 9abcba736332ac5f36e73593681d673ac2325c4cdc37dd363575f3d151538a03
-MISC ChangeLog 12440 RMD160 b3baa772d6426d8352678fb32e6f0078358dec4c SHA1 6a84f11ac86f54c714ccd7c4a2f30bf9a947cf02 SHA256 d6c11ac54daea26d57d09eb34617ac6f6bfb097e85bccc6cc524ecfa4a0379d0
+EBUILD system-config-printer-common-1.3.9-r1.ebuild 2039 RMD160 64704403b407479186f6a0d148da880783c453c8 SHA1 5a9108a43addb8b31dd501d4540df3d2e583fb87 SHA256 1fe54ef3c0e7d54b4a5d5fa95c51a985c812cdc1b59487f03484209a3cf4c0d8
+MISC ChangeLog 12793 RMD160 fb87f678d7cb459c4d87ae35b6629ca766909ebe SHA1 f0ae7f3f0711d856e97f9f04354cc89f497568da SHA256 f067f5e2e9d5be880e2ff8b8f2a33d6fd28be2b62262648f8abc7173c8c4d465
 MISC metadata.xml 269 RMD160 cb38f7cfbdb499867255963abc339ddddf5a76df SHA1 ec25a6b2b03cc49b554ef0e822c1acad1384a3d0 SHA256 4093e60c94c1276d3fce2608e758ed73b067ae7af175d26df104f4df0fbe3e8a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk9VQTIACgkQFuHa/bHpVdsrtgCdGXBcuZ8ipbuY+YWTkkbrAUZX
-tmYAn3EzsUDhMDM4IczG3DtPJLph/DoI
-=hd2f
+iEYEARECAAYFAk9WuQ4ACgkQFuHa/bHpVdsgegCeJJMbTkfr4ZP0pQievHy6GpS3
+qI4AnR07KJ/UW/fBgK7lepmrdfqBxOov
+=W0XB
 -----END PGP SIGNATURE-----
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
 }
 
diff --git a/app-admin/system-config-printer-gnome/Manifest b/app-admin/system-config-printer-gnome/Manifest
index 048cd2a6e3c7..1f680e68c1d5 100644
--- a/app-admin/system-config-printer-gnome/Manifest
+++ b/app-admin/system-config-printer-gnome/Manifest
@@ -3,18 +3,19 @@ Hash: SHA1
 
 AUX system-config-printer-gnome-1.3.3-split.patch 4635 RMD160 c4243e7dec492973a183b1097ee730800367412c SHA1 c3596e27e0e97c50419604446133e970796a2712 SHA256 670e9229002768ed7393d2d7f15efb34f8e32fe80e134281951a3b521eec5992
 AUX system-config-printer-gnome-1.3.5-split.patch 4744 RMD160 bf5b566fe4d598714217de168454b5f9c46e4267 SHA1 a8c9334f08654640c71cf288999f11496feaa430 SHA256 979c929c2f0660265cf6b72a8c4186ed7f53a7e759e14ee5d7f4a49f36c7597a
+AUX system-config-printer-gnome-1.3.9-split.patch 5067 RMD160 4d0e309a9530e898d08d521d5cd84f0a36ba09b0 SHA1 d580d72bcb21e83cc502933cb8f4d32e5f426ccf SHA256 d66b817165adfa52a46347e03096206f8c5dd6e90d7ad1c673fcc20bfc91caae
 DIST system-config-printer-1.3.6.tar.xz 988332 RMD160 6981d300468a547877345c7842b5930fbaf4cbb9 SHA1 7c2365b6f3dd0ccdedddcd9788d736227ce7858f SHA256 412f38c45d13763f69872b737f9b7885f0633704a4ef71eaae7b8c30e6dd7013
 DIST system-config-printer-1.3.7.tar.xz 990392 RMD160 26a88af68bd8d376c5aeed2e83a9dadf9b850a5f SHA1 7020aa0f07db4a2d301949468bb67fe4c1867712 SHA256 bd2d16b1b00e94b05178697c566b4434288557df8faf56a65a71fc4994cd5e4a
 DIST system-config-printer-1.3.9.tar.xz 992152 RMD160 ad15cc322eed989232d80c6a30466dc70c6f4720 SHA1 99bbacce31e295f33a72f324e794942219f38397 SHA256 86a655d6599484cafe57f11694d9e2d9767ece03328a8fc8254aa92c8162dfe0
 EBUILD system-config-printer-gnome-1.3.6.ebuild 2109 RMD160 66cdf21ff0f23c72bbe4133003e01c43084c512c SHA1 49a473516d38ce5325882e8b303521125b70592a SHA256 94e660bc81d40d845da7054e3c2af7d051e531c3ef9ae5920b13479029acc493
 EBUILD system-config-printer-gnome-1.3.7.ebuild 2111 RMD160 542f4a1fe889bb65391d17bcd5bdee8a1f1f8cc6 SHA1 ac2898861b1e553560d0553d040965a30f958f18 SHA256 c4c009fc29e90c0fe9fbea0a5e1936ed1895bcf21659443580882c72be5e5ddd
-EBUILD system-config-printer-gnome-1.3.9.ebuild 2118 RMD160 15f2e231b32b036fe19185dc4275146920a4675b SHA1 f8596c72bdfe9492b36e6a48318c22f8285fe879 SHA256 d29b8055149e9f1cd46995af07aee1b801120112a1b88a16ed7d2a730de3ba1a
-MISC ChangeLog 9650 RMD160 8e4208c594a3f508ac290b430da2dea3b2ab471c SHA1 25344589c0aeac90c0bd97f7ac9310a4f6c5b964 SHA256 1f7bf62bec8aef9107102b7c58a4036f9b5c7c6ac93f990d29dff4f3d385724a
+EBUILD system-config-printer-gnome-1.3.9-r1.ebuild 2122 RMD160 5203cf166cd2969e4f9559c30368153482b01c51 SHA1 650c5683fac74f67cab6923ab295e2d2afb6d147 SHA256 b1248b570a23396550e62c97815c2c5054a5521d06c2a0bad8b7acc9a9fc50b0
+MISC ChangeLog 9969 RMD160 f1c7acc51f6d192aded8ac5aa09c6b96e6062ed0 SHA1 86f33e84c802dc8b6c0786376a2b067b01278bc0 SHA256 4a50f8fc057bf5829533bc86326cdf6380b6c5a4adc9b3206e18019977318fc2
 MISC metadata.xml 252 RMD160 8c0dceb057248a02146bb87873d7f25afeb40226 SHA1 65563cf99e07ac07ec7baee649fc226c1dac538b SHA256 1256bc57f3264caef8f73fdf5baec132d049621d1c704d3bd2dc263d43438c80
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk9VQXoACgkQFuHa/bHpVdtZmQCffU4tgJMYYdFy1nbf02lc3dJ8
-nNoAoK5CnlISctOZDFhRCuePGkqP7no9
-=ZddI
+iEYEARECAAYFAk9Wue0ACgkQFuHa/bHpVduGbACdFfaGcPs76zqbO8K5rbHECuKF
+O4QAoMmmtD9qMrHS3KoavsxgHK6xemrk
+=hHGF
 -----END PGP SIGNATURE-----