diff options
| author |   Andreas K. Hüttel <dilfridge@gentoo.org> | 2013-03-24 20:31:06 +0000 |
|---|---|---|
| committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2013-03-24 20:31:06 +0000 |
| commit | 952786d6c13e4fd6db08d5950c4cc95c81095dfb (patch) | |
| tree | a4faa3b982b3b2d2ad12c96ada2df754f7ede93b /net-print | |
| parent | Move net usage to conf.d (defaults are unchanged) #439660 by Matthew Schultz. (diff) | |
| download | gentoo-2-952786d6c13e4fd6db08d5950c4cc95c81095dfb.tar.gz gentoo-2-952786d6c13e4fd6db08d5950c4cc95c81095dfb.tar.bz2 gentoo-2-952786d6c13e4fd6db08d5950c4cc95c81095dfb.zip | |
EAPI bump to 5, clean up elog messages, (also) bug 440502
(Portage version: 2.2.0_alpha169/cvs/Linux x86_64, signed Manifest commit with key EBE6A336BE19039C!)
Diffstat (limited to 'net-print')
| -rw-r--r-- | net-print/cups/ChangeLog | 6 | ||||
| -rw-r--r-- | net-print/cups/cups-1.6.2.ebuild | 22 | ||||
| -rw-r--r-- | net-print/cups/cups-9999.ebuild | 22 |
3 files changed, 25 insertions, 25 deletions
diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog index 26b83338860e..6c009a39e61b 100644 --- a/net-print/cups/ChangeLog +++ b/net-print/cups/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-print/cups # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.522 2013/03/24 19:58:49 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.523 2013/03/24 20:31:06 dilfridge Exp $ + + 24 Mar 2013; Andreas K. Huettel <dilfridge@gentoo.org> cups-1.6.2.ebuild, + cups-9999.ebuild: + EAPI bump to 5, clean up elog messages, (also) bug 440502 24 Mar 2013; Andreas K. Huettel <dilfridge@gentoo.org> cups-1.6.2.ebuild, cups-9999.ebuild: diff --git a/net-print/cups/cups-1.6.2.ebuild b/net-print/cups/cups-1.6.2.ebuild index 426b45987177..9422134b3ddf 100644 --- a/net-print/cups/cups-1.6.2.ebuild +++ b/net-print/cups/cups-1.6.2.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.6.2.ebuild,v 1.2 2013/03/24 19:58:49 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.6.2.ebuild,v 1.3 2013/03/24 20:31:06 dilfridge Exp $ -EAPI=4 +EAPI=5 PYTHON_DEPEND="python? 2:2.5" @@ -67,7 +67,7 @@ DEPEND="${RDEPEND} PDEPEND=" app-text/ghostscript-gpl[cups] - >=app-text/poppler-0.12.3-r3[utils] + app-text/poppler[utils] >=net-print/cups-filters-1.0.30 filters? ( net-print/foomatic-filters ) " @@ -264,16 +264,14 @@ pkg_postinst() { gnome2_icon_cache_update fdo-mime_desktop_database_update - echo - elog "For information about installing a printer and general cups setup" - elog "take a look at: http://www.gentoo.org/doc/en/printing-howto.xml" - echo - elog "Network browsing for printers is now switched off by default in the config file." - 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}" ]]; then + echo + elog "For information about installing a printer and general cups setup" + elog "take a look at: http://www.gentoo.org/doc/en/printing-howto.xml" + echo + fi + if [[ "${REPLACING_VERSIONS}" ]] && [[ "${REPLACING_VERSIONS}" < "1.6" ]]; then echo elog "CUPS-1.6 no longer supports automatic remote printers or implicit classes" diff --git a/net-print/cups/cups-9999.ebuild b/net-print/cups/cups-9999.ebuild index 4868f54a91e8..1f40e82b79d6 100644 --- a/net-print/cups/cups-9999.ebuild +++ b/net-print/cups/cups-9999.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2013 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.24 2013/03/24 19:58:49 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-9999.ebuild,v 1.25 2013/03/24 20:31:06 dilfridge Exp $ -EAPI=4 +EAPI=5 PYTHON_DEPEND="python? 2:2.5" @@ -67,7 +67,7 @@ DEPEND="${RDEPEND} PDEPEND=" app-text/ghostscript-gpl[cups] - >=app-text/poppler-0.12.3-r3[utils] + app-text/poppler[utils] >=net-print/cups-filters-1.0.30 filters? ( net-print/foomatic-filters ) " @@ -264,16 +264,14 @@ pkg_postinst() { gnome2_icon_cache_update fdo-mime_desktop_database_update - echo - elog "For information about installing a printer and general cups setup" - elog "take a look at: http://www.gentoo.org/doc/en/printing-howto.xml" - echo - elog "Network browsing for printers is now switched off by default in the config file." - 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}" ]]; then + echo + elog "For information about installing a printer and general cups setup" + elog "take a look at: http://www.gentoo.org/doc/en/printing-howto.xml" + echo + fi + if [[ "${REPLACING_VERSIONS}" ]] && [[ "${REPLACING_VERSIONS}" < "1.6" ]]; then echo elog "CUPS-1.6 no longer supports automatic remote printers or implicit classes" |