use readme.gentoo with some minor custom to support 9999 better

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xDD11F94A

3 files changed, 43 insertions, 24 deletions

diff --git a/net-analyzer/nmap/ChangeLog b/net-analyzer/nmap/ChangeLog
index 5a13e40869e1..62b8affa0d9d 100644
--- a/net-analyzer/nmap/ChangeLog
+++ b/net-analyzer/nmap/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-analyzer/nmap
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.337 2015/05/12 16:43:07 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.338 2015/05/12 17:27:40 zerochaos Exp $
+
+  12 May 2015; Rick Farina <zerochaos@gentoo.org> nmap-9999.ebuild:
+  use readme.gentoo with some minor custom to support 9999 better
 
   12 May 2015; Rick Farina <zerochaos@gentoo.org> nmap-9999.ebuild:
   improve postinst message for fcaps
diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index a7a9583d95a0..4625ee64d796 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -14,23 +14,23 @@ DIST nmap-6.47.tar.bz2 7878122 SHA256 8fa11e9e203ce2d81a207db5ca4f110a525f6c01c1
 DIST nmap-logo-64.png 3289 SHA256 4c72ff1eeffeeaa1039b251d9f2d675936e65db686fe3b57a35c2183ce67a8aa SHA512 fb102d12aaeebc8a97543ecd653a3606e86996ad679bc26d6e6e274ad05ec3e9f92521289d1a24153c521b699e8c0cfa65d8856bb49af53ee4837268bbc6b5d3 WHIRLPOOL 6093aadcb9880587e17d39d45fcbe57bb62777f220655e6ed5b5f900ce49cb8c5a53e24d7db0de6f8909eb0f8981f7565e6ae9b9bf9283a4ccccb0526eab5313
 EBUILD nmap-6.47-r1.ebuild 3816 SHA256 0414c7794fcb9d8c6d6c30b7d51b3418806cbddbd90a6472b07e9e8a658e050b SHA512 9b06ce439ba656b8f2b3cef0d03a2b8744e95fa4eacc47701fe97ba17b1a4c3879011b1bb4b7b3efff8fc78c6b8cbec497a2a95097ed0b0f2cd86ab0849e9b50 WHIRLPOOL 35a944028c2da4234257e30e21c3d3bf8b2843c8a2f6506963b88f60b74d23e97599cb10e67f2baedbbb41b7f7e2eeafab33fdfa2de3ed2a2606d2e98e5638bd
 EBUILD nmap-6.47-r2.ebuild 3826 SHA256 f60ece99695d4172422595c96308d344edfbcdfc2cd31ceaff8aae6d1ae1e211 SHA512 d9ae78487a65863c06dcb3a2c63b6ba227685ecd6e2a0a5295dbe4ba4c0dea4c6545f3ae84b407fc06d674d795f7b7ce9bdfd58dfcb06823ec009eab912de878 WHIRLPOOL 682385e7e44e7a6740453d8a8cc743b03535cc6e910fc1f116b8001f04d752e57925911a6c461b4ba6a35596379a35f2e3887b67dea38c7b5fdcaf9d08d71631
