Bump drupal to the 7.24 release - fixes bug 491858.

Adjust php deps - bug 479830.

Package-Manager: portage-2.2.7/cvs/Linux x86_64

4 files changed, 99 insertions, 25 deletions

diff --git a/www-apps/drupal/ChangeLog b/www-apps/drupal/ChangeLog
index 26aaf92caa46..a539c40b5136 100644
--- a/www-apps/drupal/ChangeLog
+++ b/www-apps/drupal/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-apps/drupal
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/ChangeLog,v 1.98 2013/09/13 12:13:30 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/ChangeLog,v 1.99 2013/11/29 18:42:01 jmbsvicetto Exp $
+
+*drupal-7.24 (29 Nov 2013)
+
+  29 Nov 2013; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  +drupal-7.24.ebuild, drupal-7.23.ebuild:
+  Bump drupal to the 7.24 release - fixes bug 491858. Adjust php deps - bug
+  479830.
 
 *drupal-7.23 (13 Sep 2013)
 
diff --git a/www-apps/drupal/Manifest b/www-apps/drupal/Manifest
index 7193a3ae1a15..7d3e4a49f0fc 100644
--- a/www-apps/drupal/Manifest
+++ b/www-apps/drupal/Manifest
@@ -1,29 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX postinstall-en.txt 830 SHA256 ff1b9004e65d7a46a7d94b23e2ea90563d5703f2afb45b9dec6ff7e750e788dc SHA512 1d753f23faead95249d2a691da4187c7882400b308fbd2ab1c9b55ca109deb0f7f3e9414a9e6b59a74341706bc6d698745aecc38283c02e9daea555b9bc04bfc WHIRLPOOL 27c73d7dd50391fc2305ee08c138c316fea6b56458c375c317a455fd8ea43e32542a015c4911c48a93d912e1a875490e8d6523de312349c6d5d33506c68a661a
 DIST drupal-6.28.tar.gz 1105942 SHA256 0f92b1863860535877d3a4547dd1481d0fbc76959cc7042d6c4b2b81209a987f SHA512 d385ab4cbde7428cbaba2a9f77183267da29f54086b0203c680b7f8e2329871d24a0e917bd08fcbd311a8ba33e7c7d76b28ff2c01b5de41cf3ff65dda5406ba3 WHIRLPOOL 64398fd93de54c765a105b22d0bd9364122423436c010420e9d93860daeafc728a5728c6e2fdf40f0d3a783748be74ccd48477ba8a04a373a7bd568199d0aaa9
 DIST drupal-7.22.tar.gz 3183014 SHA256 3f64ccfbb1c62bdef870207aa5de84ad11da1c8a94800fce5ad3a484b47cb29b SHA512 70d441b6d3dba456de3be12accaf1297b648c80efb35108823e553e7afc4dd1a9dd29b5d726f0ded5f2ebf7271294e0792043e4259e317cba2376733348966a9 WHIRLPOOL 7dfb69c33d3f2bf92546e569ccf21b4fa02860efd0b6fc33a62aae688f31240d64f26cfb324558bd527bd469a23355a67264923e0244f8d1319f1057b3185ee7
 DIST drupal-7.23.tar.gz 3191695 SHA256 79f2ae06aac349b86fc0f6cd100f3fc34b72e9f46068ddf704d575778aae1f99 SHA512 e5f1b8a79de2fc02c3dfa15345800d369db4bc9e80333410a7ea3e97f680c2478633ac094a709a2b5a6a9f6b65ff7a142ff5d12e9b6085141684f0b1cad2507f WHIRLPOOL 874ea3457d3bd9f4ee262d98ff364a471aa1cd1d0a1e94db60213aec6360aabbf0bd38f71562335c2f91df03c8a8d3707a5fbd475506e62de5162277d46a6b65
+DIST drupal-7.24.tar.gz 3195735 SHA256 5ce593bc86f48bb1923f9256de86c47162c54ba578e4ebe9211690b7349d5c40 SHA512 87b30a4c37c1ba451b9d6321351c60880d800a3ade796fc6038d67186c356ec241e0bc34aeaaebfd7524d6df4950495b1d24c2d81a21f1afff9760f5f8aef7a6 WHIRLPOOL d5747262dfbcdf24bfb48db1ad8b989d4dad3c017ae757ddbe261bd58157dc41d0c04e31c8e61c4f49a38ba87ad1716c3fe206461c5d28078dae3ce6b3d3abbd
 EBUILD drupal-6.28.ebuild 1577 SHA256 86153bba08a3c7afa928afd05cb8248e8591c612400df04b024aa5cdef8f4ef9 SHA512 a946123f98782430a72bbb8e616c419f1b7ae9d165acd15dd7e055a11613ec7bcf1b1e630fb88e585216cdddc477ad68bfb67b24735de15ff62c61f1829bd0ee WHIRLPOOL 788afd8f71481259d3af5e944e012e1cf09debfaa383f3e96f3e04dcea6082625d1aee8188be1851cd0b5dd556ad5cb203542d10cfac9fa661cfe047b99d1829
 EBUILD drupal-7.22.ebuild 1720 SHA256 0e0db0947c33a7aee6d9e254c8402cbb93d83a0db1841959e4b104a338cd0acc SHA512 c0bc794595e0ab83267417f59e6b9af5e87ebd43374a51215ebc4598b25d2243abf1d6383a5bd4f2cf52807b174d40800efba0c51d5557e7299e78c2f503282d WHIRLPOOL 5e1c30654a5b9b56af04502c5f63b680c8012197ebb38426450dfaed7da666ef5376ec22d881d2b6a0c7adeef2dbd2ac72c576b44fba525d048b8d94026e4ce7
