[kde-base/printer-applet,system-config-printer-kde] Sync dependencies with tree

19 files changed, 40 insertions, 58 deletions

diff --git a/Documentation/package.keywords/kde-4.3.d/more-deps b/Documentation/package.keywords/kde-4.3.d/more-deps
index 3f6b8f1a02b..565b3725b00 100644
--- a/Documentation/package.keywords/kde-4.3.d/more-deps
+++ b/Documentation/package.keywords/kde-4.3.d/more-deps
@@ -1,4 +1 @@
-=app-admin/system-config-printer-common-1.1*
-=app-misc/hal-cups-utils-0.6*
-=dev-python/pycups-1.9*
 x11-misc/google-gadgets
diff --git a/Documentation/package.keywords/kde-4.3.keywords b/Documentation/package.keywords/kde-4.3.keywords
index 14a0415548f..4119c318414 100644
--- a/Documentation/package.keywords/kde-4.3.keywords
+++ b/Documentation/package.keywords/kde-4.3.keywords
@@ -281,7 +281,4 @@ kde-base/kdesdk-meta:4.3
 kde-base/kdetoys-meta:4.3
 kde-base/kdeutils-meta:4.3
 kde-base/kdewebdev-meta:4.3
-=app-admin/system-config-printer-common-1.1*
-=app-misc/hal-cups-utils-0.6*
-=dev-python/pycups-1.9*
 x11-misc/google-gadgets
diff --git a/Documentation/package.keywords/kde-4.4.9999.d/more-deps b/Documentation/package.keywords/kde-4.4.9999.d/more-deps
index 43f95bd3949..1f0c915a270 100644
--- a/Documentation/package.keywords/kde-4.4.9999.d/more-deps
+++ b/Documentation/package.keywords/kde-4.4.9999.d/more-deps
@@ -1,10 +1,9 @@
-=app-admin/system-config-printer-common-1.1*
-=app-misc/hal-cups-utils-0.6*
+app-admin/system-config-printer-common
 =dev-db/virtuoso-odbc-6.1*
 =dev-db/virtuoso-server-6.1*
 dev-libs/libattica
 dev-libs/shared-desktop-ontologies
-=dev-python/pycups-1.9*
+dev-python/pycups
 >=net-libs/libssh-0.3.2
 >=sys-auth/polkit-0.95
 x11-misc/google-gadgets
diff --git a/Documentation/package.keywords/kde-4.4.9999.keywords b/Documentation/package.keywords/kde-4.4.9999.keywords
index 220087573e5..d493ca59082 100644
--- a/Documentation/package.keywords/kde-4.4.9999.keywords
+++ b/Documentation/package.keywords/kde-4.4.9999.keywords
@@ -285,13 +285,12 @@ media-sound/phonon
 ~kde-base/kdetoys-meta-4.4.9999 **
 ~kde-base/kdeutils-meta-4.4.9999 **
 ~kde-base/kdewebdev-meta-4.4.9999 **
-=app-admin/system-config-printer-common-1.1*
-=app-misc/hal-cups-utils-0.6*
+app-admin/system-config-printer-common
 =dev-db/virtuoso-odbc-6.1*
 =dev-db/virtuoso-server-6.1*
 dev-libs/libattica
 dev-libs/shared-desktop-ontologies
-=dev-python/pycups-1.9*
+dev-python/pycups
 >=net-libs/libssh-0.3.2
 >=sys-auth/polkit-0.95
 x11-misc/google-gadgets
diff --git a/Documentation/package.keywords/kde-4.4.d/more-deps b/Documentation/package.keywords/kde-4.4.d/more-deps
index 43f95bd3949..1f0c915a270 100644
--- a/Documentation/package.keywords/kde-4.4.d/more-deps
+++ b/Documentation/package.keywords/kde-4.4.d/more-deps
@@ -1,10 +1,9 @@
-=app-admin/system-config-printer-common-1.1*
-=app-misc/hal-cups-utils-0.6*
+app-admin/system-config-printer-common
 =dev-db/virtuoso-odbc-6.1*
 =dev-db/virtuoso-server-6.1*
 dev-libs/libattica
 dev-libs/shared-desktop-ontologies
-=dev-python/pycups-1.9*
+dev-python/pycups
 >=net-libs/libssh-0.3.2
 >=sys-auth/polkit-0.95
 x11-misc/google-gadgets
