Added v1.10-r2, removed v1.8

5 files changed, 26 insertions, 7 deletions

diff --git a/net-www/webapp-config/ChangeLog b/net-www/webapp-config/ChangeLog
index 9e9c56e2452e..9ab9e42fe9fc 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.26 2004/06/14 23:21:00 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/webapp-config/ChangeLog,v 1.27 2004/06/24 20:44:45 stuart Exp $
+
+*webapp-config-1.10-r2 (24 Jun 2004)
+
+  24 Jun 2004; Stuart Herbert <stuart@gentoo.org>
+  +webapp-config-1.10-r2.ebuild, -webapp-config-1.8.ebuild:
+  Obsolete version; removed by eversionrm tool
 
   15 Jun 2004; Stuart Herbert <stuart@gentoo.org> :
   Version bump; lots of fixes
diff --git a/net-www/webapp-config/Manifest b/net-www/webapp-config/Manifest
index 3d4d922ecc2a..432e0100612a 100644
--- a/net-www/webapp-config/Manifest
+++ b/net-www/webapp-config/Manifest
@@ -8,6 +8,7 @@ MD5 5f3c358b405e2f05bfa35fc3944a78e3 webapp-config-1.9-r2.ebuild 1147
 MD5 2114ee49249b4db8b3d9cbe0992920fe webapp-config-1.9-r3.ebuild 1150
 MD5 e0965e5cdb1a499a81100785757cbff7 webapp-config-1.10.ebuild 1400
 MD5 ad8056bd4ef59eca94476038a8b140a8 webapp-config-1.10-r1.ebuild 1403
+MD5 ad8056bd4ef59eca94476038a8b140a8 webapp-config-1.10-r2.ebuild 1403
 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
@@ -16,3 +17,4 @@ MD5 0c1ae4fd2fcc6de80a24f04993a63d80 files/digest-webapp-config-1.9-r2 72
 MD5 ed4c41abdfcf17d5955596059b5414f0 files/digest-webapp-config-1.9-r3 72
 MD5 56b8e409e27ac20b4501bd88f61bcf7d files/digest-webapp-config-1.10 70
 MD5 154cd84a0c7d37606be59023b24cb48e files/digest-webapp-config-1.10-r1 73
+MD5 6de3add921ada350b2dd768bc46a6e80 files/digest-webapp-config-1.10-r2 73
diff --git a/net-www/webapp-config/files/digest-webapp-config-1.10-r2 b/net-www/webapp-config/files/digest-webapp-config-1.10-r2
new file mode 100644
index 000000000000..bc772aba8eb3
--- /dev/null
+++ b/net-www/webapp-config/files/digest-webapp-config-1.10-r2
@@ -0,0 +1 @@
+MD5 16794d9a032ec7f7a393eef7758de699 webapp-config-1.10-r2.tar.bz2 71097
diff --git a/net-www/webapp-config/files/digest-webapp-config-1.8 b/net-www/webapp-config/files/digest-webapp-config-1.8
deleted file mode 100644
index b4974fddf49c..000000000000
--- a/net-www/webapp-config/files/digest-webapp-config-1.8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f6b6ba08554d1068f30cea73d675aa30 webapp-config-1.8.tar.bz2 37306
diff --git a/net-www/webapp-config/webapp-config-1.8.ebuild b/net-www/webapp-config/webapp-config-1.10-r2.ebuild
index deb4ed64e43c..37fc5a24a560 100644
--- a/net-www/webapp-config/webapp-config-1.8.ebuild
+++ b/net-www/webapp-config/webapp-config-1.10-r2.ebuild
@@ -1,13 +1,13 @@
 # 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.8.ebuild,v 1.1 2004/05/11 10:05:35 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/webapp-config/webapp-config-1.10-r2.ebuild,v 1.1 2004/06/24 20:44:45 stuart Exp $
 
 DESCRIPTION="Gentoo's installer for web-based applications"
 HOMEPAGE="http://www.gentoo.org/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
+SRC_URI="http://dev.gentoo.org/~stuart/${PN}/${PN}-${PVR}.tar.bz2"
 LICENSE="GPL-2"
 SLOT=0
-KEYWORDS="x86 ~sparc ~ppc ~amd64 ~mips ~alpha"
+KEYWORDS="~x86 ~sparc ~ppc ~amd64 ~mips ~alpha ~hppa"
 IUSE=""
 DEPEND=
 RDEPEND="sys-apps/grep
@@ -15,8 +15,9 @@ RDEPEND="sys-apps/grep
 	sys-apps/sed
 	sys-apps/gawk
 	sys-apps/coreutils
-	app-shells/bash"
-S=${WORKDIR}/${P}
+	app-shells/bash
+	app-portage/gentoolkit"
+S=${WORKDIR}/${PF}
 
 src_compile () {
 	# do nothing
@@ -32,4 +33,14 @@ src_install () {
 	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
+}
+
+pkg_postinst () {
+	echo
+	einfo "Now that you have upgraded webapp-config, you **must** update your"
+	einfo "config files in /etc/vhosts/webapp-config before you emerge any"
+	einfo "packages that use webapp-config."
+	echo
+	sleep 5
 }