summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app-office/phprojekt/ChangeLog8
-rw-r--r--app-office/phprojekt/Manifest8
-rw-r--r--app-office/phprojekt/phprojekt-3.2a.ebuild31
-rw-r--r--app-office/phprojekt/phprojekt-4.0-r1.ebuild7
-rw-r--r--app-office/phprojekt/phprojekt-4.1.ebuild9
5 files changed, 35 insertions, 28 deletions
diff --git a/app-office/phprojekt/ChangeLog b/app-office/phprojekt/ChangeLog
index eb869b39fa70..43ce22dfd518 100644
--- a/app-office/phprojekt/ChangeLog
+++ b/app-office/phprojekt/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-office/phprojekt
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/phprojekt/ChangeLog,v 1.8 2003/12/30 14:14:35 mholzer Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/phprojekt/ChangeLog,v 1.9 2004/04/21 18:58:10 mholzer Exp $
+
+ 21 Apr 2004; Martin Holzer <mholzer@gentoo.org> phprojekt-4.0-r1.ebuild,
+ phprojekt-4.1.ebuild:
+ moving webapp-detect into pkg_setup. closes 44780 and 48380.
*phprojekt-4.1 (30 Dec 2003)
diff --git a/app-office/phprojekt/Manifest b/app-office/phprojekt/Manifest
index 97e9b3213339..8f9791cfd0e0 100644
--- a/app-office/phprojekt/Manifest
+++ b/app-office/phprojekt/Manifest
@@ -1,7 +1,7 @@
-MD5 7841a3cb70d756eb8d26db359e439342 ChangeLog 1025
-MD5 b762d61f8297ce34866a3cdbbe80acc0 phprojekt-3.2a.ebuild 862
-MD5 914d63091f79d6dbf518434fc0955412 phprojekt-4.0-r1.ebuild 858
-MD5 857758cd4f29274bc118709270595085 phprojekt-4.1.ebuild 855
+MD5 6000cc97fb5e39e23d274deafb98ba81 ChangeLog 1188
+MD5 bbfa5e54308d63cffec5f85562bea8e3 phprojekt-3.2a.ebuild 873
+MD5 b2f991dd8b6671cbf3c259ba26fed9d6 phprojekt-4.0-r1.ebuild 858
+MD5 67704ef271972b932b7ed0bf07f9a780 phprojekt-4.1.ebuild 854
MD5 c339473e0ff43da76eb2f2607c441921 metadata.xml 280
MD5 a5312d2a7dbb70b1d0416e37c9fd82d8 files/digest-phprojekt-3.2a 61
MD5 a4fc4523f14a2ad77b9d00dd7e386b88 files/digest-phprojekt-4.0-r1 65
diff --git a/app-office/phprojekt/phprojekt-3.2a.ebuild b/app-office/phprojekt/phprojekt-3.2a.ebuild
index d57ae78313f6..53add002c5ca 100644
--- a/app-office/phprojekt/phprojekt-3.2a.ebuild
+++ b/app-office/phprojekt/phprojekt-3.2a.ebuild
@@ -1,29 +1,34 @@
-# 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-office/phprojekt/phprojekt-3.2a.ebuild,v 1.5 2003/02/13 09:19:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/phprojekt/phprojekt-3.2a.ebuild,v 1.6 2004/04/21 18:58:10 mholzer Exp $
-# lid of download link
-MY_DOWNLOAD_ID=14
-
-HTTPD_ROOT="`grep '^DocumentRoot' /etc/apache/conf/apache.conf | cut -d\ -f2`"
-[ -z "${HTTPD_ROOT}" ] && HTTPD_ROOT="/home/httpd/htdocs"
-HTTPD_USER=apache
-HTTPD_GROUP=apache
+inherit webapp-apache
DESCRIPTION="Project management and coordination system"
HOMEPAGE="http://www.phprojekt.com/"
SRC_URI="http://www.phprojekt.de/download/${PN}.tar.gz"
-
+IUSE="apache2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="x86 ppc"
RDEPEND="virtual/php"
+pkg_setup() {
+ webapp-detect || NO_WEBSERVER=1
+ webapp-pkg_setup "${NO_WEBSERVER}"
+ einfo "Installing into ${ROOT}${HTTPD_ROOT}."
+}
+
src_install() {
+ webapp-mkdirs
+
+ local DocumentRoot=${HTTPD_ROOT}
+ local destdir=${DocumentRoot}/${PN}
+
dodoc ChangeLog install readme
- dodir ${HTTPD_ROOT}/phprojekt
- cp -r . ${D}/${HTTPD_ROOT}/phprojekt
+ dodir ${destdir}
+ cp -r . ${D}/${destdir}
cd ${D}/${HTTPD_ROOT}
- chown -R ${HTTPD_USER}:${HTTPD_GROUP} phprojekt
+ chown -R ${HTTPD_USER}:${HTTPD_GROUP} ${PN}
}
diff --git a/app-office/phprojekt/phprojekt-4.0-r1.ebuild b/app-office/phprojekt/phprojekt-4.0-r1.ebuild
index ab3327d9625c..251891cd260b 100644
--- a/app-office/phprojekt/phprojekt-4.0-r1.ebuild
+++ b/app-office/phprojekt/phprojekt-4.0-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-office/phprojekt/phprojekt-4.0-r1.ebuild,v 1.4 2003/12/30 14:14:35 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/phprojekt/phprojekt-4.0-r1.ebuild,v 1.5 2004/04/21 18:58:10 mholzer Exp $
inherit webapp-apache
@@ -14,9 +14,8 @@ KEYWORDS="x86 ~ppc"
RDEPEND="virtual/php"
-webapp-detect || NO_WEBSERVER=1
-
pkg_setup() {
+ webapp-detect || NO_WEBSERVER=1
webapp-pkg_setup "${NO_WEBSERVER}"
einfo "Installing into ${ROOT}${HTTPD_ROOT}."
}
diff --git a/app-office/phprojekt/phprojekt-4.1.ebuild b/app-office/phprojekt/phprojekt-4.1.ebuild
index 6547b9a9a85b..f8274f4f8050 100644
--- a/app-office/phprojekt/phprojekt-4.1.ebuild
+++ b/app-office/phprojekt/phprojekt-4.1.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-office/phprojekt/phprojekt-4.1.ebuild,v 1.1 2003/12/30 14:14:35 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/phprojekt/phprojekt-4.1.ebuild,v 1.2 2004/04/21 18:58:10 mholzer Exp $
inherit webapp-apache
@@ -10,13 +10,12 @@ IUSE="apache2"
SRC_URI="mirror://gentoo/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ~ppc"
RDEPEND="virtual/php"
-webapp-detect || NO_WEBSERVER=1
-
pkg_setup() {
+ webapp-detect || NO_WEBSERVER=1
webapp-pkg_setup "${NO_WEBSERVER}"
einfo "Installing into ${ROOT}${HTTPD_ROOT}."
}