diff --git a/Documentation/package.keywords/kde-4.4.keywords b/Documentation/package.keywords/kde-4.4.keywords
index fc989acbc1e..70e6c9b2219 100644
--- a/Documentation/package.keywords/kde-4.4.keywords
+++ b/Documentation/package.keywords/kde-4.4.keywords
@@ -285,13 +285,12 @@ kde-base/kdesdk-meta:4.4
 kde-base/kdetoys-meta:4.4
 kde-base/kdeutils-meta:4.4
 kde-base/kdewebdev-meta:4.4
-=app-admin/system-config-printer-common-1.1*
-=app-misc/hal-cups-utils-0.6*
+app-admin/system-config-printer-common
 =dev-db/virtuoso-odbc-6.1*
 =dev-db/virtuoso-server-6.1*
 dev-libs/libattica
 dev-libs/shared-desktop-ontologies
-=dev-python/pycups-1.9*
+dev-python/pycups
 >=net-libs/libssh-0.3.2
 >=sys-auth/polkit-0.95
 x11-misc/google-gadgets
diff --git a/Documentation/package.keywords/kde-4.5.d/more-deps b/Documentation/package.keywords/kde-4.5.d/more-deps
index ed835700206..1b189ec1527 100644
--- a/Documentation/package.keywords/kde-4.5.d/more-deps
+++ b/Documentation/package.keywords/kde-4.5.d/more-deps
@@ -1,12 +1,11 @@
-=app-admin/system-config-printer-common-1.1*
-=app-misc/hal-cups-utils-0.6*
+app-admin/system-config-printer-common
 =dev-db/virtuoso-odbc-6.1*
 =dev-db/virtuoso-server-6.1*
 dev-libs/libdbusmenu-qt
 dev-libs/grantlee
 dev-libs/libattica
 dev-libs/shared-desktop-ontologies
-=dev-python/pycups-1.9*
+dev-python/pycups
 >=net-libs/libssh-0.3.2
 >=sys-auth/polkit-0.95
 x11-misc/google-gadgets
diff --git a/Documentation/package.keywords/kde-4.5.keywords b/Documentation/package.keywords/kde-4.5.keywords
index 76481f8b314..8c9d6ab4ee0 100644
--- a/Documentation/package.keywords/kde-4.5.keywords
+++ b/Documentation/package.keywords/kde-4.5.keywords
@@ -270,15 +270,14 @@ kde-base/kfilereplace:4.5
 kde-base/kimagemapeditor:4.5
 kde-base/klinkstatus:4.5
 kde-base/kommander:4.5
-=app-admin/system-config-printer-common-1.1*
-=app-misc/hal-cups-utils-0.6*
+app-admin/system-config-printer-common
 =dev-db/virtuoso-odbc-6.1*
 =dev-db/virtuoso-server-6.1*
 dev-libs/libdbusmenu-qt
 dev-libs/grantlee
 dev-libs/libattica
 dev-libs/shared-desktop-ontologies
-=dev-python/pycups-1.9*
+dev-python/pycups
 >=net-libs/libssh-0.3.2
 >=sys-auth/polkit-0.95
 x11-misc/google-gadgets
diff --git a/Documentation/package.keywords/kde-live.base/more-deps b/Documentation/package.keywords/kde-live.base/more-deps
index 425ca0e2eef..3fa44d1a904 100644
--- a/Documentation/package.keywords/kde-live.base/more-deps
+++ b/Documentation/package.keywords/kde-live.base/more-deps
@@ -1,12 +1,11 @@
-=app-admin/system-config-printer-common-1.1*
-=app-misc/hal-cups-utils-0.6*
+app-admin/system-config-printer-common
 =dev-db/virtuoso-odbc-6.1*
 =dev-db/virtuoso-server-6.1*
 dev-libs/grantlee
 dev-libs/libattica
 dev-libs/libdbusmenu-qt
 dev-libs/shared-desktop-ontologies
-=dev-python/pycups-1.9*
+dev-python/pycups
 >=net-libs/libssh-0.3.2
 >=sys-auth/polkit-0.95
 x11-misc/google-gadgets
diff --git a/Documentation/package.keywords/kde-live.d/more-deps b/Documentation/package.keywords/kde-live.d/more-deps
index 425ca0e2eef..3fa44d1a904 100644
--- a/Documentation/package.keywords/kde-live.d/more-deps
+++ b/Documentation/package.keywords/kde-live.d/more-deps
@@ -1,12 +1,11 @@
-=app-admin/system-config-printer-common-1.1*
-=app-misc/hal-cups-utils-0.6*
+app-admin/system-config-printer-common
 =dev-db/virtuoso-odbc-6.1*
 =dev-db/virtuoso-server-6.1*
 dev-libs/grantlee
 dev-libs/libattica
 dev-libs/libdbusmenu-qt
 dev-libs/shared-desktop-ontologies
