version bump, fix deprecated depend.php issue, bug 552868, thanks Harold Naparst

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0xAABEFD55)

4 files changed, 15 insertions, 124 deletions

diff --git a/www-apps/joomla/ChangeLog b/www-apps/joomla/ChangeLog
index b16b7195318a..d4d865ed42cb 100644
--- a/www-apps/joomla/ChangeLog
+++ b/www-apps/joomla/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-apps/joomla
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/joomla/ChangeLog,v 1.64 2014/12/12 16:21:42 dlan Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/joomla/ChangeLog,v 1.65 2015/06/23 07:18:37 dlan Exp $
+
+*joomla-3.4.1 (23 Jun 2015)
+
+  23 Jun 2015; Yixun Lan <dlan@gentoo.org> -joomla-3.3.3.ebuild,
+  -joomla-3.3.6.ebuild, -joomla-3.4.0_alpha.ebuild, +joomla-3.4.1.ebuild:
+  version bump, fix deprecated depend.php issue, bug 552868, thanks Harold
+  Naparst
 
 *joomla-3.4.0_alpha (12 Dec 2014)
 
diff --git a/www-apps/joomla/joomla-3.3.3.ebuild b/www-apps/joomla/joomla-3.3.3.ebuild
deleted file mode 100644
index 93962f8ee70d..000000000000
--- a/www-apps/joomla/joomla-3.3.3.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/joomla/joomla-3.3.3.ebuild,v 1.3 2014/09/05 16:54:18 williamh Exp $
-
-EAPI=5
-
-inherit webapp depend.php
-
-MAGIC_1="19665"
-MAGIC_2="160049"
-
-DESCRIPTION="Joomla is a powerful Open Source Content Management System"
-HOMEPAGE="http://www.joomla.org/"
-SRC_URI="http://joomlacode.org/gf/download/frsrelease/${MAGIC_1}/${MAGIC_2}/Joomla_${PV}-Stable-Full_Package.zip"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="mysql postgres"
-
-need_httpd_cgi
-need_php_httpd
-
-S="${WORKDIR}"
-
-DEPEND="${DEPEND}
-	app-arch/unzip"
-RDEPEND=">=dev-lang/php-5.3.10[json,mysql?,postgres?,zlib,xml]"
-
-REQUIRED_USE="|| ( mysql postgres )"
-
-src_install () {
-	webapp_src_preinst
-
-	dodoc installation/CHANGELOG installation/INSTALL README.txt
-
-	touch configuration.php
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	local files=" administrator/cache administrator/components
-	administrator/language administrator/language/en-GB
-	administrator/manifests/packages
-	administrator/modules administrator/templates cache components images installation
-	images/banners language language/en-GB media modules plugins
-	plugins/authentication plugins/content plugins/editors plugins/editors-xtd
-	plugins/search plugins/system plugins/user plugins tmp templates"
-
-	for file in ${files}; do
-		webapp_serverowned -R "${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_postinst_txt sv "${FILESDIR}"/postinstall-sv.txt
-	webapp_src_install
-}
diff --git a/www-apps/joomla/joomla-3.3.6.ebuild b/www-apps/joomla/joomla-3.3.6.ebuild
deleted file mode 100644
index c601501fdbc4..000000000000
--- a/www-apps/joomla/joomla-3.3.6.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/joomla/joomla-3.3.6.ebuild,v 1.1 2014/10/10 02:13:38 dlan Exp $
-
-EAPI=5
-inherit webapp depend.php
-
-MAGIC_1="19822"
-MAGIC_2="161256"
-
-DESCRIPTION="Joomla is a powerful Open Source Content Management System"
-HOMEPAGE="http://www.joomla.org/"
-SRC_URI="http://joomlacode.org/gf/download/frsrelease/${MAGIC_1}/${MAGIC_2}/Joomla_${PV}-Stable-Full_Package.zip"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-
-need_httpd_cgi
-need_php_httpd
-
-S="${WORKDIR}"
-
-DEPEND="${DEPEND}
-	app-arch/unzip"
-RDEPEND=">=dev-lang/php-5.3.10[json,zlib,xml]
-	 || ( dev-lang/php[mysql] dev-lang/php[postgres] )"
-
-src_install () {
-	webapp_src_preinst
-
-	dodoc installation/CHANGELOG installation/INSTALL README.txt
-
-	touch configuration.php
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	local files=" administrator/cache administrator/components
-	administrator/language administrator/language/en-GB
-	administrator/manifests/packages
-	administrator/modules administrator/templates cache components images installation
-	images/banners language language/en-GB media modules plugins
-	plugins/authentication plugins/content plugins/editors plugins/editors-xtd
-	plugins/search plugins/system plugins/user plugins tmp templates"
-
-	for file in ${files}; do
-		webapp_serverowned -R "${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_postinst_txt sv "${FILESDIR}"/postinstall-sv.txt
-	webapp_src_install
-}
diff --git a/www-apps/joomla/joomla-3.4.0_alpha.ebuild b/www-apps/joomla/joomla-3.4.1.ebuild
index 1da3840c5474..6775bb2fc055 100644
--- a/www-apps/joomla/joomla-3.4.0_alpha.ebuild
+++ b/www-apps/joomla/joomla-3.4.1.ebuild
@@ -1,34 +1,31 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/joomla/joomla-3.4.0_alpha.ebuild,v 1.1 2014/12/12 16:21:42 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/joomla/joomla-3.4.1.ebuild,v 1.1 2015/06/23 07:18:37 dlan Exp $
 
 EAPI=5
-inherit webapp depend.php versionator
+inherit webapp versionator
 
 MY_PV=$(replace_version_separator '_' '-')
 
 DESCRIPTION="Joomla is a powerful Open Source Content Management System"
 HOMEPAGE="http://www.joomla.org/"
-SRC_URI="https://github.com/joomla/joomla-cms/releases/download/${MY_PV}/Joomla_${MY_PV}-Alpha-Full_Package.tar.bz2"
+SRC_URI="https://github.com/joomla/joomla-cms/releases/download/${MY_PV}/Joomla_${MY_PV}-Stable-Full_Package.tar.bz2"
 
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 
-need_httpd_cgi
-need_php_httpd
-
 S="${WORKDIR}"
+need_httpd_cgi
 
 DEPEND="${DEPEND}
 	app-arch/unzip"
 RDEPEND=">=dev-lang/php-5.3.10[json,zlib,xml]
+	virtual/httpd-php
 	 || ( dev-lang/php[mysql] dev-lang/php[postgres] )"
 
 src_install () {
 	webapp_src_preinst
 
-	dodoc installation/CHANGELOG installation/INSTALL README.txt
-
 	touch configuration.php
 	insinto "${MY_HTDOCSDIR}"
 	doins -r .