commit: 911b4e95532ba4380012325e5eceeb238f4ef308
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Tue May 12 19:02:09 2015 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue May 12 19:02:09 2015 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=911b4e95
[kde-apps/print-manager] Sync with main tree.
app-admin/system-config-printer is a new package merging the split -common and
-gnome packages.
Package-Manager: portage-2.2.18
kde-apps/print-manager/print-manager-14.12.3.ebuild | 4 ++--
kde-apps/print-manager/print-manager-15.04.0.ebuild | 4 ++--
kde-apps/print-manager/print-manager-15.04.49.9999.ebuild | 4 ++--
kde-apps/print-manager/print-manager-9999.ebuild | 4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/kde-apps/print-manager/print-manager-14.12.3.ebuild
b/kde-apps/print-manager/print-manager-14.12.3.ebuild
index de4a3d2..5528957 100644
--- a/kde-apps/print-manager/print-manager-14.12.3.ebuild
+++ b/kde-apps/print-manager/print-manager-14.12.3.ebuild
@@ -17,7 +17,7 @@ RDEPEND="${DEPEND}
!kde-base/printer-applet:4
!kde-base/system-config-printer-kde:4
!kde-misc/print-manager
- gtk? ( app-admin/system-config-printer-gnome )
+ gtk? ( || ( app-admin/system-config-printer-gnome
app-admin/system-config-printer ) )
"
pkg_postinst(){
@@ -26,7 +26,7 @@ pkg_postinst(){
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 "app-admin/system-config-printer"
ewarn
ewarn "${PN} will work nevertheless, but is going to be less
comfortable"
ewarn "and will show the following error status during runtime:"
diff --git a/kde-apps/print-manager/print-manager-15.04.0.ebuild
b/kde-apps/print-manager/print-manager-15.04.0.ebuild
index 807cd01..82cd555 100644
--- a/kde-apps/print-manager/print-manager-15.04.0.ebuild
+++ b/kde-apps/print-manager/print-manager-15.04.0.ebuild
@@ -30,7 +30,7 @@ DEPEND="
net-print/cups
"
RDEPEND="${DEPEND}
- gtk? ( app-admin/system-config-printer-gnome )
+ gtk? ( || ( app-admin/system-config-printer-gnome
app-admin/system-config-printer ) )
"
pkg_postinst(){
@@ -39,7 +39,7 @@ pkg_postinst(){
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 "app-admin/system-config-printer"
ewarn
ewarn "${PN} will work nevertheless, but is going to be less
comfortable"
ewarn "and will show the following error status during runtime:"
diff --git a/kde-apps/print-manager/print-manager-15.04.49.9999.ebuild
b/kde-apps/print-manager/print-manager-15.04.49.9999.ebuild
index 17efe00..345a0ec 100644
--- a/kde-apps/print-manager/print-manager-15.04.49.9999.ebuild
+++ b/kde-apps/print-manager/print-manager-15.04.49.9999.ebuild
@@ -30,7 +30,7 @@ DEPEND="
net-print/cups
"
RDEPEND="${DEPEND}
- gtk? ( app-admin/system-config-printer-gnome )
+ gtk? ( || ( app-admin/system-config-printer-gnome
app-admin/system-config-printer ) )
"
pkg_postinst(){
@@ -39,7 +39,7 @@ pkg_postinst(){
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 "app-admin/system-config-printer"
ewarn
ewarn "${PN} will work nevertheless, but is going to be less
comfortable"
ewarn "and will show the following error status during runtime:"
diff --git a/kde-apps/print-manager/print-manager-9999.ebuild
b/kde-apps/print-manager/print-manager-9999.ebuild
index 17efe00..345a0ec 100644
--- a/kde-apps/print-manager/print-manager-9999.ebuild
+++ b/kde-apps/print-manager/print-manager-9999.ebuild
@@ -30,7 +30,7 @@ DEPEND="
net-print/cups
"
RDEPEND="${DEPEND}
- gtk? ( app-admin/system-config-printer-gnome )
+ gtk? ( || ( app-admin/system-config-printer-gnome
app-admin/system-config-printer ) )
"
pkg_postinst(){
@@ -39,7 +39,7 @@ pkg_postinst(){
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 "app-admin/system-config-printer"
ewarn
ewarn "${PN} will work nevertheless, but is going to be less
comfortable"
ewarn "and will show the following error status during runtime:"
