Version bumps.

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

4 files changed, 137 insertions, 10 deletions

diff --git a/www-apps/drupal/ChangeLog b/www-apps/drupal/ChangeLog
index 54bbebabeffa..2baf46dd12f2 100644
--- a/www-apps/drupal/ChangeLog
+++ b/www-apps/drupal/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-apps/drupal
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/ChangeLog,v 1.76 2011/12/09 02:29:10 radhermit Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/ChangeLog,v 1.77 2012/02/05 05:53:02 radhermit Exp $
+
+*drupal-7.12 (05 Feb 2012)
+*drupal-6.24 (05 Feb 2012)
+
+  05 Feb 2012; Tim Harder <radhermit@gentoo.org> +drupal-6.24.ebuild,
+  +drupal-7.12.ebuild:
+  Version bumps.
 
 *drupal-7.10 (09 Dec 2011)
 
diff --git a/www-apps/drupal/Manifest b/www-apps/drupal/Manifest
index 6ba8bc52a6c5..7e4900390ab9 100644
--- a/www-apps/drupal/Manifest
+++ b/www-apps/drupal/Manifest
@@ -4,28 +4,32 @@ Hash: SHA512
 AUX postinstall-en.txt 830 RMD160 4997cbee7b19d60dd0c36f2b5060f0526221fe1a SHA1 1474f5012ddcbf49a6e624de50562d6988d8dd43 SHA256 ff1b9004e65d7a46a7d94b23e2ea90563d5703f2afb45b9dec6ff7e750e788dc
 DIST drupal-5.23.tar.gz 768263 RMD160 3ef5e809d522efc7c91c2cfae564c3e6af3525b4 SHA1 9b70b5822a34d6ec9b97214675b1443c265ef481 SHA256 c7590400ebb2fff6e6cbee512a514cf0d9cb875940ce916e2cffeab606e06762
 DIST drupal-6.22.tar.gz 1100999 RMD160 42cb64a32ca457779e498ef8edb952e04f8b2c86 SHA1 a67acdb606aabbd9da6ddd2c016d43bb9ec17431 SHA256 d43da1858bfb8211a26ad7f749cce8cc3ae701fd28b13502cf5daef51d31f021
+DIST drupal-6.24.tar.gz 1104440 RMD160 9fbb8f061c51c4b1532c64ba70a56ce5e456a109 SHA1 aadbac0691fe56ea4e0c7dc7dc85ac17c622d52d SHA256 cc9c08a7625565a059a2f7f37676636d84d968221d4a6d24368163ee50a5115d
 DIST drupal-7.10.tar.gz 3067653 RMD160 bc56c58c530f08304aa183cb71a9fb041bb20343 SHA1 59a5eb9cf65ac806974d1b7ba1496b4e90a7eb50 SHA256 de648c9944ef00ccf6af0fd7cee19a950eae613e1fa7c75dacbe56e4820c8eba
+DIST drupal-7.12.tar.gz 3088472 RMD160 12afe461a68d4ec59921395cdbea0c5cceb79767 SHA1 aa0c85f2c384c9e6e7e1289d171afdf360bbf376 SHA256 e08702b7dd963e951796da3371124ca7f8b1b13af1026f014d10d74f522bf9dd
 DIST drupal-7.4.tar.gz 2744808 RMD160 bfb44319df159fd7597b1a043abffb0f27e37a2f SHA1 5baafc27b3473dae1056e6053734fab42a1bfc25 SHA256 ff55543ce00b0c49d6db0cc75097a90acb9dc720326d86d4c793ae36b5cf2f3f
 DIST drupal-7.7.tar.gz 2754113 RMD160 cdd3e35a0a72af466e454eff9f317e9fe856e27a SHA1 30351894503b283c1a5f73bbcb0e3bf7f1c98de8 SHA256 f85456586c88e035743827bda200ff9d4c2d90f0b331a22b3a533899f1f98e26
 DIST drupal-7.8.tar.gz 2766967 RMD160 74e9c67d85bf67fdf49cb8c12fd878aab82c5893 SHA1 14d3fda681264a0ca4e81c22fe7e6cd474128baf SHA256 982d84c6d3bd8181e37cfd063bc32739c4eb81ddca315f48672399a168b4a6ab
 DIST drupal-7.9.tar.gz 2788086 RMD160 ccdac9785d62e92c298ce88c4847536b1383dc28 SHA1 3aa90fa9baae2c723ab5f4fe0cc523a6c96683ba SHA256 9708db25f860d1250166fe0936af366155f6a59c5dc6d2de356bb7d22036c93a
 EBUILD drupal-5.23.ebuild 1453 RMD160 3cc338b3d875dcd549a6e7efb2056fa3f6013937 SHA1 03907649f3f91f714349aa513458774a9f914844 SHA256 a495eae9534407370c382e524d2a8ce3ca073897be29f0aa0d820207a495cbc8
 EBUILD drupal-6.22.ebuild 1769 RMD160 11bc5157266440be47a59ab47326002aed6d9575 SHA1 e24a8664c9c9565f18922a1766337b090aceebcb SHA256 c6ce72ce06c5df5fef0dd79634a57ccb33883a63d96b74ca76c152f5d9af59af
