[gentoo-commits] proj/kde:master commit in: kde-base/print-manager/

[gentoo-commits] proj/kde:master commit in: kde-base/print-manager/

[Johannes Huber]

commit:     486799cd6088364bae695177b4031d8e73bdd7b1
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 20 12:27:29 2012 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu Sep 20 12:52:08 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=486799cd

[kde-base/print-manager] New package. Moved from kde-misc. Will be part of KDE SC 4.10.

(Portage version: 2.2.0_alpha129/git/Linux x86_64, unsigned Manifest commit)

---
 kde-base/print-manager/metadata.xml              |    5 ++++
 kde-base/print-manager/print-manager-9999.ebuild |   23 ++++++++++++++++++++++
 2 files changed, 28 insertions(+), 0 deletions(-)

diff --git a/kde-base/print-manager/metadata.xml b/kde-base/print-manager/metadata.xml
new file mode 100644
index 0000000..8d1e86a
--- /dev/null
+++ b/kde-base/print-manager/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>kde</herd>
+</pkgmetadata>

diff --git a/kde-base/print-manager/print-manager-9999.ebuild b/kde-base/print-manager/print-manager-9999.ebuild
new file mode 100644
index 0000000..0d443cb
--- /dev/null
+++ b/kde-base/print-manager/print-manager-9999.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+inherit kde4-base
+
+DESCRIPTION="Manage print jobs and printers in KDE"
+KEYWORDS=""
+IUSE="debug"
+
+DEPEND="
+	>=net-print/cups-1.6.0[dbus]
+"
+RDEPEND="${DEPEND}
+	!kde-misc/print-manager
+"
+
+src_configure() {
+	mycmakeargs=( -DCUPS_1_6=ON )
+	kde4-base_src_configure
+}

[gentoo-commits] proj/kde:master commit in: kde-base/print-manager/

[Johannes Huber]

commit:     823cc1b6fbb39fbdffee6ca95d85dd6bc35251cc
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 20 12:43:03 2012 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu Sep 20 12:52:09 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=823cc1b6

[kde-base/print-manager] Block kde-base/printer-applet.

(Portage version: 2.2.0_alpha129/git/Linux x86_64, unsigned Manifest commit)

---
 kde-base/print-manager/print-manager-9999.ebuild |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/kde-base/print-manager/print-manager-9999.ebuild b/kde-base/print-manager/print-manager-9999.ebuild
index 0d443cb..1a02ee5 100644
--- a/kde-base/print-manager/print-manager-9999.ebuild
+++ b/kde-base/print-manager/print-manager-9999.ebuild
@@ -17,6 +17,8 @@ RDEPEND="${DEPEND}
 	!kde-misc/print-manager
 "
 
