Non-maintainer version bump, security bug #317299.

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

3 files changed, 10 insertions, 58 deletions

diff --git a/www-apps/joomla/ChangeLog b/www-apps/joomla/ChangeLog
index 3d09f9cff141..ea67b1d49106 100644
--- a/www-apps/joomla/ChangeLog
+++ b/www-apps/joomla/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-apps/joomla
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/joomla/ChangeLog,v 1.36 2010/04/26 07:43:29 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/joomla/ChangeLog,v 1.37 2010/05/03 11:22:17 keytoaster Exp $
+
+*joomla-1.5.17 (03 May 2010)
+
+  03 May 2010; Tobias Heinlein <keytoaster@gentoo.org>
+  -joomla-1.5.15.ebuild, -joomla-1.5.16.ebuild, +joomla-1.5.17.ebuild:
+  Non-maintainer version bump, security bug #317299.
 
 *joomla-1.5.16 (26 Apr 2010)
 
diff --git a/www-apps/joomla/joomla-1.5.16.ebuild b/www-apps/joomla/joomla-1.5.16.ebuild
deleted file mode 100644
index b09133da171d..000000000000
--- a/www-apps/joomla/joomla-1.5.16.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/joomla/joomla-1.5.16.ebuild,v 1.1 2010/04/26 07:43:29 fauli Exp $
-
-inherit webapp depend.php
-
-DESCRIPTION="Joomla is a powerful Open Source Content Management System."
-HOMEPAGE="http://www.joomla.org/"
-SRC_URI="http://joomlacode.org/gf/download/frsrelease/12153/49329/Joomla_${PV}-Stable-Full_Package.zip"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
-
-need_httpd_cgi
-need_php_httpd
-
-S="${WORKDIR}"
-
-DEPEND="${DEPEND}
-	app-arch/unzip"
-RDEPEND=""
-
-pkg_setup () {
-	webapp_pkg_setup
-	require_php_with_use mysql zlib xml
-}
-
-src_install () {
-	webapp_src_preinst
-
-	dodoc CHANGELOG.php INSTALL.php
-
-	touch configuration.php
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	local files="administrator/backups administrator/cache
-	administrator/components administrator/language administrator/language/en-GB
-	administrator/modules administrator/templates cache components images
-	images/banners images/stories language language/en-GB language/pdf_fonts
-	media modules plugins plugins/content plugins/editors plugins/editors-xtd
-	plugins/search plugins/system plugins/user plugins/xmlrpc tmp templates"
-
-	for file in ${files}; do
-		webapp_serverowned "${MY_HTDOCSDIR}"/${file}
-	done
-
-	webapp_configfile "${MY_HTDOCSDIR}"/configuration.php
-	webapp_serverowned "${MY_HTDOCSDIR}"/configuration.php
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-	webapp_src_install
-}
diff --git a/www-apps/joomla/joomla-1.5.15.ebuild b/www-apps/joomla/joomla-1.5.17.ebuild
index c56b1814faf7..92b267303ce7 100644
--- a/www-apps/joomla/joomla-1.5.15.ebuild
+++ b/www-apps/joomla/joomla-1.5.17.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/joomla/joomla-1.5.15.ebuild,v 1.1 2009/12/25 00:37:12 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/joomla/joomla-1.5.17.ebuild,v 1.1 2010/05/03 11:22:17 keytoaster Exp $
 
 inherit webapp depend.php
 
 DESCRIPTION="Joomla is a powerful Open Source Content Management System."
 HOMEPAGE="http://www.joomla.org/"
-SRC_URI="http://joomlacode.org/gf/download/frsrelease/11396/45610/Joomla_${PV}-Stable-Full_Package.zip"
+SRC_URI="http://joomlacode.org/gf/download/frsrelease/12193/49780/Joomla_${PV}-Stable-Full_Package.zip"
 
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"