+EBUILD drupal-6.24.ebuild 1625 RMD160 5d8d0b984c440c779a83b18f929fa213e776fa3e SHA1 064d7ea66966acbda854f0ea98126a047d33e6df SHA256 648f8fbe5f47b7547e6e52581f0c420072e19ae3453c124d406ef11329d05ebf
 EBUILD drupal-7.10.ebuild 1702 RMD160 abd7c91f6491bd847d2335575c79ffb4ff9f358c SHA1 dfc5878c92867a176e37ed567656c424c204589b SHA256 653e7ed88150f2bec40b82afbfbf6c3ea88adb365ab52b552e98dba7b1cc2c22
+EBUILD drupal-7.12.ebuild 1666 RMD160 71c765df4ef7c3ac0ede6e57878a3043cd15b3d1 SHA1 011cb2ba2b0503ce61e3dc12de093dc532ab8356 SHA256 ec2ef3cfd15cb1dd4e99ae57873796d6c436e8f6caf88a7efba126369cb9cbee
 EBUILD drupal-7.4.ebuild 1701 RMD160 1a3e3c7321d6d987dc88731c45939240b5170e7b SHA1 cfb5d0a10d7b2efc3b6363840e5e8fd9d34d3416 SHA256 6141c079b410650fa2bef690a5524c689f8ba4959c06a2e40c0a12b4d2a89e8f
 EBUILD drupal-7.7.ebuild 1695 RMD160 d6c8e378e12509a672397a2907d446a569bdcdc9 SHA1 670882807bfa4b8882b1ce54267b61c6eac52a9a SHA256 6d1376d8722dad3b30473eee79d9421a7e93e8193213224d8765c35294b94ffb
 EBUILD drupal-7.8.ebuild 1701 RMD160 61ece3eba896486e9191e5d80dc58395263afe4f SHA1 8a6007598b6e02e56017049662e8a41ceb90f446 SHA256 150ba39fd69ec0209731e9623e1f90f3c80831475801bbf05846a793d1e24b6e
 EBUILD drupal-7.9.ebuild 1701 RMD160 a67bb68469ed41446514000cad5f482ad74423b9 SHA1 1b5ffb6c48d30978cb27f633480d0afef361b271 SHA256 454028656c801abe773bbffd93c30fe00953001e8e4070617852443d55fa0e37
