diff options
| -rw-r--r-- | app-admin/rackview/ChangeLog | 6 | ||||
| -rw-r--r-- | app-admin/rackview/Manifest | 6 | ||||
| -rw-r--r-- | app-admin/rackview/rackview-0.04-r1.ebuild | 30 | ||||
| -rw-r--r-- | app-admin/rackview/rackview-0.05.ebuild | 36 |
4 files changed, 41 insertions, 37 deletions
diff --git a/app-admin/rackview/ChangeLog b/app-admin/rackview/ChangeLog index d605bde4d9af..0aa1899edf06 100644 --- a/app-admin/rackview/ChangeLog +++ b/app-admin/rackview/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-admin/rackview # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/rackview/ChangeLog,v 1.4 2003/10/12 19:26:36 mholzer Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/rackview/ChangeLog,v 1.5 2004/01/06 11:59:20 robbat2 Exp $ + + 06 Jan 2004; Robin H. Johnson <robbat2@gentoo.org> rackview-0.04-r1.ebuild, + rackview-0.05.ebuild: + grep stuff and those variables should NOT be global *rackview-0.05 (13 Oct 2003) diff --git a/app-admin/rackview/Manifest b/app-admin/rackview/Manifest index f10746b00a5e..eda6721af772 100644 --- a/app-admin/rackview/Manifest +++ b/app-admin/rackview/Manifest @@ -1,5 +1,5 @@ +MD5 f31f93d6110771ffc67d72913d89fef5 rackview-0.05.ebuild 2940 +MD5 70cb0495ed73fe53589bd042e271e897 rackview-0.04-r1.ebuild 3112 +MD5 eda75d243605d8c005bea3bf09547e67 ChangeLog 913 MD5 76da7226792e224b1c67a6232833c650 files/digest-rackview-0.04-r1 66 MD5 6fdb382498c555fbba922d4a14ee953c files/digest-rackview-0.05 66 -MD5 5b21052b3ebfe6e4447bd1ab815f2fe8 rackview-0.05.ebuild 2925 -MD5 765bc58d2e2b7c284510c8fb5f844e2e rackview-0.04-r1.ebuild 3098 -MD5 eb0878c5a528698f8b609d04324b7e04 ChangeLog 757 diff --git a/app-admin/rackview/rackview-0.04-r1.ebuild b/app-admin/rackview/rackview-0.04-r1.ebuild index df608891e950..bd77bf469300 100644 --- a/app-admin/rackview/rackview-0.04-r1.ebuild +++ b/app-admin/rackview/rackview-0.04-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2003 Gentoo Technologies, Inc. +# Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/rackview/rackview-0.04-r1.ebuild,v 1.4 2003/10/24 11:29:39 aliz Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/rackview/rackview-0.04-r1.ebuild,v 1.5 2004/01/06 11:59:20 robbat2 Exp $ inherit perl-module @@ -18,25 +18,25 @@ DEPEND="dev-lang/perl mysql? ( dev-db/mysql )" DOCS="ChangeLog COPYING README* doc/*" -#In case of Apache +src_install() { + #In case of Apache -use apache2 || HTTPD_ROOT="`grep '^DocumentRoot' /etc/apache/conf/apache.conf | cut -d\ -f2`" \ - || HTTPD_USER="`grep '^User' /etc/apache/conf/commonapache.conf | cut -d \ -f2`" \ - || HTTPD_GROUP="`grep '^Group' /etc/apache/conf/commonapache.conf | cut -d \ -f2`" + use apache2 || HTTPD_ROOT="`grep '^DocumentRoot' /etc/apache/conf/apache.conf | cut -d\ -f2`" \ + || HTTPD_USER="`grep '^User' /etc/apache/conf/commonapache.conf | cut -d \ -f2`" \ + || HTTPD_GROUP="`grep '^Group' /etc/apache/conf/commonapache.conf | cut -d \ -f2`" -#In case of Apache2 + #In case of Apache2 -use apache2 && HTTPD_ROOT="`grep '^DocumentRoot' /etc/apache2/conf/apache2.conf | cut -d\ -f2`" \ - && HTTPD_USER="`grep '^User' /etc/apache2/conf/commonapache2.conf | cut -d \ -f2`" \ - && HTTPD_GROUP="`grep '^Group' /etc/apache2/conf/commonapache2.conf | cut -d \ -f2`" + use apache2 && HTTPD_ROOT="`grep '^DocumentRoot' /etc/apache2/conf/apache2.conf | cut -d\ -f2`" \ + && HTTPD_USER="`grep '^User' /etc/apache2/conf/commonapache2.conf | cut -d \ -f2`" \ + && HTTPD_GROUP="`grep '^Group' /etc/apache2/conf/commonapache2.conf | cut -d \ -f2`" -# Else use defaults + # Else use defaults -[ -z "${HTTPD_ROOT}" ] && HTTPD_ROOT="/home/httpd/htdocs" -[ -z "${HTTPD_USER}" ] && HTTPD_USER="apache" -[ -z "${HTTPD_GROUP}" ] && HTTPD_GROUP="apache" + [ -z "${HTTPD_ROOT}" ] && HTTPD_ROOT="/home/httpd/htdocs" + [ -z "${HTTPD_USER}" ] && HTTPD_USER="apache" + [ -z "${HTTPD_GROUP}" ] && HTTPD_GROUP="apache" -src_install() { perl-module_src_install diff --git a/app-admin/rackview/rackview-0.05.ebuild b/app-admin/rackview/rackview-0.05.ebuild index 6d8c3c10a8e7..d34650eb407b 100644 --- a/app-admin/rackview/rackview-0.05.ebuild +++ b/app-admin/rackview/rackview-0.05.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2003 Gentoo Technologies, Inc. +# Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/rackview/rackview-0.05.ebuild,v 1.3 2003/11/11 13:05:14 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/rackview/rackview-0.05.ebuild,v 1.4 2004/01/06 11:59:20 robbat2 Exp $ inherit perl-module @@ -20,24 +20,24 @@ DEPEND="dev-lang/perl DOCS="ChangeLog COPYING README* doc/*" -if [ `use apache2` ] ; then - #In case of Apache - HTTPD_ROOT="`grep '^DocumentRoot' /etc/apache2/conf/apache2.conf | cut -d\ -f2`" \ - HTTPD_USER="`grep '^User' /etc/apache2/conf/commonapache2.conf | cut -d \ -f2`" \ - HTTPD_GROUP="`grep '^Group' /etc/apache2/conf/commonapache2.conf | cut -d \ -f2`" -else - #In case of Apache2 - HTTPD_ROOT="`grep '^DocumentRoot' /etc/apache/conf/apache.conf | cut -d\ -f2`" \ - HTTPD_USER="`grep '^User' /etc/apache/conf/commonapache.conf | cut -d \ -f2`" \ - HTTPD_GROUP="`grep '^Group' /etc/apache/conf/commonapache.conf | cut -d \ -f2`" -fi +src_install() { + if [ `use apache2` ] ; then + #In case of Apache + HTTPD_ROOT="`grep '^DocumentRoot' /etc/apache2/conf/apache2.conf | cut -d\ -f2`" \ + HTTPD_USER="`grep '^User' /etc/apache2/conf/commonapache2.conf | cut -d \ -f2`" \ + HTTPD_GROUP="`grep '^Group' /etc/apache2/conf/commonapache2.conf | cut -d \ -f2`" + else + #In case of Apache2 + HTTPD_ROOT="`grep '^DocumentRoot' /etc/apache/conf/apache.conf | cut -d\ -f2`" \ + HTTPD_USER="`grep '^User' /etc/apache/conf/commonapache.conf | cut -d \ -f2`" \ + HTTPD_GROUP="`grep '^Group' /etc/apache/conf/commonapache.conf | cut -d \ -f2`" + fi -# Else use defaults -[ -z "${HTTPD_ROOT}" ] && HTTPD_ROOT="/home/httpd/htdocs" -[ -z "${HTTPD_USER}" ] && HTTPD_USER="apache" -[ -z "${HTTPD_GROUP}" ] && HTTPD_GROUP="apache" + # Else use defaults + [ -z "${HTTPD_ROOT}" ] && HTTPD_ROOT="/home/httpd/htdocs" + [ -z "${HTTPD_USER}" ] && HTTPD_USER="apache" + [ -z "${HTTPD_GROUP}" ] && HTTPD_GROUP="apache" -src_install() { perl-module_src_install dodoc ${DOCS} |