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

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xAABEFD55

5 files changed, 35 insertions, 148 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/Manifest b/www-apps/joomla/Manifest
index 275a05641a0d..62628199244a 100644
--- a/www-apps/joomla/Manifest
+++ b/www-apps/joomla/Manifest
@@ -1,32 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX postinstall-en.txt 916 SHA256 b8cde9b18beeab31eaf713c3a07bcd6a831bffa233019b1524948aa7773f0c5d SHA512 d53b2d2b2d9cb1cb83bf452f71d7098e5c6a460bdfa914e7d9bf57090544931eeeae249cf0e738a73c351f06854f7e3490e1c5d84271be43e45bec91a32c732a WHIRLPOOL 05c96f5ada3b8a05671f1e8a04af503fe83bedf09fe84374e92d186e30352168ef5e9aac608c73bca92c0b29160fa25bf7453b3482dfc0b022cf9b140e0a6167
 AUX postinstall-sv.txt 764 SHA256 46bf71e91721e3a0d269680c059642dd694a4f8d6184503545d7c4a46f9414e3 SHA512 4a7110fd497d5330fd289743942a9339bd7b7ffa0812578c4552ae539774576ca7ce6df8bc8ed45ca6bb4d61d7183c1094d6a2480988497e131f3687274b3e0b WHIRLPOOL 86a91ca55da9f777ed98a2435a9b1f909b54e258a2a74781466ba0d3e4ffae142af9c3f0746cdde18d5c360252f840529a59dbb71749295130ee63007e45d4e6
