6 files changed, 27 insertions, 20 deletions
diff --git a/www-apps/xoops/ChangeLog b/www-apps/xoops/ChangeLog
index a64249a8d9bc..06862fced6ce 100644
--- a/www-apps/xoops/ChangeLog
+++ b/www-apps/xoops/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-apps/xoops
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/xoops/ChangeLog,v 1.6 2005/07/03 02:24:02 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/xoops/ChangeLog,v 1.7 2005/08/09 22:34:59 rl03 Exp $
+
+*xoops-2.2.1 (09 Aug 2005)
+
+  09 Aug 2005; Renat Lumpau <rl03@gentoo.org> files/postinstall-en.txt,
+  -xoops-2.0.13.ebuild, +xoops-2.2.1.ebuild:
+  Version bump wrt security bug #101899. Removed vulnerable versions.
 
 *xoops-2.0.13 (03 Jul 2005)
 
diff --git a/www-apps/xoops/Manifest b/www-apps/xoops/Manifest
index 9362d9547fd5..c50e4ecfdd05 100644
--- a/www-apps/xoops/Manifest
+++ b/www-apps/xoops/Manifest
@@ -1,15 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 dfcb8d12632714100b8232d3497620e6 xoops-2.0.13.ebuild 1069
-MD5 ce16ae006311fcdf66a397babfc58051 ChangeLog 1351
+MD5 aefc81ac2dbbae44e2a9c0af742992ba ChangeLog 1567
 MD5 f61bfa064e3acdfcd826e4a38b121196 metadata.xml 161
-MD5 9d3f6311f54b87c63103b72dcef932a3 files/postinstall-en.txt 311
-MD5 324536cbf2f1b6fd03aeea0705783734 files/digest-xoops-2.0.13 65
+MD5 0081040b0a4f44ddd1549079e6ec4243 xoops-2.2.1.ebuild 1108
+MD5 6453c8c079226b69c8adcf6fbdb941a0 files/postinstall-en.txt 392
+MD5 2f616bd832a23798a654ef319e5380cf files/digest-xoops-2.2.1 64
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCx0xLEzitwsaoONoRAhRjAJ9Fg4LuM0JkzemPg5tppHyqIVGN6QCeK8PI
-HNXulxfmii5dRMe5QnQ1UkY=
-=9DZj
+iD8DBQFC+S+bEzitwsaoONoRAqPpAJsF2mbFiFUMRYlMrks9nYsdrpOXTQCgy7lc
+FsWHNX0pDBJx9kB/r7Lxd+8=
+=02Z8
 -----END PGP SIGNATURE-----
diff --git a/www-apps/xoops/files/digest-xoops-2.0.13 b/www-apps/xoops/files/digest-xoops-2.0.13
deleted file mode 100644
index 36216414236f..000000000000
--- a/www-apps/xoops/files/digest-xoops-2.0.13
+++ /dev/null
@@ -1 +0,0 @@
-MD5 fbccac3b7ac2003caed8c1125b3d6180 Xoops-2.0.13.tar.gz 1088620
diff --git a/www-apps/xoops/files/digest-xoops-2.2.1 b/www-apps/xoops/files/digest-xoops-2.2.1
new file mode 100644
index 000000000000..68ce62781345
--- /dev/null
+++ b/www-apps/xoops/files/digest-xoops-2.2.1
@@ -0,0 +1 @@
+MD5 4e68ab1708a74312e884de9cda44a033 xoops-2.2.1.tar.gz 1164829
diff --git a/www-apps/xoops/files/postinstall-en.txt b/www-apps/xoops/files/postinstall-en.txt
index 359bc730d7ff..b8fa9ceae312 100644
--- a/www-apps/xoops/files/postinstall-en.txt
+++ b/www-apps/xoops/files/postinstall-en.txt
@@ -1,12 +1,14 @@
 Now create a database for Xoops to use (consult your MySQL manual if you don't
 know how.
 You will need to
- 
+
  chmod 666 ${MY_INSTALLDIR}/mainfile.php
 
-Then browse to http://${VHOST_HOSTNAME}/xoops
+Then browse to http://${VHOST_HOSTNAME}${VHOST_APPDIR}
 
 When you are done with the installer:
- 
+
  rm -rf ${MY_INSTALLDIR}/install
  chmod 444 ${MY_INSTALLDIR}/mainfile.php
+
+Note that the extras have been installed into ${VHOST_ROOT}/${PN}-${PVR}
diff --git a/www-apps/xoops/xoops-2.0.13.ebuild b/www-apps/xoops/xoops-2.2.1.ebuild
index 85a6afbeef88..4aad10ee1128 100644
--- a/www-apps/xoops/xoops-2.0.13.ebuild
+++ b/www-apps/xoops/xoops-2.2.1.ebuild
@@ -1,30 +1,29 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/xoops/xoops-2.0.13.ebuild,v 1.1 2005/07/03 02:24:02 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/xoops/xoops-2.2.1.ebuild,v 1.1 2005/08/09 22:34:59 rl03 Exp $
 
 inherit webapp eutils
 
-MY_P="${P/x/X}"
 DESCRIPTION="eXtensible Object Oriented Portal System (xoops) is an open-source Content Management System, including various portal features and supplemental modules."
 HOMEPAGE="http://www.xoops.org/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 KEYWORDS="~x86 ~ppc ~amd64"
 
-RDEPEND=">=virtual/php-4.1.1
+RDEPEND="virtual/php
 	net-www/apache
 	>=dev-db/mysql-3.23"
 
-S="${WORKDIR}"
-
 src_install() {
 	webapp_src_preinst
-	dodoc docs/CHANGES.txt
-	dohtml docs/INSTALL.html
+	dodir ${MY_HOSTROOTDIR}/${P}
+	dodoc changelog.txt
+	dohtml docs/INSTALL.html UPDATE.html
 	cp -R docs/images ${D}/usr/share/doc/${PF}/html
 
 	cp -a html/* "${D}/${MY_HTDOCSDIR}"
+	cp -a extras/* ${D}/${MY_HOSTROOTDIR}/${P}
 	webapp_serverowned ${MY_HTDOCSDIR}/uploads
 	webapp_serverowned ${MY_HTDOCSDIR}/cache
 	webapp_serverowned ${MY_HTDOCSDIR}/templates_c