version bump and drop old, bug 518886, 518146, thanks Harold Naparst

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

7 files changed, 89 insertions, 73 deletions

diff --git a/www-apps/joomla/ChangeLog b/www-apps/joomla/ChangeLog
index 38eeaa14043f..7b1f0cbfaeae 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.59 2014/08/10 20:13:42 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/joomla/ChangeLog,v 1.60 2014/09/04 09:12:46 dlan Exp $
+
+*joomla-3.3.3 (04 Sep 2014)
+
+  04 Sep 2014; Yixun Lan <dlan@gentoo.org> -joomla-1.5.25.ebuild,
+  -joomla-1.7.3.ebuild, +joomla-3.3.3.ebuild, files/postinstall-en.txt,
+  +files/postinstall-sv.txt, metadata.xml:
+  version bump and drop old, bug 518886, 518146, thanks Harold Naparst
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> joomla-1.5.25.ebuild,
   joomla-1.7.3.ebuild:
diff --git a/www-apps/joomla/Manifest b/www-apps/joomla/Manifest
index 109780b0806f..77209140c7c0 100644
--- a/www-apps/joomla/Manifest
+++ b/www-apps/joomla/Manifest
@@ -1,17 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX postinstall-en.txt 754 SHA256 36261f2301653a1c715a9edf43d0ad89fd0721e3a6c4e55ad4d4b7f1b5adf28c SHA512 42d79dcdd8677bba641758616cc6b9cf1eb779d52162cb512b9826caaef865d5697602b70f14724826a2f97868b4fc56eef47a928549048efbc6cc660eb6af26 WHIRLPOOL 15ad84b33011d97a391d36ba625fce4586b79d0025addda63e8f9c2ccae0759d54f20e124c5950e27bd0ded2348a02de9a88048f108816cb35ddc4428ede142e
-DIST Joomla_1.5.25-Stable-Full_Package.zip 7057828 SHA256 c5d9817f4983a47fe484ebd07f961cc13b46b8aabd56caa27d5a55487a646bfc
-DIST Joomla_1.7.3-Stable-Full_Package.zip 7443474 SHA256 b0392aba042c0172dc1113d66e1ac562fb629b2949e84adcf6c1e4df89dfe81b
-EBUILD joomla-1.5.25.ebuild 1485 SHA256 9da426be1693570fbbd51697499899d7447f0f6f62132085e3ab04d6bec6bb7a SHA512 38865538cce85d46ee4b0c2fd210a285d296332e3c6b934361b5d994e8eea1e9613d9af52dade5d51a89a012cab24a4633f8b17ae9615fc45f25c8c4bfa0fab7 WHIRLPOOL 65f950f807f5988ec7b9161a85c580db85c4c8a987423710795faa4268797645b57df66ed1aaf1755cf2ac143de315794516fab9a51cc63d3d9617a9a3f337aa
-EBUILD joomla-1.7.3.ebuild 1513 SHA256 bbf25aec1d79259d642439203d5447a4f72f4c6d5f6575444ba1d2d78d7ecd98 SHA512 d748e6afe8b3c16d6024a933fb8acce04fe78b4dc63956d183cdfb1dbaadebd62fa86f51512438e5e67c826eb7d4b6284afe3c000b725c6357d8771e420e1c44 WHIRLPOOL bc0dd49565a07ec5523b2f15f7628a1ceec42d9b8d335254b2ef1801cff482700aeaf2dbec3977dc423dfd192b15887c8f33d59ef0ed80335649dd93f9edcbe4
-MISC ChangeLog 8944 SHA256 f0de3be2e902a0954025ace4b2b2970370bf3a02fec99bc46187684ce973e71b SHA512 e1f3c7e8f89cbd3f3bdd7810ef221df27927a3cfa697d909f06ad6425a3d6b6d4531752ad3e8edb8ebfae8148c358ccc6719b6908d02803e74c719e1de32ef19 WHIRLPOOL 8f8bf84f6ffbfd4760063d056cbc712904c0c713b50a718b8067870562de01289acca11706cdb54366f501c3eff97e92ce78be4a9aafa49d6f5e9d0107ecc340
-MISC metadata.xml 403 SHA256 a9276259dbc504271f706052b0f597bc55a47e79cdee9ff975eedfe0c9396df5 SHA512 3bf1410824facbe3843fb04c76d6cee5ef76eb1310a05b5b08fa1bbd60d8675a3bf3579b414ea78cd27c1037ba417ac11884d2c929b8e65ecb9ca089ad8cde7c WHIRLPOOL 4ff01679d7a1c03ef404a6e851732a2a943fce8271f8da70543f457cec8e39f7080ffc08efd0935c966a4ed6f73bae6c3ff663055b0fdfc230b055ba3f31ac87
+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
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlPn0ncACgkQcaHudmEf86rk/gCeIodzvZaTGVfdU4YOM8jMOQzd
-yMUAn22tudBH/BfX7XR70CtQVLE3Od4J
-=1MRt
+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
 -----END PGP SIGNATURE-----