-DIST Joomla_3.3.3-Stable-Full_Package.zip 9819965 SHA256 ad3b735ac80adb65413d71399b8309c1f01ef9b2aeadab481305008badd79d1e SHA512 34effe8543c8fde70de95f8e4d6cfc6ed35326a042400bb32d1ea33654b06894510d84648bd9e9a2fb2fdd6e0dfae8772d5a0c52d9424798cd68499a1aeb87b7 WHIRLPOOL 3658bc07a90696ac1e6d96b88151196c5f5ea73cc955503c8e842b07c893aa89a64eb9dc9273ce85f31cddce8096650983831ba74896a0e5dd22754b6d5ef516
-DIST Joomla_3.3.6-Stable-Full_Package.zip 9861884 SHA256 ddf26272f9d64421493ffa93f2343106a98fe5c2b54925d9ec1af81a71f70262 SHA512 2b9a566cc357b617a3860818aab103fd3349dcb64e81d324ff24ba6e913043c4581a1286b9438734b199ea2e8cd17ab86a3f5441ffe5e35600458483d8605044 WHIRLPOOL 0bb8bb506f4ec0aa88563abfa8d5195f436ce287c73abd4babd45f5eb35398ae3521fc50475a51532ea8faa77e938988bd281ffb92449370661c825277c51167
-DIST Joomla_3.4.0-alpha-Alpha-Full_Package.tar.bz2 6135502 SHA256 0d3e43f7a031fa28479399a3db72c1c9335ff882a6469076ba70b08b6557faa5 SHA512 179639db5dfc508df173b20cafa0fd44b1f469c229e5a899ff2eed0d7d26195261b493e6ed8815d2d50f45af165e646eeb166fc7689da8317c35eda41ea20d64 WHIRLPOOL 12556ca5ac9c23956088c0c3e3720325349988f9db2f71d9d185a55c4651de074dd5018b4119f8b0ff9dea78af3ce3d78036f579bb63cb87f7520a7a23e20791
-EBUILD joomla-3.3.3.ebuild 1704 SHA256 cc7536148608d221c288eb7b57133591edbc2f5bcd6a4b05cb02a03ffdf30bc6 SHA512 c93ddce291ab991111bf1271190747cbf89be7af6b706827c503627a064094bd1c21398cc9ef3ac7a8a8f81bc76b514eadee0a9d17bfa393af4285af283c0408 WHIRLPOOL 24f4fc74a0123032bafa9e4a8215bff0e9ec67884add3a5cacca9593c8e99b4f4aa53f2a29de26baee53a238007d9166cd78cd35d35bc5d1f092a976cb0656a0
-EBUILD joomla-3.3.6.ebuild 1674 SHA256 aec6d057001edbb85d621bbc50c4fdd0c87c7caa1b4647461a12d79b9fe6f979 SHA512 a8ca1e44a5eb532353c356edb993e93ea8817ec5c6b2ec15a6a16e3b4824132ac0f3b658c92cdfce00741fc6f3a334d05bdc8dd54edf1d71f5b1fa99d3669984 WHIRLPOOL 4562d5c63b033863e53fe27fc6cc8a2d2f0580d9f0e3c007b93cb27ee8f0090b3d31d67fdb9adf859eeb9151de0a9e19b99e8f65f3196545e301480e24c88bf3
-EBUILD joomla-3.4.0_alpha.ebuild 1705 SHA256 1889d1148aeaebbecbd081b8a9231d56c22f4663eb423f00b346685f0f9a3668 SHA512 bcfa969840abe492621dc2bc3ec2edc90cbc832aa96aefe602dc774c4a3727f04b789474318669825e19fd3ab4b7eeea7155eec8f93c2a2f408c16d1e092546a WHIRLPOOL 012783c9639fbeaebed38ae58cead6a39f8fcc46c0b0d6a1deab4f4012be0e726ee6d168c6dfcff703c5e0998642502e651d917bcdfaddbb95724cfec3032409
-MISC ChangeLog 10004 SHA256 0ad5c3989b84a82ed101687729d6cdb63b0bc82256aef84e9c8dd4118004977b SHA512 ed69a8f392a932ab2fb24c1dcccedc2a3064ef0ad01551cff2d08cd248870dfac559e395bb544efcacf6fa41a4867e4f2bdf96755043b36e228ccda0947138a7 WHIRLPOOL 3728414046db38ca3a8bca26ca4d9fadee7da34ed8a4c54c14300e64199bab1a09eb16964875edf24c308379c398962d4d4538bacb8981c4bb8c2ef4315511ca
+DIST Joomla_3.4.1-Stable-Full_Package.tar.bz2 6452772 SHA256 fc31a37e0b27072b410940657b5e06f0d7f75cd4ee1c3f4ae940623fec823842 SHA512 0b785fcb9f06cc294685e732cf18aeb6b2a7210b500586452650220b83f6bd68ec1c3d3c667b4ffbe95720d1454b21fdf4a3396ad0ab39b8c73c03b09af80a5d WHIRLPOOL 868a412bf2e7a6157fc9b2dfaecb7e3e9c2e2594658b844caa3675c4eaf4595da597b099d09252867527cc2d01b617ef7d80ae0ec2527ce6744a156eb89516cc
+EBUILD joomla-3.4.1.ebuild 1629 SHA256 b19f8c65ff380f0b1e3ec157138d054e7acc24f6f5bb9ed1cb073e3706fe5e63 SHA512 8284adabfe9f406b0bb466632e0524f380466a7d723cdba6c030f50e336cc4b3f10b625b50a40bf6c599a5290647e58f811731090bb29d74934825797e4319c1 WHIRLPOOL 279d2e42878d6f8d91992a63a64ca9824123999e279d295fe8a55baaaeecdb44e8de30343f065c9eb8fca65c0e5fd727d79c4be1e3c6f30d0b50a84424ada8bc
+MISC ChangeLog 10258 SHA256 71137ef0c66d153adc59bd0e89244075eaa505294066d1a58e101ad8f3a8d486 SHA512 38c720d8f5c1868982a2077e127bd7a44b74425eb3a4fdf5f0d94fcbb98135023166dceeda682fde7113e60460cd3c609f3441d2c74ac7989c12e497c4718921 WHIRLPOOL da68144e6efcf71f29f58b7f93f73648479af9ab6ae262f340908b16de18517d6aac053d061906b416721fbc5895d8746808cf88106e8b6b76edcf4b93bb201c
 MISC metadata.xml 941 SHA256 b99e6f62d474bf21d252b3e6675f70b6ef55ed5558b913f719053300a2229e9b SHA512 30b993426fa3901a842549627a1f0e84d42dfc05319ce44348d8b3aba30d88b29e3c540f392cb558db41a1ae6a5fe41d5fc467acae0204b6437d152335e1122e WHIRLPOOL d199b0a7971a69fecec63a8634758c1e24d75513179431b69facd7d3ec2436b282185356172544535db6b53fb6f658c5a6f5cac7c556e41fb133ef76da2b6c2e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2.1
 
