Explain about gnupg only if this is a new install and if gnupg is not installed.

Package-Manager: portage-2.2.0_alpha169/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

3 files changed, 15 insertions, 9 deletions

diff --git a/dev-util/debootstrap/ChangeLog b/dev-util/debootstrap/ChangeLog
index def90e136b2d..75c9548fa3cb 100644
--- a/dev-util/debootstrap/ChangeLog
+++ b/dev-util/debootstrap/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/debootstrap
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/debootstrap/ChangeLog,v 1.214 2013/03/23 18:22:00 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/debootstrap/ChangeLog,v 1.215 2013/03/23 18:45:41 jer Exp $
+
+  23 Mar 2013; Jeroen Roovers <jer@gentoo.org> debootstrap-1.0.47.ebuild:
+  Explain about gnupg only if this is a new install and if gnupg is not
+  installed.
 
 *debootstrap-1.0.47 (23 Mar 2013)
 
diff --git a/dev-util/debootstrap/Manifest b/dev-util/debootstrap/Manifest
index d38b3b61cb4a..c43eb1208a7f 100644
--- a/dev-util/debootstrap/Manifest
+++ b/dev-util/debootstrap/Manifest
@@ -5,13 +5,13 @@ DIST debootstrap_1.0.46.tar.gz 58884 SHA256 225232404b0729d7322d4428492338e31301
 DIST debootstrap_1.0.47.tar.gz 57858 SHA256 5b7650dc32f427f7cd03c63aad147ac674099a5eb5bbad383940ff38ae9f4ec4 SHA512 200ecb1984be189fd6710858149496d354a62d631429ac6804112c7f8444d2e63b529f773d53c939f19f7b6fd28a39de5f449d8a259a336aac0e584a8e5ce5b0 WHIRLPOOL 8c225284f484683b257994ac99c27df0e56797b3ac67b4598c6a79a51d0fe9278f4a925ac04fe10bfd805635a4963ef4c940badebcc5f187c1a65315f81ee600
 DIST devices.tar.gz 47835 SHA256 0d93f93c8b21160069d14e74f8f990a2e0e1e5a90dc828b29e6b3f5aa5829e48 SHA512 994ec8d72e3d52d2d872f7ff0da2336e4cbd3a5fa73bb6cdb9e06f5e7f5b8c69cea639c738fdba1186f382d6dcf62e7746fface664bfbd744aac24b16f034432 WHIRLPOOL 222963bb920e1311bc2f481bba04e49f386b60cce6ce0576424896277e0c4fc6a339d4403d587744c32b0bfb1db6391f200fa8d66117e3f21e1c12f35365d732
 EBUILD debootstrap-1.0.46.ebuild 918 SHA256 8309cc0c3b90359d336d19fbaf548b013ef085813ca1ccbdfac447477d3c1523 SHA512 0419c24787e68d20d6699cac3e668b9e1205cc0fd758fed37f928a41a3f0d5043dd5fd8a45fa55b88a7a7f529e52424d51b6a46bc48880073e35a8b2d887a072 WHIRLPOOL e16a834b44d33e10bcd2a9e6013aab15e9479010a0cbfa8ee2379e31d344e830607ba2ff37e112e51094cdd7f17c962329e97663643fca7b904f21db322f0caa