+add_blocker printer-applet
+
 src_configure() {
 	mycmakeargs=( -DCUPS_1_6=ON )
 	kde4-base_src_configure

[gentoo-commits] proj/kde:master commit in: kde-base/print-manager/

[Johannes Huber]

commit:     7486e1ac6bd03515ef872c0c39622b3da8ce695d
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 21 07:28:09 2012 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Fri Sep 21 07:28:17 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=7486e1ac

[kde-base/print-manager] Block kde-base/system-config-printer-kde.

(Portage version: 2.2.0_alpha129/git/Linux x86_64, unsigned Manifest commit)

---
 kde-base/print-manager/print-manager-9999.ebuild |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/kde-base/print-manager/print-manager-9999.ebuild b/kde-base/print-manager/print-manager-9999.ebuild
index 1a02ee5..702984a 100644
--- a/kde-base/print-manager/print-manager-9999.ebuild
+++ b/kde-base/print-manager/print-manager-9999.ebuild
@@ -18,6 +18,7 @@ RDEPEND="${DEPEND}
 "
 
 add_blocker printer-applet
+add_blocker system-config-printer-kde
 
 src_configure() {
 	mycmakeargs=( -DCUPS_1_6=ON )

[gentoo-commits] proj/kde:master commit in: kde-base/print-manager/

[Andreas Hüttel]

commit:     82b26a9b7e01af96e5a99700d9029b9c843d1269
Author:     Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 24 00:34:22 2013 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Mar 24 00:34:22 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=82b26a9b

[kde-base/print-manager] Dependency on Cups-1.6 not really needed anymore

Package-Manager: portage-2.2.0_alpha169

---
 .../print-manager-4.10.49.9999.ebuild              |    7 +------
 kde-base/print-manager/print-manager-9999.ebuild   |    7 +------
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/kde-base/print-manager/print-manager-4.10.49.9999.ebuild b/kde-base/print-manager/print-manager-4.10.49.9999.ebuild
index 24411a4..e61059a 100644
--- a/kde-base/print-manager/print-manager-4.10.49.9999.ebuild
+++ b/kde-base/print-manager/print-manager-4.10.49.9999.ebuild
@@ -11,7 +11,7 @@ KEYWORDS=""
 IUSE="debug"
 
 DEPEND="
-	>=net-print/cups-1.6.0[dbus]
+	net-print/cups[dbus]
 "
 RDEPEND="${DEPEND}
 	!kde-misc/print-manager
@@ -19,8 +19,3 @@ RDEPEND="${DEPEND}
 
 add_blocker printer-applet
 add_blocker system-config-printer-kde
-
-src_configure() {
-	mycmakeargs=( -DCUPS_1_6=ON )
-	kde4-base_src_configure
-}

diff --git a/kde-base/print-manager/print-manager-9999.ebuild b/kde-base/print-manager/print-manager-9999.ebuild
index 24411a4..e61059a 100644
--- a/kde-base/print-manager/print-manager-9999.ebuild
+++ b/kde-base/print-manager/print-manager-9999.ebuild
@@ -11,7 +11,7 @@ KEYWORDS=""
 IUSE="debug"
 
 DEPEND="
-	>=net-print/cups-1.6.0[dbus]
+	net-print/cups[dbus]
 "
 RDEPEND="${DEPEND}
 	!kde-misc/print-manager
@@ -19,8 +19,3 @@ RDEPEND="${DEPEND}
 
 add_blocker printer-applet
 add_blocker system-config-printer-kde
-
-src_configure() {
-	mycmakeargs=( -DCUPS_1_6=ON )
-	kde4-base_src_configure
-}

[gentoo-commits] proj/kde:master commit in: kde-base/print-manager/

[Andreas Hüttel]

commit:     a17585b1f01666981a95f9a4aab92c13eac870dd
Author:     Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Apr  6 18:05:54 2013 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Apr  6 18:05:54 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=a17585b1

[kde-base/print-manager] Require at least cups-1.5, bug 464588

Package-Manager: portage-2.2.0_alpha171

---
 .../print-manager-4.10.49.9999.ebuild              |    2 +-
 kde-base/print-manager/print-manager-9999.ebuild   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kde-base/print-manager/print-manager-4.10.49.9999.ebuild b/kde-base/print-manager/print-manager-4.10.49.9999.ebuild
index e61059a..dc5ab65 100644
--- a/kde-base/print-manager/print-manager-4.10.49.9999.ebuild
+++ b/kde-base/print-manager/print-manager-4.10.49.9999.ebuild
@@ -11,7 +11,7 @@ KEYWORDS=""
 IUSE="debug"
 
 DEPEND="
-	net-print/cups[dbus]
+	>=net-print/cups-1.5.0[dbus]
 "
 RDEPEND="${DEPEND}
 	!kde-misc/print-manager

diff --git a/kde-base/print-manager/print-manager-9999.ebuild b/kde-base/print-manager/print-manager-9999.ebuild
index e61059a..dc5ab65 100644
--- a/kde-base/print-manager/print-manager-9999.ebuild
+++ b/kde-base/print-manager/print-manager-9999.ebuild
@@ -11,7 +11,7 @@ KEYWORDS=""
 IUSE="debug"
 
 DEPEND="
-	net-print/cups[dbus]
+	>=net-print/cups-1.5.0[dbus]
 "
 RDEPEND="${DEPEND}
 	!kde-misc/print-manager

[gentoo-commits] proj/kde:master commit in: kde-base/print-manager/

[Andreas Hüttel]

commit:     efaf1eb4eebd6903b072bdfc600196a5ed5daa48
Author:     Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  9 09:15:53 2013 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Jun  9 09:16:14 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=efaf1eb4

[kde-base/print-manager] Add missing dependency, bug 456360

Package-Manager: portage-2.2.0_alpha177

---
 kde-base/print-manager/print-manager-4.10.49.9999.ebuild | 1 +
 kde-base/print-manager/print-manager-9999.ebuild         | 1 +
 2 files changed, 2 insertions(+)

diff --git a/kde-base/print-manager/print-manager-4.10.49.9999.ebuild b/kde-base/print-manager/print-manager-4.10.49.9999.ebuild
index dc5ab65..25513d7 100644
--- a/kde-base/print-manager/print-manager-4.10.49.9999.ebuild
+++ b/kde-base/print-manager/print-manager-4.10.49.9999.ebuild
@@ -14,6 +14,7 @@ DEPEND="
 	>=net-print/cups-1.5.0[dbus]
 "
 RDEPEND="${DEPEND}
+	app-admin/system-config-printer-gnome
 	!kde-misc/print-manager
 "
 

diff --git a/kde-base/print-manager/print-manager-9999.ebuild b/kde-base/print-manager/print-manager-9999.ebuild
index dc5ab65..25513d7 100644
--- a/kde-base/print-manager/print-manager-9999.ebuild
+++ b/kde-base/print-manager/print-manager-9999.ebuild
@@ -14,6 +14,7 @@ DEPEND="
 	>=net-print/cups-1.5.0[dbus]
 "
 RDEPEND="${DEPEND}
+	app-admin/system-config-printer-gnome
 	!kde-misc/print-manager
 "
 

[gentoo-commits] proj/kde:master commit in: kde-base/print-manager/

[Michael Palimaka]

commit:     d5b96fd0178fc75afec61bc30d582dcbb1e4005a
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Jul  3 14:47:05 2013 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Jul  3 14:47:05 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=d5b96fd0

[kde-base/print-manager] Avoid add_blocker.

Package-Manager: portage-2.1.12.11

---
 kde-base/print-manager/print-manager-4.10.90.ebuild | 7 +++----
 kde-base/print-manager/print-manager-9999.ebuild    | 7 +++----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/kde-base/print-manager/print-manager-4.10.90.ebuild b/kde-base/print-manager/print-manager-4.10.90.ebuild
index be00475..95f3dcd 100644
--- a/kde-base/print-manager/print-manager-4.10.90.ebuild
+++ b/kde-base/print-manager/print-manager-4.10.90.ebuild
@@ -14,9 +14,8 @@ DEPEND="
 	>=net-print/cups-1.5.0[dbus]
 "
 RDEPEND="${DEPEND}
-	app-admin/system-config-printer-gnome
+	!kde-base/printer-applet:4
+	!kde-base/system-config-printer-kde:4
 	!kde-misc/print-manager
+	app-admin/system-config-printer-gnome
 "
-
-add_blocker printer-applet
-add_blocker system-config-printer-kde

diff --git a/kde-base/print-manager/print-manager-9999.ebuild b/kde-base/print-manager/print-manager-9999.ebuild
index 25513d7..e3a9fde 100644
--- a/kde-base/print-manager/print-manager-9999.ebuild
+++ b/kde-base/print-manager/print-manager-9999.ebuild
@@ -14,9 +14,8 @@ DEPEND="
 	>=net-print/cups-1.5.0[dbus]
 "
 RDEPEND="${DEPEND}
-	app-admin/system-config-printer-gnome
+	!kde-base/printer-applet:4
+	!kde-base/system-config-printer-kde:4
 	!kde-misc/print-manager
+	app-admin/system-config-printer-gnome
 "
-
-add_blocker printer-applet
-add_blocker system-config-printer-kde

[gentoo-commits] proj/kde:master commit in: kde-base/print-manager/

[Michael Palimaka]

commit:     896009a47447bc00c15a7b597152968b34e9f433
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sun Oct 19 17:11:43 2014 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Oct 25 16:29:09 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=896009a4

[kde-base/print-manager] Make s-c-p optional according to upstream comments

https://bugs.kde.org/show_bug.cgi?id=320326

---
 kde-base/print-manager/print-manager-4.14.2.ebuild | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/kde-base/print-manager/print-manager-4.14.2.ebuild b/kde-base/print-manager/print-manager-4.14.2.ebuild
index 680616e..c976a3f 100644
--- a/kde-base/print-manager/print-manager-4.14.2.ebuild
+++ b/kde-base/print-manager/print-manager-4.14.2.ebuild
@@ -8,7 +8,7 @@ inherit kde4-base
 
 DESCRIPTION="Manage print jobs and printers in KDE"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
+IUSE="debug +gtk"
 
 DEPEND="
 	>=net-print/cups-1.5.0[dbus]
@@ -17,7 +17,24 @@ RDEPEND="${DEPEND}
 	!kde-base/printer-applet:4
 	!kde-base/system-config-printer-kde:4
 	!kde-misc/print-manager
-	app-admin/system-config-printer-gnome
+	gtk? ( app-admin/system-config-printer-gnome )
 "
 
 PATCHES=( "${FILESDIR}/${PN}-4.14.1-cups20.patch" )
+
+pkg_postinst(){
+	if ! use gtk ; then
+		ewarn
+		ewarn "By switching off \"gtk\" USE flag, you have chosen to do without"
+		ewarn "an important, though optional, runtime dependency:"
+		ewarn
+		ewarn "app-admin/system-config-printer-gnome"
+		ewarn
+		ewarn "${PN} will work nevertheless, but is going to be less comfortable"
+		ewarn "and will show the following error status during runtime:"
+		ewarn
+		ewarn "\"Failed to group devices: 'The name org.fedoraproject.Config.Printing"
+		ewarn "was not provided by any .service files'\""
+		ewarn
+	fi
+}

[gentoo-commits] proj/kde:master commit in: kde-base/print-manager/

[Michael Palimaka]

commit:     ae7cc637ccccba91b776ac282172c6274738d15e
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 17 08:39:02 2014 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Nov 17 08:39:02 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=ae7cc637

[kde-base/print-manager] Restore 896009a47447bc00c15a7b597152968b34e9f433 which was accidentally never applied to the live ebuild.

Package-Manager: portage-2.2.14

---
 .../print-manager/print-manager-4.14.49.9999.ebuild | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/kde-base/print-manager/print-manager-4.14.49.9999.ebuild b/kde-base/print-manager/print-manager-4.14.49.9999.ebuild
index c436164..4c7ad8c 100644
--- a/kde-base/print-manager/print-manager-4.14.49.9999.ebuild
+++ b/kde-base/print-manager/print-manager-4.14.49.9999.ebuild
@@ -8,7 +8,7 @@ inherit kde4-base
 
 DESCRIPTION="Manage print jobs and printers in KDE"
 KEYWORDS=""
-IUSE="debug"
+IUSE="debug +gtk"
 
 DEPEND="
 	>=net-print/cups-1.5.0[dbus]
@@ -17,5 +17,22 @@ RDEPEND="${DEPEND}
 	!kde-base/printer-applet:4
 	!kde-base/system-config-printer-kde:4
 	!kde-misc/print-manager
-	app-admin/system-config-printer-gnome
+	gtk? ( app-admin/system-config-printer-gnome )
 "
+
+pkg_postinst(){
+	if ! use gtk ; then
+		ewarn
+		ewarn "By switching off \"gtk\" USE flag, you have chosen to do without"
+		ewarn "an important, though optional, runtime dependency:"
+		ewarn
+		ewarn "app-admin/system-config-printer-gnome"
+		ewarn
+		ewarn "${PN} will work nevertheless, but is going to be less comfortable"
+		ewarn "and will show the following error status during runtime:"
+		ewarn
+		ewarn "\"Failed to group devices: 'The name org.fedoraproject.Config.Printing"
+		ewarn "was not provided by any .service files'\""
+		ewarn
+	fi
+}