qa: after speaking with Brian from the db team, do not depend on a database directly. Instead, depend on php with the appropriate bindings and allow the user to pick them through use flags.

Package-Manager: portage-2.2.12/cvs/Linux x86_64
Manifest-Sign-Key: 0x30C46538

3 files changed, 16 insertions, 10 deletions

diff --git a/www-apps/joomla/ChangeLog b/www-apps/joomla/ChangeLog
index 0ee3488a3054..2a4367c56d9c 100644
--- a/www-apps/joomla/ChangeLog
+++ b/www-apps/joomla/ChangeLog
@@ -1,6 +1,11 @@
 # 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.61 2014/09/05 07:51:00 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/joomla/ChangeLog,v 1.62 2014/09/05 16:54:18 williamh Exp $
+
+  05 Sep 2014; William Hubbs <williamh@gentoo.org> joomla-3.3.3.ebuild:
+  qa: after speaking with Brian from the db team, do not depend on a database
+  directly. Instead, depend on php with the appropriate bindings and allow the
+  user to pick them through use flags.
 
   05 Sep 2014; William Hubbs <williamh@gentoo.org> joomla-3.3.3.ebuild,
   metadata.xml:
diff --git a/www-apps/joomla/Manifest b/www-apps/joomla/Manifest
index 9009459f94d3..82286e80f5b7 100644
--- a/www-apps/joomla/Manifest
+++ b/www-apps/joomla/Manifest
@@ -4,13 +4,13 @@ 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
-EBUILD joomla-3.3.3.ebuild 1666 SHA256 398f1df58eb10ff897094c1cd248f521c8fd5751c4293456b4401a1a4bcfd954 SHA512 b9baeec7f892181f0ae2cc69bfaf7476f19eaf48e2237c007931aae6b63052b0373d15e6eb8b36e01025eb54af59b8ec1e3e6c6e64d0304ef7284ded9d9bb99d WHIRLPOOL 3b7a096582abd423f857903cd02d5cfb20417781862dce8e4dff4b92a1f57b0bd8f938a0aa40dcdb4be9050443d3be54fafebf082db278b2aeff465f8f392f74
-MISC ChangeLog 9424 SHA256 598a4296929c8315491dd09571f5eee5f7d3432b05629081d121498ab1cc8f69 SHA512 9978eac2c11895631312dac58b61057eaf66ff1594ff056b2591fec927ddda04fa9a2dbf7155b0f9e66e5e25cb6663bde0e9ad91ac82ac0686c1f48ee8b58b00 WHIRLPOOL 48c4079830ed20d0135b5867dd4494fa25c55215db03b13601b4a2d4736e3689d4fa03fa4b4e302a0d1a2fdb7406fd5388beff47ac0bd2e51f8613f71f1d5e8b
+EBUILD joomla-3.3.3.ebuild 1704 SHA256 cc7536148608d221c288eb7b57133591edbc2f5bcd6a4b05cb02a03ffdf30bc6 SHA512 c93ddce291ab991111bf1271190747cbf89be7af6b706827c503627a064094bd1c21398cc9ef3ac7a8a8f81bc76b514eadee0a9d17bfa393af4285af283c0408 WHIRLPOOL 24f4fc74a0123032bafa9e4a8215bff0e9ec67884add3a5cacca9593c8e99b4f4aa53f2a29de26baee53a238007d9166cd78cd35d35bc5d1f092a976cb0656a0
+MISC ChangeLog 9693 SHA256 6e17f23e2ba6a539bc8e3070a10efb59298aa02fc76f11c9e935ae04120d6438 SHA512 fedbbd227584bfa2189dccd7b03c2af0da833220ab6b84cd197c933711e1d0d4f79de28c78156345fb56ec73ffdd2a31144f3743f3b9ba127d0001661e489c2a WHIRLPOOL 37d2be1a8fdba3c571ee4fc1c2a62031169d9e14963213ab707ec35b7ade2c12e85b4a2b0bca10ed787c9ddde058cf6397f349d50c3b60d968fe20b5d58ee516
 MISC metadata.xml 882 SHA256 167dc6106f1de91ad416e1c87344773cc240b4341b835685fc4dd38a8147e389 SHA512 40a0edace084fbac45108047e131afc1485030b2942a154ce3e6de8ebb4b17415754fedbdebc47d1c517141236909e5b555065342992ac9845e2cc7d4a1d32d2 WHIRLPOOL c7376dc336b50b1b464f38bdecd49e4141ff736c9b25ce4b4ac3d8bf851ad36f9e1015df7c3f677a92c7e056256bdc2cc80b273a6bab3b1ffcc3d7e2263bf26e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlQJa3cACgkQblQW9DDEZThTKACdETNPbzFIW2IzAGWzzwA84aal
-ll4An0IbBmAeNPc4BiQBmKFqWcIbGSOO
-=IMTF
+iEYEAREIAAYFAlQJ6tMACgkQblQW9DDEZTjI3gCgm33x5JHvtYoSktMr/Nincz8l
+FcIAoJftOuovh5N5zWlfN4i8hkq0FQu8
+=dqvf
 -----END PGP SIGNATURE-----
diff --git a/www-apps/joomla/joomla-3.3.3.ebuild b/www-apps/joomla/joomla-3.3.3.ebuild
index 03815d73c99a..93962f8ee70d 100644
--- a/www-apps/joomla/joomla-3.3.3.ebuild
+++ b/www-apps/joomla/joomla-3.3.3.ebuild
@@ -1,6 +1,6 @@
 # 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.2 2014/09/05 07:51:00 williamh Exp $
+# $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
 
@@ -15,7 +15,7 @@ SRC_URI="http://joomlacode.org/gf/download/frsrelease/${MAGIC_1}/${MAGIC_2}/Joom
 
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
+IUSE="mysql postgres"
 
 need_httpd_cgi
 need_php_httpd
@@ -24,8 +24,9 @@ S="${WORKDIR}"
 
 DEPEND="${DEPEND}
 	app-arch/unzip"
-RDEPEND=">=dev-lang/php-5.3.10[json,mysql,zlib,xml]
-	 >=virtual/mysql-5.2.14"
+RDEPEND=">=dev-lang/php-5.3.10[json,mysql?,postgres?,zlib,xml]"
+
+REQUIRED_USE="|| ( mysql postgres )"
 
 src_install () {
 	webapp_src_preinst