-EBUILD nmap-9999.ebuild 4505 SHA256 bef8ac3ab10b04fef3bbf0ab0fd09cfdd30d097454e4d4c72f0a5882e39f24a0 SHA512 13dcafd36349a382654ef203a1e3246e0a79e8f732767a0256f84456e20a9d9a01e968de9de6c2b360c9967106886f410ccec4db3108cf0dfac952f3f18beeb9 WHIRLPOOL 52f0d9d5d2ff61926ac354f3ab98fe08e3a9f7ff69c20a40573ce3e01cee583956424cb4418c033a67f858e25dd705e56ef477b103bf12d4345775fdfe9f079c
-MISC ChangeLog 42166 SHA256 c7fd35de8cd45a92b2ecdbdd2baad5e3dd759d000a4da2a5db077889e5341031 SHA512 10361ed330a526aa477511514061ce20a64d2671aef61a483bfc7dbb6e87588ad02f3903af6200266e63c6bfef6aa5d2678c1345c0c1851bf3e1ebfe552b30cb WHIRLPOOL 5668cef37c3e15df7e70ce6ce76ac1e830c6c857e82d8f0bb1f701bb2efa207fe0769c3208674e9ac69d9ea064d121294f24870de7ccf258db3d38896db15314
+EBUILD nmap-9999.ebuild 5052 SHA256 d7e85d8361122f7930a80922a37f1215a4b324605c4ebb75ca0a246bfe819c82 SHA512 ef8655c8c00bf36268d528425bfb441516716cc1f8e357a7ed91ac67832563ae7184334f379e2c270eaba2e57c54a64d2d04ad565f9fe3443645653239d1c966 WHIRLPOOL fc8aeb0f76d2c18d3d2550a8a0945a779a9b517a1f1824251e777d17fcbe8e1a805bc057596eda28e806138c58f5d4b6e6b83dff09c5feb7710f74b7934ea163
+MISC ChangeLog 42301 SHA256 86d93cd4050030d070ca8def7599d3ae7c8bf7666123b1e4b360010171891145 SHA512 ba7660498d852a13bb4b1cc35591855b60f3a3b90d8fc4327ef0580672533cca96bccdadb31fed745e017817c3f23f680d462f5cec3ecd7fe06dcdefa48eee2b WHIRLPOOL 86a689fecdfde705e79101e5e23ef799a29528e05b4efd12b01d0ffd2c6e6dea35eec0fe34135eb0130a3bf25e14488f4da7ecf4decb602ca5fcfdb59854d3a6
 MISC metadata.xml 774 SHA256 761bbc48753242190632a8a9b0cb8cee34f3969d00f29f36a4a02154d63bfcec SHA512 6c4f041b3a22abd05e75280b762dbdb04ad47505495443fbd4594e176bd68c375e727f9326c761964cc2a41da3a7d54c1213893b529892d972ef83bbe962fa0f WHIRLPOOL f730883a5efb88e96fd7839d434a60ce6f4f5fb7ef2a6376bb65324d004682c1f4ea145eaa156efa36bcf402a2780a30372157a349966eafa82039509798535e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVUi2aAAoJEKXdFCfdEflKLTUP/RI/Oa2zxO9FHLwB5+bag1x6
-TQ/XOEg5Xh4xOA9Xc4GSmGRdN2xTgMobWGviRmQcYwNGa4TjT7ni0vrxCX+LjbT6
-obdYjTEAySqQmqP71KZ5stDed8pFjHyI61E9nAPQdykVbdjz/r8O5EotI6xzW+T+
-w7wBL0fPyp/yO4eTjb0gFDuQ4qr2+nrhWIzyvP0ChgQz/fJGn1+gUb9Pck4NUvtF
-Jt4p8R86O5VVbJfTWgb+jaulrdC8AzYtObdemPI4mknoxRgeghdX3ElrLFLKO+8i
-HuhGzdAtiCbaOAKd1JgJ632F9RSfrxpnuuHhrvIHs4Z+Ep34FTlu8dui8uzMlCuc
-AZG/yCC+/Rblp78O0C8PZBPcoXI6lEVV50zfHnxUMbTUNFB/1noGIuRY9AIDAJwt
-EOD4T4FH7L1c/ekNsGptnkPOcWfHL6AZmreT/B9K4aNXSy9nnEtCbMDwCLXH86HZ
-7bhiALFlFzkIPYlOKnHFZje4KPcQvoBWwq7V5XYUx/6JxSB00G9NMy4MM0kZoKQO
-3TjXjpDXwlxtPBHo7Szgm1AZNMtpwm2s05pUkIkENoUvaRJxtRbmn5D6cSr+B17C
-mFM46eEGHKmf3M+DDch5sMf+duLKyqkk7ucSMQ6Vx0lhNHb9hVjgzqVfnY/onLRw
-zdLcTfleegHU5XXB19x+
-=8pUz
+iQIcBAEBCAAGBQJVUjgKAAoJEKXdFCfdEflKGqUQALI3rY7gfSdfkQlu6prqYX8W
+riUkrRCZrF8eSQI5BJ1FkkkjMQBc2s0CpU18YSFzlbXnST2KDRkfDOedFh2KkySn
+TlpSfy8PRWnY0aOnfEbBKUgYgudImpuJ45SvwjMpvwepF5ofGyHAQYy/kAruurGn
+wGEX/eircw1wfOSIOjCbVBCEdKHp+yDfMwYPpuoO2XOusFlqfpTDcgssfzKhGll9
+IDJvU5OOfV3GS/zn7OYgGmJ7uetZ+/Lu53u/MwhR4HI+71YTaQtMFfEOePa/rS/F
+XkjXsn8eyJ+qzN7v1Yi1GeelO2dHdSbBBPs616UVI09UBA8xKzKfREWM4J/hYVNE
+ql+nVSoQHSvkx8GMV52B3lPPJkL06VyM5/66oLwkGSa+Oqf4EPBmM7VWksrht1ja
+7YwM8nGHbz09cT8gD3MFxbVjMcqBcOUi9sCtGYivMRumsZ+EXEJ7XgWgeFZbC8SP
+Glv01JTsxZZ7bOGTuWaWjEi7uZlzjmP/OLps6hp9s8Zz2M3Jy5SbAwHIP3nUmRXn
+4oNeMxuCqsbx+XUhhL8NTwQw7tdMb+5Uy907vH43OlUP2huC0g9MuoE8NgvBlhwp
+wkfVOS0O5Ydqt0EwfJlAwCZSncvBSfvOteuj3ydpfyY8b0qdPif/jd0bWHYvNxBJ
+tIdHGrxrImOlOt3bVSsl
+=h3FO
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild
index 36a7b832b30a..8a69fff9fdc3 100644
--- a/net-analyzer/nmap/nmap-9999.ebuild
+++ b/net-analyzer/nmap/nmap-9999.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-9999.ebuild,v 1.5 2015/05/12 16:43:07 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-9999.ebuild,v 1.6 2015/05/12 17:27:40 zerochaos Exp $
 
 EAPI=5
 
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="sqlite,xml"
-inherit eutils fcaps flag-o-matic python-single-r1 toolchain-funcs user
+inherit eutils fcaps flag-o-matic python-single-r1 readme.gentoo toolchain-funcs user
 
 MY_P=${P/_beta/BETA}
 
