summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas K. Hüttel <dilfridge@gentoo.org>2012-08-30 21:37:47 +0000
committerAndreas K. Hüttel <dilfridge@gentoo.org>2012-08-30 21:37:47 +0000
commit0d9ab831c4a628f466b545c60728425b0e94bbb2 (patch)
tree69c7cd52de4db368f7f010547cdff4db01018bb0 /net-print
parentVersion bump (diff)
downloadgentoo-2-0d9ab831c4a628f466b545c60728425b0e94bbb2.tar.gz
gentoo-2-0d9ab831c4a628f466b545c60728425b0e94bbb2.tar.bz2
gentoo-2-0d9ab831c4a628f466b545c60728425b0e94bbb2.zip
Add warning about network browsing on update from 1.5 and earlier
(Portage version: 2.2.0_alpha123/cvs/Linux x86_64, RepoMan options: --force)
Diffstat (limited to 'net-print')
-rw-r--r--net-print/cups/ChangeLog6
-rw-r--r--net-print/cups/cups-1.6.1.ebuild12
-rw-r--r--net-print/cups/cups-9999.ebuild12
3 files changed, 27 insertions, 3 deletions
diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index 209d227f29df..8351475ac1e7 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-print/cups
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.505 2012/08/16 17:07:16 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.506 2012/08/30 21:37:47 dilfridge Exp $
+
+ 30 Aug 2012; Andreas K. Huettel <dilfridge@gentoo.org> cups-1.6.1.ebuild,
+ cups-9999.ebuild:
+ Add warning about network browsing on update from 1.5 and earlier
16 Aug 2012; Jeroen Roovers <jer@gentoo.org> cups-1.6.1.ebuild:
Marked ~hppa (bug #428356).
diff --git a/net-print/cups/cups-1.6.1.ebuild b/net-print/cups/cups-1.6.1.ebuild
index 8a565ccb223c..5d7e401fb057 100644
--- a/net-print/cups/cups-1.6.1.ebuild
+++ b/net-print/cups/cups-1.6.1.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/net-print/cups/cups-1.6.1.ebuild,v 1.3 2012/08/16 17:07:16 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.6.1.ebuild,v 1.4 2012/08/30 21:37:47 dilfridge Exp $
EAPI=4
@@ -273,6 +273,16 @@ pkg_postinst() {
elog "To (re-)enable it, edit /etc/cups/cupsd.conf and set \"Browsing On\", "
elog "afterwards re-start or reload cups."
echo
+
+ # not slotted - at most one value
+ if [[ "${REPLACING_VERSIONS}" ]] && [[ "${REPLACING_VERSIONS}" < "1.6" ]]; then
+ echo
+ elog "CUPS-1.6 no longer supports automatic remote printers or implicit classes"
+ elog "via the CUPS, LDAP, or SLP protocols, i.e. \"network browsing\"."
+ elog "You will have to find printers using zeroconf/avahi instead, or enter"
+ elog "the location manually."
+ echo
+ fi
}
pkg_postrm() {
diff --git a/net-print/cups/cups-9999.ebuild b/net-print/cups/cups-9999.ebuild
index 7cc4a0f043c3..950e5009b0e6 100644
--- a/net-print/cups/cups-9999.ebuild
+++ b/net-print/cups/cups-9999.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/net-print/cups/cups-9999.ebuild,v 1.16 2012/07/28 15:34:31 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-9999.ebuild,v 1.17 2012/08/30 21:37:47 dilfridge Exp $
EAPI=4
@@ -273,6 +273,16 @@ pkg_postinst() {
elog "To (re-)enable it, edit /etc/cups/cupsd.conf and set \"Browsing On\", "
elog "afterwards re-start or reload cups."
echo
+
+ # not slotted - at most one value
+ if [[ "${REPLACING_VERSIONS}" ]] && [[ "${REPLACING_VERSIONS}" < "1.6" ]]; then
+ echo
+ elog "CUPS-1.6 no longer supports automatic remote printers or implicit classes"
+ elog "via the CUPS, LDAP, or SLP protocols, i.e. \"network browsing\"."
+ elog "You will have to find printers using zeroconf/avahi instead, or enter"
+ elog "the location manually."
+ echo
+ fi
}
pkg_postrm() {