Use new egethome helper rather than calling getent directly.

Package-Manager: portage-2.2.0_alpha71/cvs/Linux x86_64

4 files changed, 19 insertions, 15 deletions

diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog
index c892273c563f..f36a10a1a990 100644
--- a/www-servers/tomcat/ChangeLog
+++ b/www-servers/tomcat/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-servers/tomcat
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.266 2011/10/27 15:54:43 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.267 2011/11/03 00:46:33 vapier Exp $
+
+  03 Nov 2011; Mike Frysinger <vapier@gentoo.org> tomcat-5.5.27-r4.ebuild,
+  tomcat-5.5.27-r5.ebuild:
+  Use new egethome helper rather than calling getent directly.
 
   27 Oct 2011; Tony Vroon <chainsaw@gentoo.org> tomcat-6.0.33.ebuild:
   Marked stable on AMD64 based on arch testing by Ian "idella4" Delaney &
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 18df9488926f..6e7e53747d52 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX 5.5/26-main_tomcat_catalina_jasper_build_xml.patch 16573 RMD160 53f1deaa88a39459a584cf14c761cb411d68f2e6 SHA1 69b3ca39f9dbabe12c56865d47866c06dcb7c2e3 SHA256 99a2c1bb164d97407525305512a85e6139531d81a47aa2c25f5c2cfe50aee1f6
 AUX 5.5/5.5.27-dynamic-JSSE13Factory.patch 1853 RMD160 31d20202a3be06c156b0c13f0afb3b394b8ecf02 SHA1 d7e7640dd4f7b7b92b21ac51d1b508fe56691a81 SHA256 f7db0e692088ec25a4731a521c1da4a0075e747f68690235fde3ca93c6f2e19d
@@ -20,17 +20,17 @@ DIST apache-tomcat-5.5.27-src.tar.gz 7382057 RMD160 8114fa3be19fd28a5d2d0d7e7087
 DIST apache-tomcat-6.0.32-src.tar.gz 3394648 RMD160 e6203645e6570564b25154018436d908c5b1a71a SHA1 ec94c511e54da2b02dd2ba45b9fd1703d5771a45 SHA256 aa2b72343f2d7f5090e8aabdbf6e0c4f65cd504a719ebb2e18268207ff2c426c
 DIST apache-tomcat-6.0.33-src.tar.gz 3389376 RMD160 24bd6c0e1bee7daa4cb59ec56552599330f0bb4c SHA1 437db0ba55c6e398fe3af73c4fa5eed3c4666842 SHA256 6dbd5d6eedcf3acd8bf7b6e32544a6e94ec595f7c921baa92f08adb5a5d91b64
 DIST apache-tomcat-7.0.22-src.tar.gz 4044650 RMD160 e49636d4555f92a4f56a46aee7fcdec3ede5b1f1 SHA1 588512b2149850b3e6de1ac20c79b54aea074eff SHA256 e907cc65ec38cf9e01995432cc7925c18d03cdbc0dd6baa8f82df2bae83c8486
-EBUILD tomcat-5.5.27-r4.ebuild 10058 RMD160 a235794b1e53760c35289566dcaff2446437f53d SHA1 a49fb2db00fbcab78ab8672cdb11a8b0404df671 SHA256 18b69fb66c088a621db636243823701504af0a1dcc16df378e018f1958ecfa01
-EBUILD tomcat-5.5.27-r5.ebuild 10119 RMD160 ef3c4d2d31ca81fdc357afdb11c13704ed14a5a1 SHA1 daf3d57e12f9bd8f25465e74be7f3bef945a8db2 SHA256 2dcbf313716d4e208f3c70abc759a9c43cb066705793d1ad94304363b270906f
+EBUILD tomcat-5.5.27-r4.ebuild 10028 RMD160 39b0fde8bce7ca92a11d69992f1f8ba70404d70d SHA1 31953fe9665686f43d333608dfb73eff87717bae SHA256 bb074efd50f5164c4b07b97de1de0d77cc05c8548112de7f873fb1afe2b04b19
+EBUILD tomcat-5.5.27-r5.ebuild 10087 RMD160 f9f32edcf802c72499de5519e332aaf7b4b7efbf SHA1 7d494c9bd1ea4b6da8bf4913c8f28e7180d57535 SHA256 93e335594ff10e4bd9d9d2537f0ba5d701c909e181d0fe25d841b771743ec8fb
 EBUILD tomcat-6.0.32-r1.ebuild 6964 RMD160 a38e0536f45b4fbf5d4cbffb903a11c83948bdb4 SHA1 3196907adc07db41a62c43078c1c078a11e4d249 SHA256 00f8ecbc1676db5902971dd76d354e8b5bfe8938f285e9d5578e64160dcc087b
 EBUILD tomcat-6.0.33.ebuild 6964 RMD160 bdf0ef718421ae334f1477ff1efb0c3c4ec0f4b2 SHA1 8d27f1b93e091d3114d3cc4fef4b85cd956c4e9e SHA256 15776bbc32f99efc2778f545c9583154a42f55ac627762518b1f69b453f8fa8d
 EBUILD tomcat-7.0.22-r1.ebuild 7061 RMD160 bee674c76e8b18d6f7151b8c97ca7ce518cbec5c SHA1 667080b1585a16af1153d09c65b338a803bd7f4b SHA256 4896d355fcfbd5053584d83b01d6cd94ab965daa61113a26110c44f7eb09ccde