-=dev-python/pycups-1.9*
+dev-python/pycups
 >=net-libs/libssh-0.3.2
 >=sys-auth/polkit-0.95
 x11-misc/google-gadgets
diff --git a/Documentation/package.keywords/kde-live.keywords b/Documentation/package.keywords/kde-live.keywords
index cc9efdfff20..6fabfcd4c6b 100644
--- a/Documentation/package.keywords/kde-live.keywords
+++ b/Documentation/package.keywords/kde-live.keywords
@@ -298,15 +298,14 @@
 ~kde-base/kdetoys-meta-9999 **
 ~kde-base/kdeutils-meta-9999 **
 ~kde-base/kdewebdev-meta-9999 **
-=app-admin/system-config-printer-common-1.1*
-=app-misc/hal-cups-utils-0.6*
+app-admin/system-config-printer-common
 =dev-db/virtuoso-odbc-6.1*
 =dev-db/virtuoso-server-6.1*
 dev-libs/grantlee
 dev-libs/libattica
 dev-libs/libdbusmenu-qt
 dev-libs/shared-desktop-ontologies
-=dev-python/pycups-1.9*
+dev-python/pycups
 >=net-libs/libssh-0.3.2
 >=sys-auth/polkit-0.95
 x11-misc/google-gadgets
diff --git a/kde-base/printer-applet/Manifest b/kde-base/printer-applet/Manifest
index ed9b6ea3eb8..314e124c984 100644
--- a/kde-base/printer-applet/Manifest
+++ b/kde-base/printer-applet/Manifest
@@ -1,5 +1,5 @@
 DIST kdeutils-4.4.75.tar.xz 3403780 RMD160 fb23eb3bdbc4e2926885b0e9b8bd8e283bc99f50 SHA1 c4a9571ed657f885e44f35d0b2bb717eacd23a12 SHA256 74c2cdf7df664e0847ac4fef6ede058fb83e017d829a8220366d2db4bd962830
-EBUILD printer-applet-4.4.75.ebuild 1171 RMD160 f48e537f833260f89bd75d1f819d11bfb35876be SHA1 29e47beda7b88a0cd570675d96c65b2ebe150f96 SHA256 6ad4c313509470fb3c2a421cbcf6bf706a782ddf344cf4c97dc983fd8f0152cc
-EBUILD printer-applet-4.4.9999.ebuild 1113 RMD160 229d4663961c1ce0607435a0bde37aa215e3ce72 SHA1 37fcf5f0fd74984feaf5e1a09cd5334297953292 SHA256 48814fab58a62467bd00d8c7d661110ff3c0943cb9bf38c35ff1adfb9012620a
-EBUILD printer-applet-9999.ebuild 1122 RMD160 7330225c0ca84852f39f3738ffa7bf7257f3b0ef SHA1 127c2d721e2461f01beec2f5c77cd66f48ac0f51 SHA256 ae3e02eee1461e9da503dd3973ca34d780c15a9fe2239cd919ebd8fb1ce4860d
+EBUILD printer-applet-4.4.75.ebuild 1119 RMD160 247fa164b08a142804e6116aacbc3222775571f2 SHA1 19a1e8ecf75162f32f3b0252aa03398d2b77ddb4 SHA256 580f1153ee11862987ebc15996f9e1759d33f71c7135a5d41106473a18eec85c
+EBUILD printer-applet-4.4.9999.ebuild 1070 RMD160 ab204a953a8b7eb769f47860df7f4e2235cf3032 SHA1 f3225eccc4d2b45846d661be88d601b9187c5403 SHA256 faa804976acb80f4f031ac6f6248b5bd647c5ad0eae2c05c6d7e30fd8852bfa5
+EBUILD printer-applet-9999.ebuild 1070 RMD160 ab204a953a8b7eb769f47860df7f4e2235cf3032 SHA1 f3225eccc4d2b45846d661be88d601b9187c5403 SHA256 faa804976acb80f4f031ac6f6248b5bd647c5ad0eae2c05c6d7e30fd8852bfa5
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-base/printer-applet/printer-applet-4.4.75.ebuild b/kde-base/printer-applet/printer-applet-4.4.75.ebuild
index 140d2fb9d8a..5eb4361f3cb 100644
--- a/kde-base/printer-applet/printer-applet-4.4.75.ebuild
+++ b/kde-base/printer-applet/printer-applet-4.4.75.ebuild
@@ -13,8 +13,7 @@ KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="+handbook"
 
 DEPEND="
