Do not install newprinter.py and related dbus services (they are too UI specific)

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

5 files changed, 31 insertions, 13 deletions

diff --git a/app-admin/system-config-printer-common/ChangeLog b/app-admin/system-config-printer-common/ChangeLog
index 961f177a4bfe..325106a5bc6e 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-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-common/ChangeLog,v 1.29 2011/02/16 19:27:35 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-common/ChangeLog,v 1.30 2011/02/16 19:57:04 reavertm Exp $
+
+*system-config-printer-common-1.3.0-r1 (16 Feb 2011)
+
+  16 Feb 2011; Maciej Mrozowski <reavertm@gentoo.org>
+  -system-config-printer-common-1.3.0.ebuild,
+  +system-config-printer-common-1.3.0-r1.ebuild,
+  files/system-config-printer-common-1.3.0-split.patch:
+  Do not install newprinter.py and related dbus services (they are too UI
+  specific)
 
 *system-config-printer-common-1.3.0 (16 Feb 2011)
 
diff --git a/app-admin/system-config-printer-common/Manifest b/app-admin/system-config-printer-common/Manifest
index 39ff42e81b2b..04e0395db0b7 100644
--- a/app-admin/system-config-printer-common/Manifest
+++ b/app-admin/system-config-printer-common/Manifest
@@ -1,7 +1,7 @@
 AUX system-config-printer-common-1.1.13-split.patch 5024 RMD160 f91fd13b5e9d112795cfb8e323253467a9943cb3 SHA1 4eb6b81ff33120e735a0aaf90df9c5562bf47560 SHA256 f17e98e85d6fb61047af3e2d2f9d9249d7a5ed538bfafc3930757f07c964e56d
 AUX system-config-printer-common-1.2.2-split.patch 4415 RMD160 99f2b5713819af743822d937c7cf85e4ac9c0c7e SHA1 61316652a803d954527856b87d176e60662e8ee6 SHA256 7c983e148ccf067d1c43b8b50042069ad13a54899340ff794c30b3d9a3218c00
 AUX system-config-printer-common-1.2.6-split.patch 4399 RMD160 bedb5f2c530074e019ddc9670d57ad3686bec520 SHA1 7790cca6b9df369b5cf4eed5424bf60d5b46e814 SHA256 8767bccfa3c35af11413c46019523fe14e5d56b509283cc53d5e25d78c8fb0cb
-AUX system-config-printer-common-1.3.0-split.patch 4575 RMD160 869065155f70ea589cda229e8d8c9ac22e479bde SHA1 6906899773b4dadec100244d47f752bd695c7463 SHA256 8437441aff8587072cf99cbe5e0c655441c02c2cfe744024bd6bdb53221fd574
+AUX system-config-printer-common-1.3.0-split.patch 4750 RMD160 925e90b91b4a46252f49fc7e728b4dc9172d7074 SHA1 cf577facdf28da9f9855e623231a3f665e2a6051 SHA256 4d5b0a3df6ce3eec76cf55c3183dfcc7127554b2733b38012e8cdaa07eeb0f0a
 DIST system-config-printer-1.1.13.tar.bz2 1014102 RMD160 eaa7b24bc30719a836749c06f72eb502b2fe5ac5 SHA1 9a193cca59f07dd1da97c7a76d26a33c1c57df21 SHA256 6842e337101dd7924d0c02317eff3b2b32d42a6ba7a70ae51fa8ebd51db15da2
 DIST system-config-printer-1.2.2.tar.xz 904696 RMD160 48c3d4a08b936d8e33ab507fd2d6e817fc3204cc SHA1 dea6e56c190d8ae7a78ebf1e707ce4c31ffcfd74 SHA256 3d581c101cda47af92098378e4b3750144de8f5357675145866761aabad64377
 DIST system-config-printer-1.2.6.tar.xz 958376 RMD160 d0fbfd0911a01e7ea7c9852bf5328ce44944c01e SHA1 84e90138984e7db411c5540ad14ef5eeda6f874a SHA256 5666bd67c032edab772ef2b5e341404b9ccb48bcb572d1bf65ab465448ed7c2b
@@ -9,6 +9,6 @@ DIST system-config-printer-1.3.0.tar.xz 971196 RMD160 94720e3e90710218dfa16041bc
 EBUILD system-config-printer-common-1.1.13.ebuild 1414 RMD160 0e22a0bca9bb774fabfc5ae66dfbd34d139e7357 SHA1 e1600483c4f790174c0913e3f026f17506785656 SHA256 13490fae0b4e96bd81ce28b45ca814b0b25fa829b3f2948fa445dd86c805419f
 EBUILD system-config-printer-common-1.2.2.ebuild 1853 RMD160 1e26a73647947dd9e6a4f71b9e14f6d7c7f47caa SHA1 8f85d76b33e97fab1527e874cdfa56682e629500 SHA256 be9b9468348b7fa6beeb94e3c6c9b6eb6c9080b8ac8582bd9b6b3bc21e8a9329
 EBUILD system-config-printer-common-1.2.6.ebuild 1967 RMD160 773cdbbae14c5065c140589a7c2314a8859adaef SHA1 48cc57a202e9b637df3bae57d1ad9558b0174a44 SHA256 2d9925e7e7a245069417bb49cedb53df44de8504097bdb8566e122002704b582