-MISC ChangeLog 66647 RMD160 5aa07b90a2dd61b7c4d40aa586f813677c4c1997 SHA1 f4595116ca09b8ad07f316325538645a92204915 SHA256 12758e7a8079aaa739293ebf2d8ba77a42f75ff6ad4ceb6cb740dae88319991e
+MISC ChangeLog 66811 RMD160 5a6624efd36ca85a6c22bfc0e102ed796599298e SHA1 b283e91d220966e75a2be0f94ae2f5cc8b4303d3 SHA256 a617c35692442096af26ba0f540f5e6e37ad2db659612126cb713abcd61547a3
 MISC metadata.xml 521 RMD160 72b6ce433f5c9a65deaa0c1830c070c3adbcf33a SHA1 2c4f4fd887a5df9e955c711d0fcd21a5cab90a2d SHA256 dbab559e58c59eddd5df1c3bb39d17b26fadb587ad5dab51fc6fa7af5e601e22
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk6pftQACgkQp5vW4rUFj5pPaQCggjumAEmU933hrllyesXXxgj2
-mmEAnR6aZSMOGfWBaBHgJdKuboamnx/s
-=7FI8
+iF4EAREIAAYFAk6x5HUACgkQaC/OocHi7JaxOwD/TIfn7lUIkGOQD1DVBFAUEiB7
+IaFJJmPPAjgArU1XS+IA/Aku2bzMTxE+BwtxrOwpwRirTuBy6Dsx1Iuv7pVnsw12
+=y4IF
 -----END PGP SIGNATURE-----
diff --git a/www-servers/tomcat/tomcat-5.5.27-r4.ebuild b/www-servers/tomcat/tomcat-5.5.27-r4.ebuild
index 281304f59fbf..fdd2dbf463f6 100644
--- a/www-servers/tomcat/tomcat-5.5.27-r4.ebuild
+++ b/www-servers/tomcat/tomcat-5.5.27-r4.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.5.27-r4.ebuild,v 1.2 2009/11/02 21:44:55 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.5.27-r4.ebuild,v 1.3 2011/11/03 00:46:33 vapier Exp $
 
 EAPI="2"
 JAVA_PKG_IUSE="doc source"
 WANT_ANT_TASKS="ant-trax"
 
-inherit eutils java-pkg-2 java-ant-2
+inherit eutils java-pkg-2 java-ant-2 user
 
 DESCRIPTION="Tomcat Servlet-2.4/JSP-2.0 Container"
 
@@ -273,7 +273,7 @@ set_webapps_perms() {
 
 pkg_config() {
 	# Better suggestions are welcome
-	local currentdir="$(getent passwd tomcat | gawk -F':' '{ print $6 }')"
+	local currentdir=$(egethome tomcat)
 
 	elog "The default home directory for Tomcat is /dev/null."
 	elog "You need to change it if your applications needs it to"
diff --git a/www-servers/tomcat/tomcat-5.5.27-r5.ebuild b/www-servers/tomcat/tomcat-5.5.27-r5.ebuild
index 16be926787e6..2a3bbcc5f430 100644
--- a/www-servers/tomcat/tomcat-5.5.27-r5.ebuild
+++ b/www-servers/tomcat/tomcat-5.5.27-r5.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.5.27-r5.ebuild,v 1.1 2011/01/19 02:40:47 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.5.27-r5.ebuild,v 1.2 2011/11/03 00:46:33 vapier Exp $
 
 EAPI="2"
 JAVA_PKG_IUSE="doc source"
 WANT_ANT_TASKS="ant-trax"
 
-inherit eutils java-pkg-2 java-ant-2
+inherit eutils java-pkg-2 java-ant-2 user
 
 DESCRIPTION="Tomcat Servlet-2.4/JSP-2.0 Container"
 
@@ -274,7 +274,7 @@ set_webapps_perms() {
 
 pkg_config() {
 	# Better suggestions are welcome
-	local currentdir="$(getent passwd tomcat | gawk -F':' '{ print $6 }')"
+	local currentdir=$(egethome tomcat)
 
 	elog "The default home directory for Tomcat is /dev/null."
 	elog "You need to change it if your applications needs it to"