More fn_run_hook() fixes

5 files changed, 50 insertions, 4 deletions

diff --git a/net-www/webapp-config/ChangeLog b/net-www/webapp-config/ChangeLog
index c2e6259b6471..f00522e45476 100644
--- a/net-www/webapp-config/ChangeLog
+++ b/net-www/webapp-config/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-www/webapp-config
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/webapp-config/ChangeLog,v 1.18 2004/05/18 21:54:05 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/webapp-config/ChangeLog,v 1.19 2004/05/19 08:40:22 stuart Exp $
+
+*webapp-config-1.9-r2 (19 May 2004)
+
+  19 May 2004; Stuart Herbert <stuart@gentoo.org> webapp-config-1.9-r1.ebuild,
+  webapp-config-1.9-r2.ebuild:
+  More fn_run_hook() fixes
 
 *webapp-config-1.9-r1 (18 May 2004)
 
diff --git a/net-www/webapp-config/Manifest b/net-www/webapp-config/Manifest
index f61962f274d7..9dae0fe48ce2 100644
--- a/net-www/webapp-config/Manifest
+++ b/net-www/webapp-config/Manifest
@@ -3,8 +3,10 @@ MD5 26cb0b4690b0ecdb93fe0dd622e600e0 ChangeLog 3320
 MD5 cdd01e7ddad104772ad2f7e7f2a6c37a webapp-config-1.8-r1.ebuild 1051
 MD5 287f211ffb47d7e1740e0a4bf712b216 webapp-config-1.8.ebuild 1024
 MD5 000d1a0438bad35cb5f14c9b006f96b9 webapp-config-1.9.ebuild 1131
-MD5 d54b41c7aee33bdf1a2c60edb724f2c3 webapp-config-1.9-r1.ebuild 1142
+MD5 2eab25bffdc5ae75131a470f74bc723a webapp-config-1.9-r1.ebuild 1143
+MD5 2eab25bffdc5ae75131a470f74bc723a webapp-config-1.9-r2.ebuild 1143
 MD5 08e878cb297aa2a44061c036df6d3b6d files/digest-webapp-config-1.9 69
 MD5 cd13826ef979dfce18e7658dfbbb901f files/digest-webapp-config-1.8 69
 MD5 cd13826ef979dfce18e7658dfbbb901f files/digest-webapp-config-1.8-r1 69
 MD5 94091f1d104796fb82f4f83564aa5780 files/digest-webapp-config-1.9-r1 72
+MD5 0c1ae4fd2fcc6de80a24f04993a63d80 files/digest-webapp-config-1.9-r2 72
diff --git a/net-www/webapp-config/files/digest-webapp-config-1.9-r2 b/net-www/webapp-config/files/digest-webapp-config-1.9-r2
new file mode 100644
index 000000000000..8972bdf0223c
--- /dev/null
+++ b/net-www/webapp-config/files/digest-webapp-config-1.9-r2
@@ -0,0 +1 @@
+MD5 ce82210393e3be757d5a3f1190910ad1 webapp-config-1.9-r2.tar.bz2 45483
diff --git a/net-www/webapp-config/webapp-config-1.9-r1.ebuild b/net-www/webapp-config/webapp-config-1.9-r1.ebuild
index 5036c90362be..2f7114763cf5 100644
--- a/net-www/webapp-config/webapp-config-1.9-r1.ebuild
+++ b/net-www/webapp-config/webapp-config-1.9-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/webapp-config/webapp-config-1.9-r1.ebuild,v 1.2 2004/05/18 22:59:04 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/webapp-config/webapp-config-1.9-r1.ebuild,v 1.3 2004/05/19 08:40:22 stuart Exp $
 
 DESCRIPTION="Gentoo's installer for web-based applications"
 HOMEPAGE="http://www.gentoo.org/"
@@ -17,7 +17,7 @@ RDEPEND="sys-apps/grep
 	sys-apps/coreutils
 	app-shells/bash
 	app-portage/gentoolkit"
-S=${WORKDIR}/${P}
+S=${WORKDIR}/${PF}
 
 src_compile () {
 	# do nothing
diff --git a/net-www/webapp-config/webapp-config-1.9-r2.ebuild b/net-www/webapp-config/webapp-config-1.9-r2.ebuild
new file mode 100644
index 000000000000..964d39d9605e
--- /dev/null
+++ b/net-www/webapp-config/webapp-config-1.9-r2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/webapp-config/webapp-config-1.9-r2.ebuild,v 1.1 2004/05/19 08:40:22 stuart Exp $
+
+DESCRIPTION="Gentoo's installer for web-based applications"
+HOMEPAGE="http://www.gentoo.org/"
+SRC_URI="mirror://gentoo/${PN}-${PVR}.tar.bz2"
+LICENSE="GPL-2"
+SLOT=0
+KEYWORDS="x86 ~sparc ~ppc ~amd64 ~mips ~alpha"
+IUSE=""
+DEPEND=
+RDEPEND="sys-apps/grep
+	sys-apps/findutils
+	sys-apps/sed
+	sys-apps/gawk
+	sys-apps/coreutils
+	app-shells/bash
+	app-portage/gentoolkit"
+S=${WORKDIR}/${PF}
+
+src_compile () {
+	# do nothing
+	echo > /dev/null
+}
+
+src_install () {
+	dosbin sbin/webapp-config
+	dodir /usr/lib/webapp-config
+	cp -R lib/* ${D}/usr/lib/webapp-config/
+	dodir /etc/vhosts
+	cp config/webapp-config ${D}/etc/vhosts/
+	dodir /usr/share/webapps
+	dodoc examples/phpmyadmin-2.5.4-r1.ebuild AUTHORS.txt README.txt TODO.txt CHANGES.txt examples/postinstall-en.txt
+	doman doc/webapp-config.5 doc/webapp-config.8 doc/webapp.eclass.5
+	dohtml doc/webapp-config.5.html doc/webapp-config.8.html doc/webapp.eclass.5.html
+}