-EBUILD system-config-printer-common-1.3.0.ebuild 1967 RMD160 f774c7499edf86592a070058a5e0bb7682fbdb92 SHA1 d7abbd628acb8b989a5fea5733b9e1ea4095fcc7 SHA256 f7560bf29a22b18c16fe7cdbbe3fb6d9d8539a9daf9b92f9c7f52254beb99373
-MISC ChangeLog 6187 RMD160 b10f7134c4296acc9e6fb507dc37ec51fc948bed SHA1 5ecd31f6afb8900dd9fa2ad7eb9044176853a8e1 SHA256 d5be96624c09d0c7bcb388713cbe96195a50e379f5dfb4c51657af981a93b430
+EBUILD system-config-printer-common-1.3.0-r1.ebuild 1970 RMD160 6614d3efbef668e3a2339612a99c3420deb0bd2b SHA1 b386762c3b36f9ed7de16e959acbff78fd2fd99b SHA256 5c66b2d8236f2b97824763b5e31637f6d564745cdac288c1eba8c3d32fcfa880
+MISC ChangeLog 6533 RMD160 53c43513904d7819e0bda0c995bc1bed7b5220f0 SHA1 f3de4afd4fee0c3dc69d5191e8f94be64fbd15ed SHA256 755e41d5c56cfd3f162f05a276ab5d421d9c6a5555cae09dda8d64243d07de95
 MISC metadata.xml 250 RMD160 808009b9f58fce9939f063485d0b4d169284835b SHA1 c1c82594f1e4863d60b9cc13738c38c9f037959c SHA256 2de207fcfb05447fa92af07c30ac1bf8422377ba2f555a8685833778611f2a94
diff --git a/app-admin/system-config-printer-common/files/system-config-printer-common-1.3.0-split.patch b/app-admin/system-config-printer-common/files/system-config-printer-common-1.3.0-split.patch
index 3a6b7d45e6d8..c30b9b3ae538 100644
--- a/app-admin/system-config-printer-common/files/system-config-printer-common-1.3.0-split.patch
+++ b/app-admin/system-config-printer-common/files/system-config-printer-common-1.3.0-split.patch
@@ -1,13 +1,13 @@
 diff -ruN system-config-printer-1.3.0/Makefile.am my/Makefile.am
 --- system-config-printer-1.3.0/Makefile.am	2011-02-16 14:02:45.000000000 +0100
-+++ my/Makefile.am	2011-02-16 20:19:11.586000001 +0100
++++ my/Makefile.am	2011-02-16 20:48:09.990000001 +0100
 @@ -1,4 +1,4 @@
 -AM_CFLAGS=-g -O2 -Wall $(GLIB_CFLAGS)
 +AM_CFLAGS=-Wall $(GLIB_CFLAGS)
  
  SUBDIRS=po
  
-@@ -83,102 +83,23 @@
+@@ -83,102 +83,22 @@
  	rm -f .stamp-distutils-in-builddir
  
  nobase_pkgdata_SCRIPTS=				\
@@ -39,7 +39,7 @@ diff -ruN system-config-printer-1.3.0/Makefile.am my/Makefile.am
  	installpackage.py				\
 -	jobviewer.py					\
  	monitor.py					\
- 	newprinter.py					\
+-	newprinter.py					\
 -	options.py					\
 -	optionwidgets.py				\
  	PhysicalDevice.py				\
@@ -112,7 +112,7 @@ diff -ruN system-config-printer-1.3.0/Makefile.am my/Makefile.am
  
  if UDEV_RULES
  udevrulesdir=$(sysconfdir)/udev/rules.d
-@@ -193,10 +114,6 @@
+@@ -193,56 +113,17 @@
  	udev/udev-add-printer
  endif
  
@@ -123,10 +123,16 @@ diff -ruN system-config-printer-1.3.0/Makefile.am my/Makefile.am
  dbus_DATA =					\
  	dbus/com.redhat.NewPrinterNotification.conf		\
  	dbus/com.redhat.PrinterDriversInstaller.conf
-@@ -210,39 +127,12 @@
- 	dbus/org.fedoraproject.Config.Printing.service
- dbusservicesdir = $(datadir)/dbus-1/services/
+ 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
diff --git a/app-admin/system-config-printer-common/system-config-printer-common-1.3.0.ebuild b/app-admin/system-config-printer-common/system-config-printer-common-1.3.0-r1.ebuild
index 328e8b2e642d..22c0d25089e7 100644
--- a/app-admin/system-config-printer-common/system-config-printer-common-1.3.0.ebuild
+++ b/app-admin/system-config-printer-common/system-config-printer-common-1.3.0-r1.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-common/system-config-printer-common-1.3.0.ebuild,v 1.1 2011/02/16 19:27:35 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-common/system-config-printer-common-1.3.0-r1.ebuild,v 1.1 2011/02/16 19:57:04 reavertm Exp $
 
 EAPI="3"
 
