summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2011-11-03 00:46:33 +0000
committerMike Frysinger <vapier@gentoo.org>2011-11-03 00:46:33 +0000
commitf7f04739b24c35f252e297580580518872c85e62 (patch)
tree49dce892dc2aabe8ad5d67f1977dfad2905aae4f /www-servers
parentUse new egethome helper rather than calling getent directly. (diff)
downloadgentoo-2-f7f04739b24c35f252e297580580518872c85e62.tar.gz
gentoo-2-f7f04739b24c35f252e297580580518872c85e62.tar.bz2
gentoo-2-f7f04739b24c35f252e297580580518872c85e62.zip
Use new egethome helper rather than calling getent directly.
(Portage version: 2.2.0_alpha71/cvs/Linux x86_64)
Diffstat (limited to 'www-servers')
-rw-r--r--www-servers/tomcat/ChangeLog6
-rw-r--r--www-servers/tomcat/tomcat-5.5.27-r4.ebuild8
-rw-r--r--www-servers/tomcat/tomcat-5.5.27-r5.ebuild6
3 files changed, 12 insertions, 8 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/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"