qa: per our mariadb and mysql maintainers, drop the mariadb use flag and only depend on virtual/mysql.

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

4 files changed, 15 insertions, 24 deletions

diff --git a/www-apps/joomla/ChangeLog b/www-apps/joomla/ChangeLog
index 7b1f0cbfaeae..0ee3488a3054 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.60 2014/09/04 09:12:46 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/joomla/ChangeLog,v 1.61 2014/09/05 07:51:00 williamh Exp $
+
+  05 Sep 2014; William Hubbs <williamh@gentoo.org> joomla-3.3.3.ebuild,
+  metadata.xml:
+  qa: per our mariadb and mysql maintainers, drop the mariadb use flag and only
+  depend on virtual/mysql.
 
 *joomla-3.3.3 (04 Sep 2014)
 
diff --git a/www-apps/joomla/Manifest b/www-apps/joomla/Manifest
index 77209140c7c0..9009459f94d3 100644
--- a/www-apps/joomla/Manifest
+++ b/www-apps/joomla/Manifest
@@ -4,23 +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 1718 SHA256 3665749f9333f23f4f2a98ce1defbf4bda85ef7391ea8ab207412f53f61e9750 SHA512 e1af03dbce18660b51711aa1ed28d1364b1992b523b17af63d50d93757b7bc19975020297161e8dcf5c5bb62afef04f9b5c9ab9ba1cb0e0cad9d2d55dedc5590 WHIRLPOOL 0b125442f804a8af30cd3f3452a6af9eb39a244f9aa2894058eacba42840c56b2b31759aab39d9a3dcf78652095748a0bd9d10b39b6ef035f8ee1ca47436b22a
-MISC ChangeLog 9224 SHA256 0c92aaddaf4e1911c833ded99542ac73e5b4f1386f1b06719072a6747e7042cf SHA512 963bf12a22607c9c82440a296599e6950df07e48047299560d1574a899763db03d523ece827c1a486802c7e2d90f6fdc80dbfd8330d91d9e84c4612333d7e187 WHIRLPOOL 6ee83739cac6e801bafdefcb66be6ddab4030205094e1f4ec9dd4846201aabfad12523b3e84c394201ce9532a0cdadee6cefd5fb410b7f7eca8fd3b2ab440f78
-MISC metadata.xml 1032 SHA256 cf5705a466ea27a1a2b777e08a2c183762efb2e6b6ec9fd6c374938c1d9d739e SHA512 d18ec311ebecbb651ab81152b4c966a76b86b23ff52ab3e4a8aca05ffa2f54294f8048f6cd09329d6b86e0f9ffdb657e85f124fb381f6d6967e9e4e6ed68e053 WHIRLPOOL 5a031bfff5876df496bc7928489556af782dea50b43b9098a09526e4c5b37a1274fe281e217f85880258e88e83bc861d8de2ff8e3c01c56beffd403ffd17c26a
+EBUILD joomla-3.3.3.ebuild 1666 SHA256 398f1df58eb10ff897094c1cd248f521c8fd5751c4293456b4401a1a4bcfd954 SHA512 b9baeec7f892181f0ae2cc69bfaf7476f19eaf48e2237c007931aae6b63052b0373d15e6eb8b36e01025eb54af59b8ec1e3e6c6e64d0304ef7284ded9d9bb99d WHIRLPOOL 3b7a096582abd423f857903cd02d5cfb20417781862dce8e4dff4b92a1f57b0bd8f938a0aa40dcdb4be9050443d3be54fafebf082db278b2aeff465f8f392f74
+MISC ChangeLog 9424 SHA256 598a4296929c8315491dd09571f5eee5f7d3432b05629081d121498ab1cc8f69 SHA512 9978eac2c11895631312dac58b61057eaf66ff1594ff056b2591fec927ddda04fa9a2dbf7155b0f9e66e5e25cb6663bde0e9ad91ac82ac0686c1f48ee8b58b00 WHIRLPOOL 48c4079830ed20d0135b5867dd4494fa25c55215db03b13601b4a2d4736e3689d4fa03fa4b4e302a0d1a2fdb7406fd5388beff47ac0bd2e51f8613f71f1d5e8b
+MISC metadata.xml 882 SHA256 167dc6106f1de91ad416e1c87344773cc240b4341b835685fc4dd38a8147e389 SHA512 40a0edace084fbac45108047e131afc1485030b2942a154ce3e6de8ebb4b17415754fedbdebc47d1c517141236909e5b555065342992ac9845e2cc7d4a1d32d2 WHIRLPOOL c7376dc336b50b1b464f38bdecd49e4141ff736c9b25ce4b4ac3d8bf851ad36f9e1015df7c3f677a92c7e056256bdc2cc80b273a6bab3b1ffcc3d7e2263bf26e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUCC0XAAoJEJIMDbyqvv1VtREQAKKM/Zqufr6xE+ldd4QmM+XS
-gaXH0Zm0hU8Mc1C3GHg/0rMFUbVIzJLG4gdyG9UQBEVJEcvsbVHB2Kz2qiv8rY/h
-XSbmYZY5vOtxq2wY/wdX9qxShd7MmJ1zDF+RG/HreKBVOZU0w8SLX0Mq0xLS8c5x
-hiSI2JvtyBIyPXwMpvBrXQ3HN2nojEycPFsW9fD+XcMY6GoMYZbe200syuCDte6x
-6BM9bdh8eorpAY4dADlca+x1QKvQ/rJ2AVmtrDKhhS5P0R7fP4FogY9THMgtSALL
-V30lhPfR0DBMF+pZBuexMeiNNRWtZjjJ+oyuehNzK1Dj4yTA8ea28K/I2KtqlJGV
-JB9U+JduQGDfomxvmytUaLKn35jS3X0H/kId9spWC+G1tw6ibmuLq7Vl0aN03VQn
-HO2hxzqmN72nyC3VA+MUVBcOLH3wuMckM/4V4uxLmGeZKOt8tTneiokQ5MvNL4op
-C2JF9kgIGvmxvQliH3fMUfFQLDiATACJQpZBv0/Rp/fgp9N7oGVG8C2+Z4KHXlin
-QhiqCyDUoyB3p44Mg0YTfZw3AqtvuWZ7VV2kvycg8aRdNUnJ1m8TWU8BDOFkMUex
-77edHGMVzsTcqMwCBDtK3z5CnM/frFz8fOlMyRtbNm2ZwsTl8dOXWQVCjMatC1Ol
-cU+XtSzUq5c6Sr5VD6Ir
-=wp2l
+iEYEAREIAAYFAlQJa3cACgkQblQW9DDEZThTKACdETNPbzFIW2IzAGWzzwA84aal
+ll4An0IbBmAeNPc4BiQBmKFqWcIbGSOO
+=IMTF
 -----END PGP SIGNATURE-----
