Use REPLACING_VERSIONS to avoid elog pollution.

Package-Manager: portage-2.1.11.9/cvs/Linux i686

4 files changed, 30 insertions, 34 deletions

diff --git a/app-admin/conky/ChangeLog b/app-admin/conky/ChangeLog
index fecc5f76d0b7..46346f531ffc 100644
--- a/app-admin/conky/ChangeLog
+++ b/app-admin/conky/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/conky
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.187 2012/10/12 17:18:55 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.188 2012/11/07 17:07:55 billie Exp $
+
+  07 Nov 2012; Daniel Pielmeier <billie@gentoo.org> conky-1.9.0.ebuild,
+  conky-1.9.0-r1.ebuild:
+  Use REPLACING_VERSIONS to avoid elog pollution.
 
   12 Oct 2012; Daniel Pielmeier <billie@gentoo.org> -conky-1.8.1-r6.ebuild:
   Remove old.
diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
index b5805f3e95c6..4e67c2afc3b3 100644
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX conky-1.8.1-acpitemp.patch 2415 SHA256 57815044cd972139171b76e75267792821c783e03537eb6cf7ba8105c46cdf8d SHA512 8c376fe44e72c7bd8526bd51a4ec6a85919e4bfb1189fc2e0b15172ca5a76c6e5c6ece56f186b8da8e720bc5769b2c36fff76367c7c7a587648ad837b7085f1b WHIRLPOOL 849aa8f18b2ab021b0ffcf52cca544f5464f61df0745018bae4ddf938005ef477bc4aa702d2c335e190e353e0897fd2636c95f595202b76b7752d652f2da4f0a
 AUX conky-1.8.1-battery-time.patch 655 SHA256 d47e966e61a212048a8c752f1885e567a6b2c497da508dee8be64b205a5a422d SHA512 951ab73eca1a1ca059c127e001c556fed4dec6d9b6b63365d6826be7105b6ac87f2a36b6799aa313dd8a3519d3aea0ff7a6aa8ef46bc36cf6de7ccb7248854e5 WHIRLPOOL f6139a92d78e383dd9a006d40b96272a82165db9d94da90f729db1d65ae0bca39b62b9391c514ef23cb078007d0ccdfece3e89cde73506804c67222e75baf7b0
 AUX conky-1.8.1-curl-headers.patch 494 SHA256 53ff30aa933163a1feb646720ea21b4727d515e33521ac53e77b8bd9d0473eba SHA512 1b78d0c34b86ff75179ead6413487f827ad1ed3627cc6694bc0fd49b214ef4c9d3c05c4dcb8cf3cb4615ab25086e25d3d0f25a897daa410286df41ec38af682c WHIRLPOOL d8acd19f59063a75205b2901fe7e47a7233f73e18263132fe607208c5a6dec5cdcbba215dd7089477ae1d5a6d7d153afd54b78bed69184129a1d556d5505d779
@@ -13,14 +10,7 @@ AUX conky-1.8.1-xmms2.patch 1190 SHA256 1b64047f04239dbf24b3171fcd8d5c950e9f8aa6
 AUX conky-1.9.0-lines-fix.patch 1067 SHA256 9a406f382092632e458d368b5fff81217258729df19098836f7f9ace0130b316 SHA512 555a7234933e6967cdf7ee003e46b089f29819891551205ab7d3008037f8c8771473ced3ed3da1009e2041e9d34beb6edca25fb1017f043a824611d439094e0e WHIRLPOOL 64d88b5b94e435cd0473d18fceaa1358dcea1e1d2c5c2de93588351c0e08f6fe3461e4a1d8b470533f1d8fb80c99ec078825d4b7803f7042be5bee74a540791d
 AUX conky-1.9.0-ncurses.patch 939 SHA256 76a777bab29009c2053b61e9e5904aea131c93d5f026acc161048374f75e72f6 SHA512 0a0737bec67eb241dee4029907d9f3e5bc8d49c8239fbdda5cbfa2b7b0aa50fb2ac9bf3397ccecd94768a176fc6c3ec0e18d67391d9285aff9658ba234202d4e WHIRLPOOL 0893db6ffbc2b37c58b2de8e34e4288640a1d3a5e3a754bd39faec141a7e94e49c83011f5eb58c86afe838fff1b77a661ff63a61f6780f9ca5e5b24f50463014
 DIST conky-1.9.0.tar.bz2 626555 SHA256 baf1b550f135fbfb53e5e286a33aadc03a667d63bf6c4d52ba7637366295bb6f SHA512 98c9f69fd8bee2062e3eddeb7a394cce932199ffd6c8664006d1222f0453569406613e63637848c77a455f7dae3f16be3079a2cab56ecafea51ec043de23c889 WHIRLPOOL 41bbe95ec838dbda2c2d4a9422d2f2f7d22d0cb99e87c59fbd32c0c7856cc83de36cbeefd982c964ec5229ae0b0342e84525aa5343d8c5cf9525205cea4a274a