-EBUILD drupal-7.23.ebuild 1967 SHA256 49117b944502cf46a7cb81dd774734f4c346666f0bd101fd93456ce3e1e3943a SHA512 2b2aad20c6a818e4ab4c34c2dcdf78c5c1ab93f8f63d5210427eed9ee73554eda4a1c8d31e7b1d9245f37b41f350f0ae0b386823216e816bc401a3e51a245d84 WHIRLPOOL 9568a3888d99e6a93c355f592b05d700a14fa921e46f133d92d21dc4eca338c910198406b8235d62e9b8ea89ccf1fde2ee60a7e2debac5febc416057974fbc92
-MISC ChangeLog 15550 SHA256 1d27214f050e18c953d26639cdebc1aea55306aab4706ce429d5b8ae181399c6 SHA512 7d6350b0b5291356f2c3c0f552e3cb36f5e05bebed97c058e9f93508f38d390a0f498c7b5a0016d7a373c919af4b0e050082134b2960780baad613e945db7378 WHIRLPOOL ffc584107379ccddc52ba55117829107db0c3558edd097fc37801af2db3838f737fdb08b1fbb8f73db78cc10698a137b6581494e95d3ee07c1679b677f9db039
+EBUILD drupal-7.23.ebuild 1982 SHA256 9e5c0461f716f77db2c2ec6f80b132cff14e94d345731021d2417d076768ee4a SHA512 fb85eddd209a2109f96242e2734165ba1edf8a8bdeba42992ea7665c60a1a153e2e363dbb3c050d9027c7430ffe331cc89063fe155e8768ab9a72b245c2a7b07 WHIRLPOOL e5912e9604aa21ea73e1e2dc3c667b364e4223432d7a15bf52ad016f15a558c0e69d9967b65bb8a0c0d2b809bb55f610b3d70da5ff73af3f9a3722698f3a19ae
+EBUILD drupal-7.24.ebuild 1982 SHA256 6085aa26c72fbc83d4d18e47f9070964db04181e6264b88a8f59f6176030d795 SHA512 43bf9e9cc05c3ab62da82ade9576e08979540e658df69ff07d95b12d16e2d8378ef1e5c0ec883a300240bd8ee4e77e123e2720621b989a0b35a3d4c0d12717d5 WHIRLPOOL 729a2efd16940d8b57918a25ef53b176fb018b4e49da4ad12db131b0aa23d503fd222b45f32dcd2faa287a7ca2bfdb3479c1ba9e6c2f52fb76c5893653bd3c5c
+MISC ChangeLog 15775 SHA256 16ad548db6d1a2c47218ec399266bc73be4d0f28c24bd2fe3dc0c9f3d0b3d7d4 SHA512 a178569b4f9b8411a1c9dc9789e3760cfea4abef13a8f40cb1352548cf22256d8830c09b0242ee50f1f217a1c2de8527670806d5dfd5912635b271916405ac8f WHIRLPOOL 17c8259791e065466b65fd8530185ec6faaa9a9ffeda3ceb2d914c5c95d087c6a9763015a15806b7bf7bcb3b09533c4ab07075fd9408e81c00b80eb265c2cf64
 MISC metadata.xml 334 SHA256 b1d825183ede1df66432e5d9cbc1f0f227d4c238ae1262c3cf492810d3ba5ce2 SHA512 1579decab2343f47cc16d738f45e6152b4f8567f6e0f53e05c587c126d1c05c94ecbbb1bc9aaaf6885bdb53b3bccedc0f63d125e3c245465c24a12a216bd4730 WHIRLPOOL a6446b0fcf9824990c48b511889a402e39f3edd5d9d7d8c58d574abd5435db1b5b4006407340589073e79f50a85d55c90ce1059a2944566cfe9901607adfecae
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
-
-iQIcBAEBCAAGBQJSMwCyAAoJEC8ZTXQF1qEPxH0P/0MCjp06fA7Ff9/OS8PxKmk4
-c7cw0wEvo8ud/hJaYYwL7cSHl6UxDitBEqCTO02sLmHeSKFKFDrvpDK3KL/Qk5p9
-pSy0rfA7cUm9M7QxeSjveauIAALWuqw4xIA6ZwLq4iB2rhSZ0I+sioOGR7NVLqZH
-iDmSSuSnNPQH57tEGUdVvkobhQTtvlFzbUMnkJFReQXD+w+krkxsSA2RUHcbqA68
-aTdPtxyS2pTCqXVXGvSsVfaJTQ4Vtmxwkay8MY3fMoTx/xbJwkhsLEjafs/Ze2nO
-tAcmsCPRzELMHSuqOq3drCziTiqGJZonONW9xeSAciwVBlYXEcJm690ZGPMhrJvZ
-eqb/knXXVBIjzcKZsuInoB3dwHxAoP/50VDUGjPiDuttd1T0G92KxbPEP8XyE7ef
-5+Pv1Kk2+opHLsaXWOTxfrFv3X+yN0DakrJ/zJDuN5fHnfkn9hpHiVq8OG0xL5eu
-AnYweu9r/FMRSpexM1DtWUfnU10IyFUeoRffkI0StFI93PxPOQaNcJY3C1R3wMCW
-ikDg7RnckRuLspEwYoU0XBJ+Kjc2D1Cv24pSqqNq5JAFYKcOCKqrmqrAKexpAKJ1
-5r1RI97xPcu1WlR4EduwZ6waCR407YbGTnyzyvxn7mT3lOacr0VuXFtGy+Temarr
-3PEr1CsQD/xWCLFIJB0w
-=Elt3
------END PGP SIGNATURE-----
diff --git a/www-apps/drupal/drupal-7.23.ebuild b/www-apps/drupal/drupal-7.23.ebuild
index 00ec7fef1a3a..7d4a3376ecdd 100644
--- a/www-apps/drupal/drupal-7.23.ebuild
+++ b/www-apps/drupal/drupal-7.23.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/drupal-7.23.ebuild,v 1.1 2013/09/13 12:13:30 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/drupal-7.23.ebuild,v 1.2 2013/11/29 18:42:01 jmbsvicetto Exp $
 
 EAPI=5
 