diff --git a/app-admin/system-config-printer-gnome/Manifest b/app-admin/system-config-printer-gnome/Manifest
index 2fac7370f4ce..bca5cfd4f2d1 100644
--- a/app-admin/system-config-printer-gnome/Manifest
+++ b/app-admin/system-config-printer-gnome/Manifest
@@ -2,9 +2,12 @@ AUX system-config-printer-gnome-1.2.2-cupspk-fileget-tmp.patch 1573 RMD160 cf90a
 AUX system-config-printer-gnome-1.2.2-split.patch 3512 RMD160 906e2e0967b63e5891ba220cb71816fa62b4fa16 SHA1 43b1bf60f1a4f7668fdd1f58ec7ba0813d08723a SHA256 56d29c283a2f2e243bf6d19f6b6327fc06262e812e7306f8aa6e6e332044bc35
 AUX system-config-printer-gnome-1.2.3-split.patch 3967 RMD160 444988ae79f2cbb8fabad3634cb075b6c4bc20f1 SHA1 4dac4e401880a46b52e6f485a96b9ee6d306af72 SHA256 eaf0c3e9a344cc04c41656c4351a6fc42962ccef46ca1e68b74a918aca48838b
 AUX system-config-printer-gnome-1.2.6-split.patch 4041 RMD160 9114af5a5969583fc9a14b94349591fa207ca9fd SHA1 7e60cc7aa738c065b4d1cf856f1f6f609a8e1172 SHA256 b4bc2a140a1f50a5fed68ba8ffe1bcd152ce81cb2322a2a71561870f7946e726
+AUX system-config-printer-gnome-1.3.0-split.patch 4636 RMD160 5b4068c3920ee710e3fd4e8b01a71e5da5f97a03 SHA1 4b920ac9e4f4467569372d0a184d909e5470231b SHA256 5593256a7d6cf0b04e65c47406031efb89cdc0a7490855fe3917bc2c43ede111
 DIST system-config-printer-1.2.2.tar.xz 904696 RMD160 48c3d4a08b936d8e33ab507fd2d6e817fc3204cc SHA1 dea6e56c190d8ae7a78ebf1e707ce4c31ffcfd74 SHA256 3d581c101cda47af92098378e4b3750144de8f5357675145866761aabad64377
 DIST system-config-printer-1.2.6.tar.xz 958376 RMD160 d0fbfd0911a01e7ea7c9852bf5328ce44944c01e SHA1 84e90138984e7db411c5540ad14ef5eeda6f874a SHA256 5666bd67c032edab772ef2b5e341404b9ccb48bcb572d1bf65ab465448ed7c2b
+DIST system-config-printer-1.3.0.tar.xz 971196 RMD160 94720e3e90710218dfa16041bc5f18fe54ea6ed1 SHA1 e817788338138fbc063ba5eb9c92d16fb1adee6a SHA256 2ec1a425a1235ee41452b53b904b23f33ad66b7260c26b76a2a3a76df6bdd01f
 EBUILD system-config-printer-gnome-1.2.2.ebuild 2031 RMD160 bfb81ca1a0b1b1cad5af5a17e5da6706bb4c1109 SHA1 baf1275973d6a9b2f35731919e767b5fa7fe07a7 SHA256 4e953327bc9aa5dde5417a67b77a768e24165a7d97ecc4bd8364d96d14c98222
 EBUILD system-config-printer-gnome-1.2.6.ebuild 2042 RMD160 3ae0fea5a08bb6c704683393efc259d4077ded35 SHA1 0b995f9f0ea1b6913ad3ea915073676d3f77be35 SHA256 ecf566254b5e527b3082c3c5342247b447c39146835a611508d7f30ecd6fd827
-MISC ChangeLog 4565 RMD160 de773842f645b12898a9fa7cabfd119600569516 SHA1 8f23a07d850d04ef34d491412376cdaad04eb957 SHA256 4c53ed1739be778101019268b09e9f57047637d39f825ba676e65f4b470837a0
+EBUILD system-config-printer-gnome-1.3.0.ebuild 2042 RMD160 c6560fd17209e72ca8fb299e4bb7d6cd21ceedd7 SHA1 705a86fe3b860f23d90bc4a61be97fc84daf962f SHA256 dbe58dd3c38bb6518b5eb31de5707bed952bb9f7a219940d5cc8e4d6ff634ef7
+MISC ChangeLog 4839 RMD160 c0738edd560714e62e46faee33c42684cd93346b SHA1 bc4b9f845ea78bed3ffdec755b0e9050de5323f0 SHA256 9140eadf2dd14a4f0b4020820e715025f65f51163a84373ebdf7c720903f21ac
 MISC metadata.xml 252 RMD160 8c0dceb057248a02146bb87873d7f25afeb40226 SHA1 65563cf99e07ac07ec7baee649fc226c1dac538b SHA256 1256bc57f3264caef8f73fdf5baec132d049621d1c704d3bd2dc263d43438c80