-EBUILD conky-1.9.0-r1.ebuild 3927 SHA256 055edb8ec877c52317ddcdfc570c676cd27ab141d4117aa159a883834d25c052 SHA512 aedbe9288f487ef51a19d2c5fb500a43d50c0857d25487e237d75dff168ce65d0c489573d3228154ef368819fef41abfb8136a3f8e68c210abb66f0fede4b91d WHIRLPOOL 2ec94a788f43d1a9757aa594b1613af9830c37f7ec338e66f3d6045eae25974ebe26699db1254becce914ac9cc94a4454f560523716c8c264366aaf4ac114068
-EBUILD conky-1.9.0.ebuild 3879 SHA256 f41d0e2fa1fc8fe1a206b93d7372df9f3e3949e8b1a702d70619a57929c0dd32 SHA512 7dd4d060f00ab818fa08b5ad4d1a8dd03ba5e0f9a728374977bd8276b4ee6822cc23110fca1451be1325df9277b08dc66362a418adcb0943445441551ce27bbb WHIRLPOOL d05739038230fae7be5e7da97e24a6e06cad2cf193bb05bb3d8419c9a06b29f4c7dcb168061788e6b8275d91f34c232b33796214c80ebac890f09d66f1d67ef5
-MISC ChangeLog 28642 SHA256 06d049991f524b7870a75e9c7a846992d3e612199b2f743ac8f645ab64a2d2c6 SHA512 746b922031260fc709f90e07d0480e14e5cc851d4338da1a3b621f54081b40bee9ab49bcd0ce30cc446467f96ba6f19f42ccbfff9e09d83c9070cbb3c63e8aa3 WHIRLPOOL ba1bd6e741d651f573f2c03d62084a7233058e61b9712b0c57809d573f823137b469dc5570cac5d30944b98a23fee65a3b5b9dba35151e5cba5b8393960ad4ae
+EBUILD conky-1.9.0-r1.ebuild 3868 SHA256 1b6bda5f69f8cc377701a047407321ca3bee63b5afec8324f3de0ecc9bef1cf8 SHA512 6e7e83f788fe47a6c4dd0f5cbda38eb7c0ba64dc8fa995167c2de50775f3c8f452f3b57e47cdfde1e9c3f3578489a7de426725ffe8345a305513912e47d95e66 WHIRLPOOL 8dbe46c98ddfc9c33e696ed62f1b6846d702ccbe64b21460280d614b9dd19a755c24a33c8030a1e3075e4aa8642d70cae8c4f928625ba2a80fd5073bcb7b9ee8
+EBUILD conky-1.9.0.ebuild 3820 SHA256 dee4d22523b0ed1456e6c94823ae387824ee0cb00d6792dbc76b7c9d8ee090d2 SHA512 3af2fcb94767988d79f92381a0c8adcac6d955571c352a81a20bced5d7e0caf9a1c607579e6dea2fcabb2da64368b8e5142816ab519918a49aba6027a640e7cf WHIRLPOOL fc01d64b93efe64f64bf2503d350229684a2ba1bbb07c18f8fd49094d6939efcce679d1664d3e203061d64ea51af06a4cad91be4ff241e2695f13d730626df4f
+MISC ChangeLog 28790 SHA256 ed0c8658b00368dabd5731c643d0b890f43df4800f8594d0a742dfe535c38ba0 SHA512 5ef15ecb64859ae3ca078b3e0bcb80dcd56083618f45baeab2ddef0d5ef6daf55957492160b0e64424a8a878d3797a8c9fd25184b05e1362d72c825a3f2c9280 WHIRLPOOL a8333e9afd28c3c7dd4f9ff9270095a7ef6cb06bf63f6137f42b8a5f1b02c95ca005ef456071d73cdbf60e418dfa343d33ed1d78d46566d381391093557e3b8c
 MISC metadata.xml 2035 SHA256 7629c0d86a74d086f1b9934919881b5ee82c285e94d58d4a802694633ea11302 SHA512 546dafceed03c1148cdd4003021112306b636124f0f4ee13950d4a1b5bb8a7ff56256e6acf131e08e4573195e987810d562b2c202ba9c3022097a52e47c1f325 WHIRLPOOL 3e2eebfc6456a2e3d4658076ba8a02c84ff7a967768330e6df866589886b10dceccdaf8ff4d6863a2a61f676cb09d60ab8d7f5e57e1ae895b890f12de009dc23
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iEYEAREIAAYFAlB4UQUACgkQlcuUeyFa0U0JPQCdHz7Xw94mroMnaC5Wh9UCqof5
-D+4AoNx5MuqDLUOtCt17hfXRpXHkU3Eg
-=cjRh
------END PGP SIGNATURE-----
diff --git a/app-admin/conky/conky-1.9.0-r1.ebuild b/app-admin/conky/conky-1.9.0-r1.ebuild
index e2731f4e9bc7..42d49de3eab8 100644
--- a/app-admin/conky/conky-1.9.0-r1.ebuild
+++ b/app-admin/conky/conky-1.9.0-r1.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/app-admin/conky/conky-1.9.0-r1.ebuild,v 1.1 2012/08/18 08:48:10 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.9.0-r1.ebuild,v 1.2 2012/11/07 17:07:55 billie Exp $
 
 EAPI=4
 