@@ -18,6 +18,7 @@ if [[ ${PV} == "9999" ]] ; then
 	ESVN_REPO_URI="https://svn.nmap.org/nmap"
 	SRC_URI="http://dev.gentoo.org/~jer/nmap-logo-64.png"
 	KEYWORDS=""
+	#FORCE_PRINT_ELOG="true"
 else
 	SRC_URI="
 		http://nmap.org/dist/${MY_P}.tar.bz2
@@ -60,6 +61,13 @@ DEPEND="
 
 S="${WORKDIR}/${MY_P}"
 
+DOC_CONTENTS="To run nmap as normal user you have to add yourself to the \
+nmap group AND pass --privileged on the command line. This security \
+measure ensures that only trusted users are allowed to run nmap. \
+To avoid passing --privileged every time, add \
+'export NMAP_PRIVILEGED=\"\"' to your user environment (eg ~/.bashrc)."
+
+
 pkg_setup() {
 	if use ndiff || use zenmap; then
 		python-single-r1_pkg_setup
@@ -153,6 +161,8 @@ src_install() {
 		doicon "${DISTDIR}/nmap-logo-64.png"
 		python_optimize
 	fi
+
+	readme.gentoo_create_doc
 }
 
 pkg_postinst() {
@@ -163,10 +173,16 @@ pkg_postinst() {
 		cap_net_raw,cap_net_admin,cap_net_bind_service+eip \
 		"${EROOT}"/usr/bin/nmap
 
-	ewarn "NOTE: To run nmap as normal user you have to add yourself to the"
-	ewarn "nmap group AND pass --privileged on the command line. This security"
-	ewarn "measure ensures that only trusted users are allowed to run nmap."
-	ewarn "To avoid passing --privileged every time, add"
-	ewarn "'export NMAP_PRIVILEGED=\"\"' to your user environment (eg ~/.bashrc)."
+	if [[ ${PV} == "9999" ]] ; then
+		einfo "To run nmap as normal user you have to add yourself to the nmap group"
+		einfo "AND pass --privileged on the command line. This security measure"
+		einfo "ensures that only trusted users are allowed to run nmap. To avoid"
+		einfo "passing --privileged every time, add 'export NMAP_PRIVILEGED=\"\"' to"
+		einfo "your user environment (eg ~/.bashrc)."
+	else
+		if [[ ${REPLACING_VERSIONS} < 6.48 ]]; then
+			FORCE_PRINT_ELOG="true"
+		fi
+		readme.gentoo_print_elog
+	fi
 }
-