Version bump and cleanup wrt bug 498464

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x3C472B56

5 files changed, 33 insertions, 70 deletions

diff --git a/www-apps/drupal/ChangeLog b/www-apps/drupal/ChangeLog
index b4943e5833f3..855c3d376c73 100644
--- a/www-apps/drupal/ChangeLog
+++ b/www-apps/drupal/ChangeLog
@@ -1,6 +1,14 @@
 # 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.101 2013/12/01 23:03:05 jmbsvicetto Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/ChangeLog,v 1.102 2014/01/22 16:47:48 sdamashek Exp $
+
+*drupal-7.26 (22 Jan 2014)
+*drupal-6.30 (22 Jan 2014)
+
+  22 Jan 2014; Samuel Damashek <sdamashek@gentoo.org> +drupal-6.30.ebuild,
+  +drupal-7.26.ebuild, -drupal-6.28.ebuild, -drupal-6.29.ebuild,
+  -drupal-7.24.ebuild:
+  Version bump and cleanup wrt bug 498464
 
   01 Dec 2013; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
   -drupal-7.22.ebuild, -drupal-7.23.ebuild:
diff --git a/www-apps/drupal/Manifest b/www-apps/drupal/Manifest
index 004ddcc7b372..5189ce24182a 100644
--- a/www-apps/drupal/Manifest
+++ b/www-apps/drupal/Manifest
@@ -1,9 +1,21 @@
+-----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-6.29.tar.gz 1101032 SHA256 49c17082e78ecd37eb218812d3e4d679b61ec24297c5ee079a206cdc6f45b2db SHA512 fed7465d3d18af3d1b8db3d909fc17f402f45ea6cff323ab6acdcc3846d7e9e4422aa5f78f0ca99f059c77743ea3261956d2eed1176001e97a2fdb3192cdec71 WHIRLPOOL ce141b280708c47ed17672921de1f6c0290c27684695a49eebcf27ec4de21808b2460e165c56cf8fdfd832fe954247c346b8fe9450119f00da5878e1f78277eb
-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-6.29.ebuild 1579 SHA256 789eb3d393dba86cef3f5705daf67d85019b0a4e18f1d98875a3bd71dcdae16a SHA512 c2019929cf9769ba800f4c772e176bb006dabdc00f9a648f2564fc13e3913c86d1da71710385edc89c7741ab654563eaeec730cec3baf20bb45a9cc32a6c2b0b WHIRLPOOL 51899afcd9cda7fb023e6a964093f520f0f9a4fa2e641a281fcad278887a2e64e8c0dfc334e2a076601227df6e18f823d4f052011c8b5e4d2539160c4fcd5221
-EBUILD drupal-7.24.ebuild 1982 SHA256 6085aa26c72fbc83d4d18e47f9070964db04181e6264b88a8f59f6176030d795 SHA512 43bf9e9cc05c3ab62da82ade9576e08979540e658df69ff07d95b12d16e2d8378ef1e5c0ec883a300240bd8ee4e77e123e2720621b989a0b35a3d4c0d12717d5 WHIRLPOOL 729a2efd16940d8b57918a25ef53b176fb018b4e49da4ad12db131b0aa23d503fd222b45f32dcd2faa287a7ca2bfdb3479c1ba9e6c2f52fb76c5893653bd3c5c
-MISC ChangeLog 16085 SHA256 22ab1ea4435d553d95e7a09612055bd40633ff57ea605ec7a1dc9e12ab680eb0 SHA512 b2b0ef60a6a9d278a0d98a9b56fb27d6f943bf7482d5b88a2110f7b22106b26012fb0661ea047f9dc86964fa3cda000d80517d1df08482e437f3971979ae18fc WHIRLPOOL a962133732557351b724d9d009746fc4df263722d869148e2203cb8bcf1c81de42de006a80dc9906bc3d617fbd78b2a7bd88bafa70039b48e81a56dc3f6517fe
+DIST drupal-6.30.tar.gz 1101282 SHA256 c180ffbbcebe0d5821335d409a6041c8c0209339df188f2fbedcb5b1af0e2d2a SHA512 5fa9b45aa76db79590472bce54c8bfa7a42225a37cd7e7d830b65a142030cf70163d3ca5b69cf389ef8dbf9b850f0f03eab43893199bc5f9f05e44e7f5601008 WHIRLPOOL 9a66cb0a168b45ddae0383c7d5e1e8f088907d4d72d8abec27fab3f08899072f72f72529b75bd10fd6aed5aede202498a3ea291308a424042734ea51a2655500
+DIST drupal-7.26.tar.gz 3204587 SHA256 8ec209228d1bfde68d3a2083aeefff1a874a6ffef3df605bd721e0bae650585d SHA512 b89989142f076e46f640536dafe6773085d3a0e7e22a67024736c206c2f3926ca5844b41c0d9e85bb1830093f70ac518910ff957da616f675fc9c9f022c4689e WHIRLPOOL cc4e06d2bda16ceabde2ce94ba517ba271dd6eeb8aad1738d401b0f79ad9b9451cfcd2cb306c57bb8d7ef1fa4ac11c23c244ec4fbc3a70dfa79b7c0ef6ec7a7d
+EBUILD drupal-6.30.ebuild 1577 SHA256 a8f78cf039bd92448177d733fac5448a5b3ae9006d31bfc3011c3fddf5e22316 SHA512 485c26bdc12dee716c775cab49f536aae7f08a59fbc1b561487ae8032097c88d2c30e0a059f46361c7fc3d1b663aec22909e6ae75db1e010c5340d6031156e2e WHIRLPOOL 922911a4114121680a74ff8e19ff7059a9401d07ad4402d7c3f61107d190e99c1e217c85c39644fd5270361d347c0061ced62ced451228af46700251efa26aaf
+EBUILD drupal-7.26.ebuild 1980 SHA256 48c8248ef1b95bda5605fa3a63046ad9e5cc27415b8dc490decea8aa65d34eed SHA512 dc90c7b200ef1f9982ad5ec81ef3c254fd72495a5cafe463f8c947fc5036669d8b328b78b62043df9f37900ca7bc8ca201681898c4831128ea1725f71ba19c7a WHIRLPOOL a7f8a38f1b4668d00655ca2e67b293dac4a8f411c3d92c67840c1d8dc48a0fff29acaeee7d600a8c2c66c819a107670372de8334cf8c3c7502d86cc73675210c
+MISC ChangeLog 16344 SHA256 649724fa85cfb85fabd9abb769ce90531f1c3835615a0b909c9c00a20bd2fea3 SHA512 7a79b47c22b3e62104b777896850152974403d89f67e726ed04e45438d88b59b3c2a6422c392d1486c4a69ea99e06d897b1a717d90fd79db00acca49893bd608 WHIRLPOOL 83d3af0cd4f4008caa1ebab0f3f4397091f94a5bc36b02900b8134130ba98b1623a9c6e7ad0102e82fb159a5fb795ee4da6d33388386d0655729103da551bb78
 MISC metadata.xml 334 SHA256 b1d825183ede1df66432e5d9cbc1f0f227d4c238ae1262c3cf492810d3ba5ce2 SHA512 1579decab2343f47cc16d738f45e6152b4f8567f6e0f53e05c587c126d1c05c94ecbbb1bc9aaaf6885bdb53b3bccedc0f63d125e3c245465c24a12a216bd4730 WHIRLPOOL a6446b0fcf9824990c48b511889a402e39f3edd5d9d7d8c58d574abd5435db1b5b4006407340589073e79f50a85d55c90ce1059a2944566cfe9901607adfecae
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iQEcBAEBCAAGBQJS3/YhAAoJEGw+uP08RytW0jwH/2I69CPmqNc8VQAqta9eVK6l
+f01P5M7JStojFy8Qv0bZhENi0YCOw3bCQ7L96BrqL2thiQJGNaQUoEs305HK4IkD
+VTYHoh4dCKlT0H6AJeqnzyuQ48Sq97Yhlcf1Z0OKXnSGyXr04+8NJkAeceqy3jat
+hH4IcbGHldpymCKfckGQzIuG5PNL/S9pMwSu5MYZXSyeOgRGmvKtK7J7t8JLen77
+t/uIoagRc8qK+/vl0BLP9QUtLrFq1eLS5QmEpsOry0jnehM2mG3RctE+L2Ox2R21
+wk2xigzNRqTAlktZ/oEZ9Ib363Ox3TQ/7zpFLdcC/nApU306ircWBDBM+896ciY=
+=0WbG
+-----END PGP SIGNATURE-----
diff --git a/www-apps/drupal/drupal-6.29.ebuild b/www-apps/drupal/drupal-6.29.ebuild
deleted file mode 100644
index f6aee4c2dc9c..000000000000
--- a/www-apps/drupal/drupal-6.29.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# 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-6.29.ebuild,v 1.1 2013/12/01 22:53:59 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="+mysql postgres"
-
-RDEPEND="virtual/httpd-php
-	dev-lang/php[gd,pdo,postgres?,xml]
-	mysql? ( || ( dev-lang/php[mysql] dev-lang/php[mysqli] ) )"
-
-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-6.28.ebuild b/www-apps/drupal/drupal-6.30.ebuild
index 4271dd0112d0..12355371eba8 100644
--- a/www-apps/drupal/drupal-6.28.ebuild
+++ b/www-apps/drupal/drupal-6.30.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/drupal-6.28.ebuild,v 1.1 2013/01/17 08:49:49 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/drupal-6.30.ebuild,v 1.1 2014/01/22 16:47:48 sdamashek Exp $
 
 EAPI=5
 
diff --git a/www-apps/drupal/drupal-7.24.ebuild b/www-apps/drupal/drupal-7.26.ebuild
index 5befcb965ba8..3c57c066e338 100644
--- a/www-apps/drupal/drupal-7.24.ebuild
+++ b/www-apps/drupal/drupal-7.26.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 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 $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/drupal-7.26.ebuild,v 1.1 2014/01/22 16:47:48 sdamashek Exp $
 
 EAPI=5