@@ -17,7 +17,7 @@ KEYWORDS="~alpha ~amd64 ~ppc ~x86"
 IUSE="+accelerator +mysql postgres sqlite +uploadprogress"
 
 RDEPEND="
-	dev-lang/php[gd,pdo,postgres?,xml]
+	dev-lang/php[gd,hash,pdo,postgres?,simplexml,xml]
 	virtual/httpd-php
 	accelerator? ( ||
 		(
diff --git a/www-apps/drupal/drupal-7.24.ebuild b/www-apps/drupal/drupal-7.24.ebuild
new file mode 100644
index 000000000000..5befcb965ba8
--- /dev/null
+++ b/www-apps/drupal/drupal-7.24.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/drupal-7.24.ebuild,v 1.1 2013/11/29 18:42:01 jmbsvicetto Exp $
+
+EAPI=5
+
+inherit webapp
+
+MY_PV=${PV:0:3}.0
+
+DESCRIPTION="PHP-based open-source platform and content management system"
+HOMEPAGE="http://drupal.org/"
+SRC_URI="http://drupal.org/files/projects/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+IUSE="+accelerator +mysql postgres sqlite +uploadprogress"
+
+RDEPEND="
+	dev-lang/php[gd,hash,pdo,postgres?,simplexml,xml]
+	virtual/httpd-php
+	accelerator? ( ||
+		(
+			(
+				<dev-lang/php-5.5
+				dev-php/pecl-apc
+			)
+			dev-php/xcache
+			dev-php/eaccelerator
+			(
+				>=dev-lang/php-5.5[opcache]
+				dev-php/pecl-apcu
+			)
+		)
+	)
+	uploadprogress? ( dev-php/pecl-uploadprogress )
+	mysql? (
+		|| (
+			dev-lang/php[mysql]
+			dev-lang/php[mysqli]
+		)
+	)
+	sqlite? (
+		|| (
+			dev-lang/php[sqlite]
+			dev-lang/php[sqlite3]
+		)
+	)
+"
+
+need_httpd_cgi
+
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+src_install() {
+	webapp_src_preinst
+
+	local docs="MAINTAINERS.txt LICENSE.txt INSTALL.txt CHANGELOG.txt INSTALL.mysql.txt INSTALL.pgsql.txt INSTALL.sqlite.txt UPGRADE.txt "
+	dodoc ${docs}
+	rm -f ${docs} INSTALL COPYRIGHT.txt
+
+	cp sites/default/{default.settings.php,settings.php}
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	dodir "${MY_HTDOCSDIR}"/files
+	webapp_serverowned "${MY_HTDOCSDIR}"/files
+	webapp_serverowned "${MY_HTDOCSDIR}"/sites/default
+	webapp_serverowned "${MY_HTDOCSDIR}"/sites/default/settings.php
+
+	webapp_configfile "${MY_HTDOCSDIR}"/sites/default/settings.php
+	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	ewarn
+	ewarn "SECURITY NOTICE"
+	ewarn "If you plan on using SSL on your Drupal site, please consult the postinstall information:"
+	ewarn "\t# webapp-config --show-postinst ${PN} ${PV}"
+	ewarn
+}