| 1 |
williamh 14/09/05 07:51:00 |
| 2 |
|
| 3 |
Modified: metadata.xml joomla-3.3.3.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
qa: per our mariadb and mysql maintainers, drop the mariadb use flag and only depend on virtual/mysql. |
| 6 |
|
| 7 |
(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key 0x30C46538) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.6 www-apps/joomla/metadata.xml |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apps/joomla/metadata.xml?rev=1.6&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apps/joomla/metadata.xml?rev=1.6&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apps/joomla/metadata.xml?r1=1.5&r2=1.6 |
| 15 |
|
| 16 |
Index: metadata.xml |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/www-apps/joomla/metadata.xml,v |
| 19 |
retrieving revision 1.5 |
| 20 |
retrieving revision 1.6 |
| 21 |
diff -u -r1.5 -r1.6 |
| 22 |
--- metadata.xml 4 Sep 2014 09:12:46 -0000 1.5 |
| 23 |
+++ metadata.xml 5 Sep 2014 07:51:00 -0000 1.6 |
| 24 |
@@ -20,9 +20,6 @@ |
| 25 |
<longdescription lang="en"> |
| 26 |
Joomla is an award-winning content management system (CMS), which enables you to build Web sites and powerful online applications. |
| 27 |
</longdescription> |
| 28 |
- <use> |
| 29 |
- <flag name='mariadb'>Uses mariadb as a database backend. If not enabled, mysql is required. The default is to use mysql.</flag> |
| 30 |
- </use> |
| 31 |
<upstream> |
| 32 |
<doc lang="en">http://docs.joomla.org</doc> |
| 33 |
</upstream> |
| 34 |
|
| 35 |
|
| 36 |
|
| 37 |
1.2 www-apps/joomla/joomla-3.3.3.ebuild |
| 38 |
|
| 39 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apps/joomla/joomla-3.3.3.ebuild?rev=1.2&view=markup |
| 40 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apps/joomla/joomla-3.3.3.ebuild?rev=1.2&content-type=text/plain |
| 41 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apps/joomla/joomla-3.3.3.ebuild?r1=1.1&r2=1.2 |
| 42 |
|
| 43 |
Index: joomla-3.3.3.ebuild |
| 44 |
=================================================================== |
| 45 |
RCS file: /var/cvsroot/gentoo-x86/www-apps/joomla/joomla-3.3.3.ebuild,v |
| 46 |
retrieving revision 1.1 |
| 47 |
retrieving revision 1.2 |
| 48 |
diff -u -r1.1 -r1.2 |
| 49 |
--- joomla-3.3.3.ebuild 4 Sep 2014 09:12:46 -0000 1.1 |
| 50 |
+++ joomla-3.3.3.ebuild 5 Sep 2014 07:51:00 -0000 1.2 |
| 51 |
@@ -1,6 +1,6 @@ |
| 52 |
# Copyright 1999-2014 Gentoo Foundation |
| 53 |
# Distributed under the terms of the GNU General Public License v2 |
| 54 |
-# $Header: /var/cvsroot/gentoo-x86/www-apps/joomla/joomla-3.3.3.ebuild,v 1.1 2014/09/04 09:12:46 dlan Exp $ |
| 55 |
+# $Header: /var/cvsroot/gentoo-x86/www-apps/joomla/joomla-3.3.3.ebuild,v 1.2 2014/09/05 07:51:00 williamh Exp $ |
| 56 |
|
| 57 |
EAPI=5 |
| 58 |
|
| 59 |
@@ -15,7 +15,7 @@ |
| 60 |
|
| 61 |
LICENSE="GPL-2" |
| 62 |
KEYWORDS="~amd64 ~ppc ~sparc ~x86" |
| 63 |
-IUSE="-mariadb" |
| 64 |
+IUSE="" |
| 65 |
|
| 66 |
need_httpd_cgi |
| 67 |
need_php_httpd |
| 68 |
@@ -25,8 +25,7 @@ |
| 69 |
DEPEND="${DEPEND} |
| 70 |
app-arch/unzip" |
| 71 |
RDEPEND=">=dev-lang/php-5.3.10[json,mysql,zlib,xml] |
| 72 |
- !mariadb? ( >dev-db/mysql-5.1 ) |
| 73 |
- mariadb? ( >=dev-db/mariadb-5.2.14 )" |
| 74 |
+ >=virtual/mysql-5.2.14" |
| 75 |
|
| 76 |
src_install () { |
| 77 |
webapp_src_preinst |
| 78 |
|
| 79 |
|
| 80 |
|
| 81 |
1.61 www-apps/joomla/ChangeLog |
| 82 |
|
| 83 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apps/joomla/ChangeLog?rev=1.61&view=markup |
| 84 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apps/joomla/ChangeLog?rev=1.61&content-type=text/plain |
| 85 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apps/joomla/ChangeLog?r1=1.60&r2=1.61 |
| 86 |
|
| 87 |
Index: ChangeLog |
| 88 |
=================================================================== |
| 89 |
RCS file: /var/cvsroot/gentoo-x86/www-apps/joomla/ChangeLog,v |
| 90 |
retrieving revision 1.60 |
| 91 |
retrieving revision 1.61 |
| 92 |
diff -u -r1.60 -r1.61 |
| 93 |
--- ChangeLog 4 Sep 2014 09:12:46 -0000 1.60 |
| 94 |
+++ ChangeLog 5 Sep 2014 07:51:00 -0000 1.61 |
| 95 |
@@ -1,6 +1,11 @@ |
| 96 |
# ChangeLog for www-apps/joomla |
| 97 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 98 |
-# $Header: /var/cvsroot/gentoo-x86/www-apps/joomla/ChangeLog,v 1.60 2014/09/04 09:12:46 dlan Exp $ |
| 99 |
+# $Header: /var/cvsroot/gentoo-x86/www-apps/joomla/ChangeLog,v 1.61 2014/09/05 07:51:00 williamh Exp $ |
| 100 |
+ |
| 101 |
+ 05 Sep 2014; William Hubbs <williamh@g.o> joomla-3.3.3.ebuild, |
| 102 |
+ metadata.xml: |
| 103 |
+ qa: per our mariadb and mysql maintainers, drop the mariadb use flag and only |
| 104 |
+ depend on virtual/mysql. |
| 105 |
|
| 106 |
*joomla-3.3.3 (04 Sep 2014) |
Archives