-MISC ChangeLog 12395 RMD160 b0a1c852a43374f954fd41d9291aea1cba2ebbc4 SHA1 f83d4755feae9d7eaa23dd96c70b928f0257b4b9 SHA256 58b48132d2026eee1276d4482accd93bb9c8566c3fcef2d7a26aab706e8a2b50
+MISC ChangeLog 12561 RMD160 77ccf8a9ec7686d15e2dbb486e5eb9158291cbfe SHA1 5f354f6657cf5fe6705a6e3c749373fc030b0cd1 SHA256 69837104a02b8bdc4c3ae9522302870f56b11f2cb5f28683bfe4cf3b5694c247
 MISC metadata.xml 162 RMD160 ece93b69f0e3148e7f73f6ccbde8555665c34be5 SHA1 49168d414be17b0cc9cf29ca70eb19c6754d0853 SHA256 43c8abb1bfcf55dc16e273c011f146d11197054559a26da3500c9b454ceeed40
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJO4XKAAAoJEEqz6FtPBkyj/eUH/iaEpbjUwfbKuZWlSUP22Cgt
-LsUjWO/8GItT8oNhoExTLa0wJBX9XEUOx7CPI9PhHqQTClKNEpjnfWmrMTV25Qgz
-rfruqe4NEgqks+awtNLeauQlPYLfa2gzCe/q0+DGfJPLNfsVgMI5vGXgDCE28FZy
-VuimS4B3Tyqz5i6dCY70a9T9wCVZaOUcg4zLCw59Kn0pNIjz5hFc1WpvtDkfhhvs
-XGvy0zd3JxprbH6xgq/FgnAM6m17s/vVxlKOC3TE99mDNq46/+k5B2qGthu3T5H/
-9hx+xG1hopgAvZNFJAA/t167Xg7/fJ2XmNE7Raoih/iaNd6vaIfPdIh8XuU/yKM=
-=aIPQ
+iQEcBAEBCgAGBQJPLhlEAAoJEEqz6FtPBkyj8sIIAJLBaMF8WfXuN656gR/dJsGh
+HcTnYZsEdf3UihsUMaGAPZbKk9dv8zJ5spsCfquOdFOJOlyLiaCZobUQgg/T4O3/
+Q2ZpLOZ2VR/8T5/SZjz57hiyScFlzApXvs1vmnaTbNKRkGSnsnTa8+ZG7p2N7I6E
+nKgQ+hjFrif12Q5RHpFH3JaNmOWhTysYWNalwhCawrX6lp2/XVKEgn5vhPccG4az
+YcV/0PK5dAEYu+H5zGYKZQHQi8N9/t8IP1bQcRlK5FfaHJLxQ4aiPNWrjjYIFzro
+mUzfp0AWh/lTHhXLp82RHG83UVOLF/RjEgMhVy8E78FPt1T34suQjhpLOhfHiiE=
+=dfBj
 -----END PGP SIGNATURE-----
diff --git a/www-apps/drupal/drupal-6.24.ebuild b/www-apps/drupal/drupal-6.24.ebuild
new file mode 100644
index 000000000000..d3e9593b3fbd
--- /dev/null
+++ b/www-apps/drupal/drupal-6.24.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/drupal-6.24.ebuild,v 1.1 2012/02/05 05:53:02 radhermit Exp $
+
+EAPI=4
+
+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="+mysql postgres"
+
+RDEPEND="virtual/httpd-php
+	dev-lang/php[pdo,postgres?,xml]
+	mysql? ( || ( dev-lang/php[mysql] dev-lang/php[mysqli] ) )
+	|| ( dev-lang/php[gd] dev-lang/php[gd-external] )"
+
+need_httpd_cgi
+
+REQUIRED_USE="|| ( mysql postgres )"
+
+src_install() {
+	webapp_src_preinst
+
+	local docs="MAINTAINERS.txt LICENSE.txt INSTALL.txt CHANGELOG.txt INSTALL.mysql.txt INSTALL.pgsql.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
+}
diff --git a/www-apps/drupal/drupal-7.12.ebuild b/www-apps/drupal/drupal-7.12.ebuild
new file mode 100644
index 000000000000..276a348ff903
--- /dev/null
+++ b/www-apps/drupal/drupal-7.12.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/drupal-7.12.ebuild,v 1.1 2012/02/05 05:53:02 radhermit Exp $
+
+EAPI=4
+
+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="+mysql postgres sqlite"
+
+RDEPEND="virtual/httpd-php
+	dev-lang/php[pdo,postgres?,sqlite?,xml]
+	mysql? ( || ( dev-lang/php[mysql] dev-lang/php[mysqli] ) )
+	|| ( dev-lang/php[gd] dev-lang/php[gd-external] )"
+
+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
+}