-EBUILD debootstrap-1.0.47.ebuild 926 SHA256 a332c091c056138a71a476ae1abf0085bbe1003844701eb0b36f737e6b195941 SHA512 03a4a8885aee9992150d8c6fd0b442b9fec127721c51a50ec9398ac98999ace1fc0fbf1db57aef57802a1e441d7e4bd4b1904926ac1e0732fca4fa7686e43874 WHIRLPOOL 1bc853b876238e44a8e25e17fa1111e3de8c5e2b6c647950dfcba212204b71752d30c2440cc422fa125f5a627928f62c84afa23c82719c7e6baeb299f761f9e9
-MISC ChangeLog 26889 SHA256 6c1575515a75471d2a07a6c59ce1952cfa5ce889ede74ee2632d0d6ea6f7f358 SHA512 7b5231606648ff10662f30215427ffb7712e0a89bcc55a5726c3aee8b1d2af9e3ec5e440f7a0140cef833b5eeef9e6d099457035a4342d78bdefb8269d510253 WHIRLPOOL ce24cdced54b06e7c27859f014048e8c48ffbafe1650c00b38c36fe198af99569cb7a4a99f3c28b29aa33e11b3f4ac3043ac5fb764445ace73f601f25215da81
+EBUILD debootstrap-1.0.47.ebuild 1007 SHA256 862d2cc4b6a1bbd87d6cfb01b200a781ad87ea38e5b505a2db285eab89ae2b88 SHA512 716fe8403510c3ad083ec0a0aaaeb3991f14c13ab0dae528101631d07af6f0dae56aa1da952cbfeb1f3f91f39a4d18f7e2ef0ecee962e1d32f73d70214ba5e36 WHIRLPOOL a7c77ca49419ffadce221bc12bfe5a34edaaeb35afba34fcf85afc43688a902e0d2775ba8b0d55baf2480fd784d1d1fe83e14eb0c93841b79fa5a83d5b65d390
+MISC ChangeLog 27049 SHA256 f2f34a1c91aef148450ba9485d267c89d6a1b8c14b919a66d6ae3b9b9c10bbb0 SHA512 b7b6a2e29c586458b0e9887f8b6c044247c3f59a4a64beaec4e91c56ad01fc0a8b2ccf77cf879d07e5403a89a697dc3a838e969d6f8700b49cc2f25b502f24fe WHIRLPOOL e135dede26025845954b84011f6c038d2ae2fb1a61e29245e93ca2d0c97834673c9be74306f332b0a07095eb7b900ecbbbf0dfc9c6b7552668569986bcba6dac
 MISC metadata.xml 254 SHA256 2790aaa1752a64752fb0a90f28f292669aa359e1c1583ad3834746b55e86dbd2 SHA512 b8d3d7e0aaa35ea183b5b2978ed73ddaea52efe0f14ac2f45cbd64fd7d7a49383330ab3bf5f9777681df053584d5f392b6b6c22dbd778abfe39b8e0cc5915220 WHIRLPOOL 3403ae3dad61712af8ca7359fcb2124a509796fcc6a71d5a6c34cbc80ddcbdde48eddc03bbc559250b9bb818d2464b36143d17d98f21c6eacec34b6bda1ba048
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlFN8s8ACgkQVWmRsqeSphPylQCeK6Trg1vqcaljH6rwQJDUKlmb
-oN8AnAv98dpas7VKkY7Ecxsv/UUhzJPL
-=k0Jw
+iEYEAREIAAYFAlFN+FYACgkQVWmRsqeSphO8wACfQRxozcPDML4ebKUwqxzJQnvo
+ld4AnAwKqhbxNVG7sVDH4tb6HmDwvQT4
+=HbaL
 -----END PGP SIGNATURE-----
diff --git a/dev-util/debootstrap/debootstrap-1.0.47.ebuild b/dev-util/debootstrap/debootstrap-1.0.47.ebuild
index f986c3167672..77e54df7a45e 100644
--- a/dev-util/debootstrap/debootstrap-1.0.47.ebuild
+++ b/dev-util/debootstrap/debootstrap-1.0.47.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/dev-util/debootstrap/debootstrap-1.0.47.ebuild,v 1.1 2013/03/23 18:22:00 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/debootstrap/debootstrap-1.0.47.ebuild,v 1.2 2013/03/23 18:45:41 jer Exp $
 
 EAPI=5
 inherit eutils
@@ -38,6 +38,8 @@ src_install() {
 }
 
 pkg_postinst() {
-	elog "To check Release files against a keyring"
-	elog " (--keyring=K), please install app-crypt/gnupg."
+	if ! has_version ${CATEGORY}/${PN} && ! has_version app-crypt/gnupg; then
+		elog "To check Release files against a keyring"
+		elog " (--keyring=K), please install app-crypt/gnupg."
+	fi
 }