diff --git a/www-apps/joomla/joomla-3.3.3.ebuild b/www-apps/joomla/joomla-3.3.3.ebuild
index b1ddeeaa09e1..03815d73c99a 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.1 2014/09/04 09:12:46 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/joomla/joomla-3.3.3.ebuild,v 1.2 2014/09/05 07:51:00 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="-mariadb"
+IUSE=""
 
 need_httpd_cgi
 need_php_httpd
@@ -25,8 +25,7 @@ S="${WORKDIR}"
 DEPEND="${DEPEND}
 	app-arch/unzip"
 RDEPEND=">=dev-lang/php-5.3.10[json,mysql,zlib,xml]
-	 !mariadb? ( >dev-db/mysql-5.1 )
-	 mariadb? ( >=dev-db/mariadb-5.2.14 )"
+	 >=virtual/mysql-5.2.14"
 
 src_install () {
 	webapp_src_preinst
diff --git a/www-apps/joomla/metadata.xml b/www-apps/joomla/metadata.xml
index 824fae5692ba..7858364832b8 100644
--- a/www-apps/joomla/metadata.xml
+++ b/www-apps/joomla/metadata.xml
@@ -20,9 +20,6 @@
   <longdescription lang="en">
     Joomla is an award-winning content management system (CMS), which enables you to build Web sites and powerful online applications.
   </longdescription>
-  <use>
-    <flag name='mariadb'>Uses mariadb as a database backend. If not enabled, mysql is required.  The default is to use mysql.</flag>
-  </use>
   <upstream>
     <doc lang="en">http://docs.joomla.org</doc>
   </upstream>