summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Hüttel <dilfridge@gentoo.org>2013-06-29 10:59:28 +0000
committerAndreas Hüttel <dilfridge@gentoo.org>2013-06-29 10:59:28 +0000
commit2ddf764f721154843f68e1c3f26deba195187f20 (patch)
treebd7321155d20ea7766d11a9b5d2c05b3b0fca193 /net-print/cups
parentRemove sun-jdk and sun-jre-bin from the virtuals, acked by Caster. For securi... (diff)
downloadhistorical-2ddf764f721154843f68e1c3f26deba195187f20.tar.gz
historical-2ddf764f721154843f68e1c3f26deba195187f20.tar.bz2
historical-2ddf764f721154843f68e1c3f26deba195187f20.zip
Simplify elog output logic
Package-Manager: portage-2.2.0_alpha185/cvs/Linux x86_64 Manifest-Sign-Key: 0xEBE6A336BE19039C!
Diffstat (limited to 'net-print/cups')
-rw-r--r--net-print/cups/ChangeLog6
-rw-r--r--net-print/cups/Manifest34
-rw-r--r--net-print/cups/cups-1.6.2-r5.ebuild8
-rw-r--r--net-print/cups/cups-9999.ebuild8
4 files changed, 24 insertions, 32 deletions
diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index b4a3bdafb5dc..f2a1726949da 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.538 2013/06/26 23:14:34 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.539 2013/06/29 10:59:16 dilfridge Exp $
+
+ 28 Jun 2013; Andreas K. Huettel <dilfridge@gentoo.org> cups-1.6.2-r5.ebuild,
+ cups-9999.ebuild:
+ Simplify elog output logic
26 Jun 2013; Andreas K. Huettel <dilfridge@gentoo.org> -cups-1.6.2-r3.ebuild:
Clean up
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index c703fb4d36be..84b88c1aa126 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -29,26 +29,26 @@ DIST cups-1.6.2-source.tar.bz2 8363773 SHA256 37a3ebd305e76cfd4c9c53013e89c0f7a4
EBUILD cups-1.5.0.ebuild 8250 SHA256 0e7967449e58ad9c385154c93c7dd35cd211f8dd0624a7409843601e3ab6802f SHA512 725b0b632a55a227177ee6313d8ce21ff49ede6aa2cdecc62448069ad85dd979a8643e49054ee695408c66c46de7eb2d42c37cf411363be0fe638d1ad68d6829 WHIRLPOOL c11ebd1fa34492e7af49e8e0e3e131abd244529e7331c7a3421cce84777b44108f3e924fbaf7a86f3e031a0b8579f0e14580993e5063f3e6672d8d2b37e2badf
EBUILD cups-1.5.2-r4.ebuild 8363 SHA256 5962ac89342b0430eb663dbd012af6ad02f836d712496088b65af28817a241c3 SHA512 dd1cb9a9c570d51e376c71c784a3c6dfff38e07a2594792666cbcded73ba3dc5301393fc59c01113cc6461fd1e63371348df015be9cd3d2aa50859ad296535b6 WHIRLPOOL 2a69b6d45f64b191dabb4b6a4f112c7a9975a356c28999e50a413e6ab73a7f292e00a5995d9008419420063ee769ee11879267acd69a12a2c81deb0ab00829f0
EBUILD cups-1.5.3.ebuild 8623 SHA256 0a7ce20dfd2db91a6ed81c54bea74f57c2b416f245b33798fab8df01f8c3a2c6 SHA512 8e58e10a2c3c0cacc22bf2fb234ececcc6e9dc2c9a17d2babc7c491e0a956e8d42a29abc2d5e196b82593b593139430278fd83f27b6a6148f733aa65ea44a311 WHIRLPOOL 65af0f97161198ab8699da209f9de93d397d4d754258821ce29e5f772465906d4aeadae48a26dbee412ff5953eedc6e50d6b9da76d54626d1922fb1b55e2ec71
-EBUILD cups-1.6.2-r5.ebuild 9222 SHA256 99c8495c9035aee48e1f8ef9f7101c4aa4dfa4ca9cdd5f43d421a64af56e32e7 SHA512 9fba4f202f5d638492ece0505bad9033b151ee91e62dd7f2a519aaf57e0b16795ab842ee9a7f6bcf5cec5745c5e40978fe478dc4395d91052ebb43008bfb7dd5 WHIRLPOOL a0e0df76ca5d897939e4114e1e2003330ee85c39f6618a43705a03a7ccb0a87ff81eca09862402a703aaad031cfc43ca2de7e1a2e2e66db827b20aba85a5431d
-EBUILD cups-9999.ebuild 9219 SHA256 0a6f4afc17194d15575c1daf19d4655b18ad430281d331d99ada0d951be6e75c SHA512 c77178d1875fa90cb81eff79af88d59fa5f96e751a0e1e1e6bf0a883b679256655e4741018c4175eb7326b9cf3a5906e8d96b545f07655eed4ebdc14792cc816 WHIRLPOOL a161c0c57c97a67f7a435c176e64b905a313a7468ff57c986ebc5aedcb56e36e72e46aecbbed0e6dcdde7623c05752b8510f77b3aad93e40e5ff7ff61a43bd03
-MISC ChangeLog 82268 SHA256 38a5167c8c5ece3a7e3580cf05267a6ab1d1b038a89cde2eab8f6135684bc6b2 SHA512 a1ce74f28b3f816cec97764376359ed651140ee2484c2a0b60f9dac0928aa29200ee958846228da992f9cb256bcb6c03ee9eb140fbd88b49baeec4a5caa88069 WHIRLPOOL ccae26e86eef7d62f916b194de4f3f5b571d5f0f8b62c70eeb42f6056133c37653f40d1ce05ebf17d343207653995ae1e49b25312c43c74ae915ce28c9d87714
+EBUILD cups-1.6.2-r5.ebuild 8945 SHA256 cdb1c787190f0af784e49fab1dbb497d05d8b948c87909e5fbfd308ecdb4e62a SHA512 f6d3b4c8c9ae07c7ea68aef0443f0f0977f98465bbe5d031e500a27e16472cb773ec6b0748b3b11a1cd92380deae93baa81aac3bff9ec958ed97923de19a3a6c WHIRLPOOL 7240e889c2b4b6f7decadc64b6f966527690d59aa561f7a901f436046e3076c4a42911139b72ef64099102fba26ace046a557598ebe51a0b800aeccd00cc9c59
+EBUILD cups-9999.ebuild 8942 SHA256 f54ec049a1cf46c266f59713a6e21413544ce019c8030dd904b013949933f08d SHA512 360a610728385ff892c06e1fea269e1e4b0149433883e35475fb80943034257e8498d3b8ca7020c992773f76a7b8b69b92a68d053a697d6ae3d7164fa8a559dc WHIRLPOOL e27d48564b4ed1e77df31d28b7d4115057d47140b9bde8b8e17de0a77d41cf2104aa3de3bc67b1461fee4b8c97311f34f9fdf3a565d7e5adb1647a738f30ee37
+MISC ChangeLog 82397 SHA256 bc39f532cbe629cefa75d66412caa9b6c502ec23b27de1146b501ac86b97c5a1 SHA512 2eb0c9b35219651c83e45eddf3add2d6e90bef3cf24e6ded1c4b2001db16382b987249173fd431017cdfa732c2836ce2fe5d0d3839dd5bc90302801b228fea5c WHIRLPOOL 4ca331542f5bef0dc37ef33e075c17801dd9aca9aad572bed97e51f4a8177a3aee5e6524ac6691944afbe576c00c63f0659e377bbea21df8b69ffe8dd9c9a547
MISC metadata.xml 888 SHA256 fc10de1798aeb6e16d8457d45abad85d39802e59a5f461d1374043a629ab8c6f SHA512 ff93d64033d5d7f3491b77af44a92553d9cefa4ea4671eb7a9380b5a2645fe7e384bf1e277a81431578524b6dce55528d6e0c1d3408c43f3f11140b21d9b623b WHIRLPOOL ab3145f58da411364c4c12e35d66c034ef02be686e8dfd696c207fffdf193ae4a4619a184364710f2409cc92b2dc3dfc75f703c29dfb5f59423b20c7dbd9fc87
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.20 (GNU/Linux)
-iQJ8BAEBCABmBQJRy3ZUXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJRzr6FXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
-QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcSPMP/2umJjkzRGq29o3vDjJXL2w7
-zGepjskJ0sZf5X3ZPOHBnJmbpdGATKXpfm0kr7Krw2dcf0TFjDoom04VhRDJ0VCk
-waPI8WwE+cL9jrQRuiVTT8f+aPAyflgqrwGMzVwkeBfnzuA0JIFBYTyqB/Vas6KT
-qc4ZGLpgTZzF4ZMA6jCadIyBzaPjy5RAB1Dt726M2V+9uVCzksUIqXpT/iXD3byL
-BMbXjag72ZZQSqmS+uqibiqKeWkpqZVytUc2O6ioqXg0+tgiPKgoPrq4zSTgZfAN
-m96hYRQtCTj1Q9Y7kEnVbmtT0Sc08xkRBjH28Sra6OrseIXrCfqLHCpk+Y6FkB1G
-bRWnNzj0HIuIT2hcObY60Hg30qbYKfy8+MQO5sqQlXZkVFBECdxGNwg+Op+LqfOK
-qdHOP3H2mIYB31X2T9XpCfmCfe/nANYR5GCFruyv7jSx92h6wNaIKhERqx8/+2HS
-9sZcwUROl2Okeday1IHYB1NNyVpKdd6KckaUgNC/mpKb4FN7iWbS+mUKg3kkxhVq
-nc4E2/xF8papNEvBfKWLyo6MeqBZIrHg/C6QgOZ/3jHj9RUhsiWaQBamae1YS5l1
-GuoQYhutfkEHO+pvs6zcfsLdPHFnxe3SED7PmIp4x2hLDpil/iUjE/JLmA6Y26I2
-DnuEaohYG3ZA09ay8ceK
-=0ct5
+QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcIakQAM0pO/Ueggnnvqw8kx0yFUWL
+IsEPIXbjsgFW28PUZnoOmsJdB613lyvjPGe9bTsExs9VUhOR7dlGcoxaSndLs+Yd
+01hH4QFSmr2Pc5tEaBzLbrwXiMrpGbDUcwndVdECP0KYsN24SZ6adg7QQ52OdtpI
+/Y8qahAx0IAJDMB/2zUPdneRmVEVKZwbHLZvhuvapbKVPTrHdZl+933K5ZLl+NLl
+z7Egf95s6qu5F9oiGX9OLSzOHcC0+1FCJEsWCGV/0PtEu4YgzGdOEeJYv8qQaERW
+X+d+UMQJxl1+mWHN83aJMaW7VOZvufAbgoKsj1oxCKQHJhzGtrPFAiClyGajrDHo
+BQwIVeLuVdbCZeJVoseeOghnMffN31v+6PLM2bNu3R3vDzD8lSUP0l7dp793wr6V
+dUgjz9nEzEGGtIfB/m4vg4nk4F3pR8prY9+Gz8y7dZxJ+0QkXmdRa9nTBMEaWLlP
+BjR4h7+aEqmuF/QZl9WahwBl596WsYCG5ahDVrB/wPRL04rbGAZeOiRqA4pFOcBc
+Cw1T5VhcSXJ4Zr8UK+DrxyyUQMDPKtbTE8g0/JaGiNxwONrMNlsHn4pMwRq1Rrav
+U2djsp44OmQ1GOiSAp9AGfXATa+91K3Lbc6C5QP+OcT18KPuB7BxokbRzFKgltQP
+Mt5ltTmHlq7631r9owB4
+=NErK
-----END PGP SIGNATURE-----
diff --git a/net-print/cups/cups-1.6.2-r5.ebuild b/net-print/cups/cups-1.6.2-r5.ebuild
index 1f27214984a2..757b2278a810 100644
--- a/net-print/cups/cups-1.6.2-r5.ebuild
+++ b/net-print/cups/cups-1.6.2-r5.ebuild
@@ -1,6 +1,6 @@
# 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-r5.ebuild,v 1.1 2013/05/14 18:44:48 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.6.2-r5.ebuild,v 1.2 2013/06/29 10:59:16 dilfridge Exp $
EAPI=5
@@ -288,12 +288,6 @@ pkg_postinst() {
elog "the location manually, or run cups-browsed from net-print/cups-filters"
elog "which re-adds that functionality as a separate daemon."
echo
- elif [[ "${REPLACING_VERSIONS}" ]] && [[ "${REPLACING_VERSIONS}" < "1.6.2" ]]; then
- echo
- elog "Starting with net-print/cups-filters-1.0.30, that package provides"
- elog "a daemon cups-browsed which implements printer discovery via the"
- elog "CUPS-1.5 protocol."
- echo
fi
if [[ "${REPLACING_VERSIONS}" == "1.6.2-r4" ]]; then
diff --git a/net-print/cups/cups-9999.ebuild b/net-print/cups/cups-9999.ebuild
index 90ac6b0cefe8..b7195048272a 100644
--- a/net-print/cups/cups-9999.ebuild
+++ b/net-print/cups/cups-9999.ebuild
@@ -1,6 +1,6 @@
# 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.34 2013/05/14 18:44:48 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-9999.ebuild,v 1.35 2013/06/29 10:59:16 dilfridge Exp $
EAPI=5
@@ -288,12 +288,6 @@ pkg_postinst() {
elog "the location manually, or run cups-browsed from net-print/cups-filters"
elog "which re-adds that functionality as a separate daemon."
echo
- elif [[ "${REPLACING_VERSIONS}" ]] && [[ "${REPLACING_VERSIONS}" < "1.6.2" ]]; then
- echo
- elog "Starting with net-print/cups-filters-1.0.30, that package provides"
- elog "a daemon cups-browsed which implements printer discovery via the"
- elog "CUPS-1.5 protocol."
- echo
fi
if [[ "${REPLACING_VERSIONS}" == "1.6.2-r4" ]]; then