-iQJ8BAEBCgBmBQJVfy4cXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiRyEP/3VofmjTSlQWQENJ3B4pScYf
-X70N83wqUFo//X/t0mCu4uySsPC03dY8OVepddDgx8OhSrKzAuOG2AKtXUhP+jJJ
-9llU4PCZr6vh2xu8CVdQVtJbTeofCu9KjS02b/QbcX/n9HZ+2bhS9BDOeksm3sZo
-tfa+QEiTTVOEpxDiILmNdrqILlJWf+YqB0LTpu9kPd+DP6dCjt8sxRIsUbgDsHzS
-Q2XtUL7cpjjP6RZyhQZwKVaTuI7m1nG1az6FXflnd+8hAoeYLJk8fZb31A3CSEc1
-IzOEX30JaL6tiRE1vsWSNhvnR8C5bRlWWGkDkdDZa5E4Rtw/RCYuv5xio3431Sfj
-Q2DtaSVqrPPgqOzVJSb1a0eSUYoTMuzHqO2gb9EuYBv3klSGfSj/miYMgfR8FuUs
-OqjnjtUJ02FEbVqVGSicWtmPz/HyVcUdbQJVHEvvsspDf9Fu1J62Lw213ZUw07tb
-l29XgElCEI4t8mcntP2WKWdMMhzFCDQTaDJTUockU1p/xypB0QHYRM7L4Y86vO9y
-rRwsScYFuxoY4f61yCTakvhg19AK66sh7cJgbAv8js/z1Lrsql5LDEqL+hNuwISk
-nKOsRdOj1+v/VubaV2HgaKIa8Dc/n0kMKoGGGNwKAjy4vDi33TESRHwC+evik3n6
-YBbtD+COibGFAVl0eW+y
-=JqSI
+iQJ8BAEBCABmBQJViXjoXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRCNUJBQjhDOUMzMUI3MTE1NjcwMjIzREMz
+MUFBRUE0NzU5NERCQkVEAAoJEDGq6kdZTbvtgBEP/RcHNlqrO2v1lz1KgV8J1TgL
+VO5VXYK8XrBRnbkKWGYYLWXX7C5PKtK+hDbqoPxAdhw31A5rcUGvU54DzViz/YRF
+eAXowGzrKZC7+SP3xu+2g1QYoPoQliS/xwT/dEcDt3FRUmmY8bDKB9c1fy3mf9pK
+kIUOFCgsstYVIeJQiIowpQ9lU/3fPwRZvWYZgcYKzHnZPBI3SbFi7iFQk3I6Q3jN
+c5M/FrwoQaoS6w9bImv5ArZ2GNuhSbGT033I17Wap3qNi5sjApVBIdSBoaYKr3Jz
+okQfgjsh4GIJEff06tJzXSqfXbPw9qHqRuuS1yMKTLdZGOgr5l9cZRyJiCoD+rw+
+fPI1Ladsnb88CgXUP5IbBBa65CdZtFA37704U0VDxyeN3oP9Ljh00T+T1r/EeI7R
+wKuToJLKLuLgKT/wfiCI4YYI2mHinEsOC6LxMoVpKrSAX0fBdeo7cxe7LMGnx6xi
+xhCKKTXQfta1Ghw3Hk1n1bQiekvQ63wxviPPUbYO7KIVH08TlpClalbc5mvcAUJ9
+oNC19dqRx7QfCqMPatiKciU/eTxdw8c95IAUAwDQl3lUXJQshS3NL8DQp87Bq88w
+pHr8RnGSOCDTtKp6a2YPd3pRcWLIZdxCYFbxT1FHqnu2jDl+0st/FnXmRbFEz0Xm
+6sC13g8y2LmtIir1VQo5
+=ebih
 -----END PGP SIGNATURE-----
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 .