@@ -121,13 +121,14 @@ src_install() {
 }
 
 pkg_postinst() {
-	elog "You can find a sample configuration file at ${ROOT%/}/etc/conky/conky.conf."
-	elog "To customize, copy it to ~/.conkyrc and edit it to your liking."
-	elog
-	elog "For more info on Conky's features please look at the Changelog in"
-	elog "${ROOT%/}/usr/share/doc/${PF}. There are also pretty html docs available"
-	elog "on Conky's site or in ${ROOT%/}/usr/share/doc/${PF}/html."
-	elog
-	elog "Also see http://www.gentoo.org/doc/en/conky-howto.xml"
-	elog
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "You can find sample configurations at ${ROOT%/}/usr/share/doc/${PF}."
+		elog "To customize, copy to ~/.conkyrc and edit it to your liking."
+		elog
+		elog "There are pretty html docs available at the conky homepage"
+		elog "or in ${ROOT%/}/usr/share/doc/${PF}/html."
+		elog
+		elog "Also see http://www.gentoo.org/doc/en/conky-howto.xml"
+		elog
+	fi
 }
diff --git a/app-admin/conky/conky-1.9.0.ebuild b/app-admin/conky/conky-1.9.0.ebuild
index 25541733b4d6..cff181627440 100644
--- a/app-admin/conky/conky-1.9.0.ebuild
+++ b/app-admin/conky/conky-1.9.0.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/app-admin/conky/conky-1.9.0.ebuild,v 1.7 2012/10/05 17:59:23 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.9.0.ebuild,v 1.8 2012/11/07 17:07:56 billie Exp $
 
 EAPI=4
 
@@ -120,13 +120,14 @@ src_install() {
 }
 
 pkg_postinst() {
-	elog "You can find a sample configuration file at ${ROOT%/}/etc/conky/conky.conf."
-	elog "To customize, copy it to ~/.conkyrc and edit it to your liking."
-	elog
-	elog "For more info on Conky's features please look at the Changelog in"
-	elog "${ROOT%/}/usr/share/doc/${PF}. There are also pretty html docs available"
-	elog "on Conky's site or in ${ROOT%/}/usr/share/doc/${PF}/html."
-	elog
-	elog "Also see http://www.gentoo.org/doc/en/conky-howto.xml"
-	elog
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "You can find sample configurations at ${ROOT%/}/usr/share/doc/${PF}."
+		elog "To customize, copy to ~/.conkyrc and edit it to your liking."
+		elog
+		elog "There are pretty html docs available at the conky homepage"
+		elog "or in ${ROOT%/}/usr/share/doc/${PF}/html."
+		elog
+		elog "Also see http://www.gentoo.org/doc/en/conky-howto.xml"
+		elog
+	fi
 }