Non-maintainer commit: Version bump for security bug 280016. Removing vulnerable version.

(Portage version: 2.2_rc33/cvs/Linux x86_64)

2 files changed, 13 insertions, 15 deletions

diff --git a/www-apps/xoops/ChangeLog b/www-apps/xoops/ChangeLog
index 8a0b39464f7f..38d15d530de8 100644
--- a/www-apps/xoops/ChangeLog
+++ b/www-apps/xoops/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-apps/xoops
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/xoops/ChangeLog,v 1.18 2008/02/26 14:32:53 wrobel Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/xoops/ChangeLog,v 1.19 2009/08/13 12:25:15 a3li Exp $
+
+*xoops-2.3.3 (13 Aug 2009)
+
+  13 Aug 2009; Alex Legler <a3li@gentoo.org> -xoops-2.2.4.ebuild,
+  +xoops-2.3.3.ebuild:
+  Non-maintainer commit: Version bump for security bug 280016. Removing
+  vulnerable version.
 
   26 Feb 2008; Gunnar Wrobel <wrobel@gentoo.org> xoops-2.2.4.ebuild:
   Fix wrt #208584
diff --git a/www-apps/xoops/xoops-2.2.4.ebuild b/www-apps/xoops/xoops-2.3.3.ebuild
index 7e33b59927f8..84d143e897f7 100644
--- a/www-apps/xoops/xoops-2.2.4.ebuild
+++ b/www-apps/xoops/xoops-2.3.3.ebuild
@@ -1,18 +1,16 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/xoops/xoops-2.2.4.ebuild,v 1.7 2008/02/26 14:32:53 wrobel Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/xoops/xoops-2.3.3.ebuild,v 1.1 2009/08/13 12:25:15 a3li Exp $
 
 inherit webapp depend.php
 
 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}/${PN}-2.2.3a-Final.tar.gz
-mirror://sourceforge/${PN}/xoops-2.2.3a-to-2.2.4.tgz"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 KEYWORDS="~x86 ~ppc ~amd64"
-S=${WORKDIR}
 
 IUSE=""
 
@@ -27,13 +25,6 @@ pkg_setup() {
 	webapp_pkg_setup
 }
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	cp -f xoops-2.2.3a-to-2.2.4/docs/* docs/ || die
-	cp -Rf xoops-2.2.3a-to-2.2.4/html/* html/ || die
-}
-
 src_install() {
 	webapp_src_preinst
 
@@ -42,7 +33,7 @@ src_install() {
 	dohtml docs/INSTALL.html docs/UPDATE.html
 
 	cp -R docs/images "${D}"/usr/share/doc/${PF}/html
-	cp -pPR html/* "${D}/${MY_HTDOCSDIR}"
+	cp -pPR htdocs/* "${D}/${MY_HTDOCSDIR}"
 	cp -pPR extras/* "${D}"/${MY_HOSTROOTDIR}/${PF}
 
 	webapp_serverowned ${MY_HTDOCSDIR}/uploads