Version bump wrt security bug #118084, cleaned out old version.

(Portage version: 2.0.53)

5 files changed, 22 insertions, 27 deletions

diff --git a/www-apps/joomla/ChangeLog b/www-apps/joomla/ChangeLog
index cf2ae6ed4435..19a23a43b3ae 100644
--- a/www-apps/joomla/ChangeLog
+++ b/www-apps/joomla/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-apps/joomla
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/joomla/ChangeLog,v 1.5 2005/11/27 14:36:14 rl03 Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/joomla/ChangeLog,v 1.6 2006/01/07 16:12:46 rl03 Exp $
+
+*joomla-1.0.5 (07 Jan 2006)
+
+  07 Jan 2006; Renat Lumpau <rl03@gentoo.org> -joomla-1.0.4.ebuild,
+  +joomla-1.0.5.ebuild:
+  Version bump wrt security bug #118084, cleaned out old version.
 
 *joomla-1.0.4 (27 Nov 2005)
 
diff --git a/www-apps/joomla/Manifest b/www-apps/joomla/Manifest
index 90a9b8199cb4..37942eb4833e 100644
--- a/www-apps/joomla/Manifest
+++ b/www-apps/joomla/Manifest
@@ -1,15 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 e0d2064d69318f4424a72e8443dc692e joomla-1.0.4.ebuild 2908
 MD5 b76923dae0d9dd1598e192d9544e4c64 ChangeLog 901
-MD5 f61bfa064e3acdfcd826e4a38b121196 metadata.xml 161
-MD5 c81ce886a23ab451a7c1a3e0a4b1984d files/postinstall-en.txt 830
 MD5 0b1fd96badab5795b6f4449c4da376fc files/digest-joomla-1.0.4 65
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDicRqEzitwsaoONoRAoI4AJ9PCDfKehNyN6F6gZcowQ9bDxW0sQCggIi6
-UdgPc6b1HVelJTYfXDQVQjo=
-=V3Va
------END PGP SIGNATURE-----
+MD5 6f1c08fad38466b8eec9781368e07bb7 files/digest-joomla-1.0.5 65
+MD5 c81ce886a23ab451a7c1a3e0a4b1984d files/postinstall-en.txt 830
+MD5 e0d2064d69318f4424a72e8443dc692e joomla-1.0.4.ebuild 2908
+MD5 50bd55fd8d39dd3fdf306a7f59c7a7d7 joomla-1.0.5.ebuild 2808
+MD5 f61bfa064e3acdfcd826e4a38b121196 metadata.xml 161
diff --git a/www-apps/joomla/files/digest-joomla-1.0.4 b/www-apps/joomla/files/digest-joomla-1.0.4
deleted file mode 100644
index f929e86d4f2c..000000000000
--- a/www-apps/joomla/files/digest-joomla-1.0.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5ba5e601b10c80c9d7709294c15e0350 joomla-1.0.4.tar.gz 1785111
diff --git a/www-apps/joomla/files/digest-joomla-1.0.5 b/www-apps/joomla/files/digest-joomla-1.0.5
new file mode 100644
index 000000000000..c280ef8cf17f
--- /dev/null
+++ b/www-apps/joomla/files/digest-joomla-1.0.5
@@ -0,0 +1 @@
+MD5 68d82cc6e42a0bfc14d439198947d682 joomla-1.0.5.tar.gz 1829170
diff --git a/www-apps/joomla/joomla-1.0.4.ebuild b/www-apps/joomla/joomla-1.0.5.ebuild
index fd2fa914231a..5bd43b15a393 100644
--- a/www-apps/joomla/joomla-1.0.4.ebuild
+++ b/www-apps/joomla/joomla-1.0.5.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/joomla/joomla-1.0.4.ebuild,v 1.1 2005/11/27 14:36:14 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/joomla/joomla-1.0.5.ebuild,v 1.1 2006/01/07 16:12:46 rl03 Exp $
 
-inherit webapp eutils
+inherit webapp depend.php
 
 DESCRIPTION="Joomla is one of the most powerful Open Source Content Management
 Systems on the planet."
@@ -13,15 +13,15 @@ LICENSE="GPL-2"
 KEYWORDS="~x86 ~ppc ~sparc ~amd64"
 S=${WORKDIR}
 
-IUSE=""
+IUSE="mysql"
 
-RDEPEND="dev-db/mysql
+RDEPEND="mysql? ( dev-db/mysql )
 	virtual/php
 	net-www/apache"
 
 pkg_setup () {
 	webapp_pkg_setup
-	einfo "Please make sure that your PHP is compiled with XML and MySQL support"
+	require_php_with_use mysql zlib
 }
 
 src_install () {
@@ -47,8 +47,8 @@ src_install () {
 
 pkg_postinst () {
 	einfo "Now run \"emerge --config =${PF}\""
-	einfo "to setup the database"
-	einfo "Note that db and dbuser need to be present prior to running db setup"
+	einfo "if you wish to setup the database locally"
+	einfo "Note that db and dbuser need to be present and MySQL must be running"
 	webapp_pkg_postinst
 }
 
@@ -58,9 +58,6 @@ pkg_config() {
 	D_HOST="localhost"
 	D_USER="joomla"
 
-	# do we want to start mysqld?
-	/etc/init.d/mysql restart || die "mysql needs to be running"
-
 	echo -n "mysql db name [${D_DB}]: "; read MY_DB
 	[[ -z ${MY_DB} ]] && MY_DB=${D_DB}