-	>=app-admin/system-config-printer-common-1.1.18
-	app-misc/hal-cups-utils
+	>=app-admin/system-config-printer-common-1.2.2
 	$(add_kdebase_dep pykde4)
 "
 RDEPEND="${DEPEND}"
@@ -38,7 +37,7 @@ src_prepare() {
 
 src_install() {
 	kde4-meta_src_install
-	python_convert_shebangs -q -r $(python_get_version) "${ED}${PREFIX}/share/apps/${PN}"
+	python_convert_shebangs -q -r $(python_get_version) "${ED}"
 }
 
 pkg_postrm() {
diff --git a/kde-base/printer-applet/printer-applet-4.4.9999.ebuild b/kde-base/printer-applet/printer-applet-4.4.9999.ebuild
index 2f90129dc12..0029317b288 100644
--- a/kde-base/printer-applet/printer-applet-4.4.9999.ebuild
+++ b/kde-base/printer-applet/printer-applet-4.4.9999.ebuild
@@ -10,11 +10,10 @@ inherit python kde4-meta
 
 DESCRIPTION="KDE printer system tray utility"
 KEYWORDS=""
-IUSE=""
+IUSE="+handbook"
 
 DEPEND="
-	>=app-admin/system-config-printer-common-1.1.18
-	app-misc/hal-cups-utils
+	>=app-admin/system-config-printer-common-1.2.2
 	$(add_kdebase_dep pykde4)
 "
 RDEPEND="${DEPEND}"
@@ -38,7 +37,7 @@ src_prepare() {
 
 src_install() {
 	kde4-meta_src_install
-	python_convert_shebangs -q -r $(python_get_version) "${ED}${PREFIX}/share/apps/${PN}"
+	python_convert_shebangs -q -r $(python_get_version) "${ED}"
 }
 
 pkg_postrm() {
diff --git a/kde-base/printer-applet/printer-applet-9999.ebuild b/kde-base/printer-applet/printer-applet-9999.ebuild
index 34f93089e10..0029317b288 100644
--- a/kde-base/printer-applet/printer-applet-9999.ebuild
+++ b/kde-base/printer-applet/printer-applet-9999.ebuild
@@ -13,8 +13,7 @@ KEYWORDS=""
 IUSE="+handbook"
 
 DEPEND="
-	>=app-admin/system-config-printer-common-1.1.18
-	app-misc/hal-cups-utils
+	>=app-admin/system-config-printer-common-1.2.2
 	$(add_kdebase_dep pykde4)
 "
 RDEPEND="${DEPEND}"
@@ -38,7 +37,7 @@ src_prepare() {
 
 src_install() {
 	kde4-meta_src_install
-	python_convert_shebangs -q -r $(python_get_version) "${ED}${PREFIX}/share/apps/${PN}"
+	python_convert_shebangs -q -r $(python_get_version) "${ED}"
 }
 
 pkg_postrm() {
diff --git a/kde-base/system-config-printer-kde/Manifest b/kde-base/system-config-printer-kde/Manifest
index 2ab66a3cc80..42456dadfd9 100644
--- a/kde-base/system-config-printer-kde/Manifest
+++ b/kde-base/system-config-printer-kde/Manifest
@@ -1,5 +1,5 @@
 DIST kdeadmin-4.4.75.tar.xz 1196052 RMD160 23f458b30c6579661adf26176647f7dbbcd5ff87 SHA1 6c2bbe43e8f95b5d0090b5eb968b0df5073f67d4 SHA256 bea49dd5a972b1cb017403a19e6872f67c539eedc4918750266ff9600aa6fde4
-EBUILD system-config-printer-kde-4.4.75.ebuild 747 RMD160 449681271d6823bb82cf57dc4820c062ef0cb7fe SHA1 8feadb0072fb9b20fc516a189851a2c8431b3f5b SHA256 b87c4c49a3a1b76594410077138f06039129ac12d923fc0880d6cf03720a88c4
-EBUILD system-config-printer-kde-4.4.9999.ebuild 698 RMD160 49443ec37da0019720f556a3cffb5aaba7f2c1fd SHA1 bed7d82044ec4f6800afc296318df749d17df9ae SHA256 fb66835de8d82c309b0b38c133defaba460934d398b27148b61276891eecf543
-EBUILD system-config-printer-kde-9999.ebuild 698 RMD160 49443ec37da0019720f556a3cffb5aaba7f2c1fd SHA1 bed7d82044ec4f6800afc296318df749d17df9ae SHA256 fb66835de8d82c309b0b38c133defaba460934d398b27148b61276891eecf543
+EBUILD system-config-printer-kde-4.4.75.ebuild 720 RMD160 dd031cb35bdd2c66e8d8bacb608274f3a9824ec0 SHA1 2e52d5a7cbc214ec0367cd7adc91545f87b1c888 SHA256 95ec8f29cdb78b7a5ea09d63d921f0106e4a48872b9e0d63420f43ae6ea03e9f
+EBUILD system-config-printer-kde-4.4.9999.ebuild 671 RMD160 a60691f130c29e0f342ba72cacae9e7d2af53742 SHA1 218eff1c7fc3f4b704db1c75e2e245129bcfe91b SHA256 1ed310e4c8b46d1e1489a7b2174c54a5539d70c1b34018d5e05a447e62ae9020
+EBUILD system-config-printer-kde-9999.ebuild 671 RMD160 a60691f130c29e0f342ba72cacae9e7d2af53742 SHA1 218eff1c7fc3f4b704db1c75e2e245129bcfe91b SHA256 1ed310e4c8b46d1e1489a7b2174c54a5539d70c1b34018d5e05a447e62ae9020
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-base/system-config-printer-kde/system-config-printer-kde-4.4.75.ebuild b/kde-base/system-config-printer-kde/system-config-printer-kde-4.4.75.ebuild
index c473f0eaccb..f7c1695f5d3 100644
--- a/kde-base/system-config-printer-kde/system-config-printer-kde-4.4.75.ebuild
+++ b/kde-base/system-config-printer-kde/system-config-printer-kde-4.4.75.ebuild
@@ -13,8 +13,8 @@ KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 DEPEND="
-	>=app-admin/system-config-printer-common-1.1.18
-	>=dev-python/pycups-1.9.46
+	>=app-admin/system-config-printer-common-1.2.2
+	>=dev-python/pycups-1.9.49
 	$(add_kdebase_dep pykde4)
 "
 RDEPEND="${DEPEND}
@@ -28,7 +28,7 @@ pkg_setup() {
 
 src_install() {
 	kde4-meta_src_install
-	python_convert_shebangs -q -r $(python_get_version) "${ED}${PREFIX}/share/apps/${PN}"
+	python_convert_shebangs -q -r $(python_get_version) "${ED}"
 }
 
 pkg_postrm() {
diff --git a/kde-base/system-config-printer-kde/system-config-printer-kde-4.4.9999.ebuild b/kde-base/system-config-printer-kde/system-config-printer-kde-4.4.9999.ebuild
index 0a9e582d048..fc0482658fc 100644
--- a/kde-base/system-config-printer-kde/system-config-printer-kde-4.4.9999.ebuild
+++ b/kde-base/system-config-printer-kde/system-config-printer-kde-4.4.9999.ebuild
@@ -13,8 +13,8 @@ KEYWORDS=""
 IUSE=""
 
 DEPEND="
-	>=app-admin/system-config-printer-common-1.1.18
-	>=dev-python/pycups-1.9.46
+	>=app-admin/system-config-printer-common-1.2.2
+	>=dev-python/pycups-1.9.49
 	$(add_kdebase_dep pykde4)
 "
 RDEPEND="${DEPEND}
@@ -28,7 +28,7 @@ pkg_setup() {
 
 src_install() {
 	kde4-meta_src_install
-	python_convert_shebangs -q -r $(python_get_version) "${ED}${PREFIX}/share/apps/${PN}"
+	python_convert_shebangs -q -r $(python_get_version) "${ED}"
 }
 
 pkg_postrm() {
diff --git a/kde-base/system-config-printer-kde/system-config-printer-kde-9999.ebuild b/kde-base/system-config-printer-kde/system-config-printer-kde-9999.ebuild
index 0a9e582d048..fc0482658fc 100644
--- a/kde-base/system-config-printer-kde/system-config-printer-kde-9999.ebuild
+++ b/kde-base/system-config-printer-kde/system-config-printer-kde-9999.ebuild
@@ -13,8 +13,8 @@ KEYWORDS=""
 IUSE=""
 
 DEPEND="
-	>=app-admin/system-config-printer-common-1.1.18
-	>=dev-python/pycups-1.9.46
+	>=app-admin/system-config-printer-common-1.2.2
+	>=dev-python/pycups-1.9.49
 	$(add_kdebase_dep pykde4)
 "
 RDEPEND="${DEPEND}
@@ -28,7 +28,7 @@ pkg_setup() {
 
 src_install() {
 	kde4-meta_src_install
-	python_convert_shebangs -q -r $(python_get_version) "${ED}${PREFIX}/share/apps/${PN}"
+	python_convert_shebangs -q -r $(python_get_version) "${ED}"
 }
 
 pkg_postrm() {