diff --git a/www-apps/joomla/files/postinstall-en.txt b/www-apps/joomla/files/postinstall-en.txt
index 86606ab9b16c..8f940d6dc2c0 100644
--- a/www-apps/joomla/files/postinstall-en.txt
+++ b/www-apps/joomla/files/postinstall-en.txt
@@ -1,11 +1,15 @@
 You are almost done!
 
-  0. Setup a database (e.g. MySQL: see 
-                       http://www.gentoo.org/doc/en/mysql-howto.xml)
+  0. Make sure your database server is initialized and started,
+     and that you have the login details of a user who can create a database.
 
   1. Login on http://${VHOST_HOSTNAME}/${VHOST_APPDIR}
      and finish the installation.
 
+     If the installation hangs, you might want to modify your php.ini:
+
+     max_execution_time = 3000 ;
+     memory_limit=128M ;
 
   2. Move into the directory where you installed Joomla and remove
      the "installation" folder:
@@ -18,7 +22,7 @@ You are almost done!
   http://${VHOST_HOSTNAME}/${VHOST_APPDIR} -> Main Site
   http://${VHOST_HOSTNAME}/${VHOST_APPDIR}/administrator -> Admin
 
-  You can log into the administration view using the username 'admin' 
+  You can log into the administration view using the username 'admin'
   along with the password that was generated or you chose during the
   web based installation.
 
diff --git a/www-apps/joomla/files/postinstall-sv.txt b/www-apps/joomla/files/postinstall-sv.txt
new file mode 100644
index 000000000000..4c1f7060bc69
--- /dev/null
+++ b/www-apps/joomla/files/postinstall-sv.txt
@@ -0,0 +1,26 @@
+Du är nästan klar!
+
+  0. Se till att du har installerat och startat en databasserver, 
+     och att du har en användare som får skapa databaser.
+
+  1. Surfa in på http://${VHOST_HOSTNAME}/${VHOST_APPDIR}
+     för att slutföra installationen.
+
+     Om installationen hänger sig, kan det vara en idé att ändra php.ini så här:
+
+     max_execution_time = 3000 ;
+     memory_limit=128M ;
+
+  2. Ta bort installationsmappen:
+
+  # cd ${MY_INSTALLDIR}
+  # rm -rf installation
+
+  3. Surfa in på din nya Joomla sida: 
+
+  http://${VHOST_HOSTNAME}/${VHOST_APPDIR} -> Main Site
+  http://${VHOST_HOSTNAME}/${VHOST_APPDIR}/administrator -> Admin
+
+  Logga in till adminvyn med användarnamn 'admin' och det lösenord som du valt under installationsprocessen ovan.
+
+  
diff --git a/www-apps/joomla/joomla-1.5.25.ebuild b/www-apps/joomla/joomla-1.5.25.ebuild
deleted file mode 100644
index db64b981e7d6..000000000000
--- a/www-apps/joomla/joomla-1.5.25.ebuild
+++ /dev/null
@@ -1,51 +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-1.5.25.ebuild,v 1.2 2014/08/10 20:13:42 slyfox Exp $
-
-EAPI=2
-
-inherit webapp depend.php
-
-DESCRIPTION="Joomla is a powerful Open Source Content Management System"
-HOMEPAGE="http://www.joomla.org/"
-SRC_URI="http://joomlacode.org/gf/download/frsrelease/16026/69665/Joomla_${PV}-Stable-Full_Package.zip"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
-
-need_httpd_cgi
-need_php_httpd
-
-S="${WORKDIR}"
-
-DEPEND="${DEPEND}
-	app-arch/unzip"
-RDEPEND="dev-lang/php[mysql,zlib,xml]"
-
-src_install () {
-	webapp_src_preinst
-
-	dodoc CHANGELOG.php INSTALL.php
-
-	touch configuration.php
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	local files="administrator/backups administrator/cache
-	administrator/components administrator/language administrator/language/en-GB
-	administrator/modules administrator/templates cache components images
-	images/banners images/stories language language/en-GB language/pdf_fonts
-	media modules plugins plugins/content plugins/editors plugins/editors-xtd
-	plugins/search plugins/system plugins/user plugins/xmlrpc tmp templates"
-
-	for file in ${files}; do
-		webapp_serverowned "${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_src_install
-}
diff --git a/www-apps/joomla/joomla-1.7.3.ebuild b/www-apps/joomla/joomla-3.3.3.ebuild
index 9e28a1b4178d..b1ddeeaa09e1 100644
--- a/www-apps/joomla/joomla-1.7.3.ebuild
+++ b/www-apps/joomla/joomla-3.3.3.ebuild
@@ -1,18 +1,21 @@
 # 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-1.7.3.ebuild,v 1.2 2014/08/10 20:13:42 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/joomla/joomla-3.3.3.ebuild,v 1.1 2014/09/04 09:12:46 dlan Exp $
 
-EAPI=2
+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/16024/69674/Joomla_${PV}-Stable-Full_Package.zip"
+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=""
+IUSE="-mariadb"
 
 need_httpd_cgi
 need_php_httpd
@@ -21,7 +24,9 @@ S="${WORKDIR}"
 
 DEPEND="${DEPEND}
 	app-arch/unzip"
-RDEPEND="dev-lang/php[json,mysql,zlib,xml]"
+RDEPEND=">=dev-lang/php-5.3.10[json,mysql,zlib,xml]
+	 !mariadb? ( >dev-db/mysql-5.1 )
+	 mariadb? ( >=dev-db/mariadb-5.2.14 )"
 
 src_install () {
 	webapp_src_preinst
@@ -35,18 +40,19 @@ src_install () {
 	local files=" administrator/cache administrator/components
 	administrator/language administrator/language/en-GB
 	administrator/manifests/packages
-	administrator/modules administrator/templates cache components images
+	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 "${MY_HTDOCSDIR}"/${file}
+		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/metadata.xml b/www-apps/joomla/metadata.xml
index ce9122696358..824fae5692ba 100644
--- a/www-apps/joomla/metadata.xml
+++ b/www-apps/joomla/metadata.xml
@@ -4,11 +4,26 @@
   <herd>web-apps</herd>
   <herd>proxy-maintainers</herd>
   <maintainer>
+    <email>harold@alum.mit.edu</email>
+    <name>Harold Naparst</name>
+    <description>Primary Maintainer, Assign bugs</description>
+  </maintainer>
+  <maintainer>
     <email>oli.huber@gmail.com</email>
-    <name>Olivier Huber </name>
+    <name>Olivier Huber</name>
+    <description>Co Maintainer, CC bugs</description>
   </maintainer>
   <maintainer>
     <email>fauli@gentoo.org</email>
     <name>Christian Faulhammer</name>
   </maintainer>
+  <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>
 </pkgmetadata>