Remove old.

Package-Manager: portage-2.2.0_alpha171/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3

4 files changed, 13 insertions, 133 deletions

diff --git a/www-apps/drupal/ChangeLog b/www-apps/drupal/ChangeLog
index 46cf98023c07..b9693d6d3e23 100644
--- a/www-apps/drupal/ChangeLog
+++ b/www-apps/drupal/ChangeLog
@@ -1,6 +1,10 @@
 # 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.96 2013/04/06 10:02:02 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/ChangeLog,v 1.97 2013/04/06 10:03:13 radhermit Exp $
+
+  06 Apr 2013; Tim Harder <radhermit@gentoo.org> -drupal-7.20.ebuild,
+  -drupal-7.21.ebuild:
+  Remove old.
 
 *drupal-7.22 (06 Apr 2013)
 
diff --git a/www-apps/drupal/Manifest b/www-apps/drupal/Manifest
index 842dd66811ae..fa5a2ddb8f87 100644
--- a/www-apps/drupal/Manifest
+++ b/www-apps/drupal/Manifest
@@ -3,23 +3,19 @@ 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.20.tar.gz 3163257 SHA256 2684e1d595087af4ed991bef1176d57585052d6a99aedaf09250b095df5cdbf3 SHA512 5e5b74dffd482a2a5712832a2fc523410b3883e708d959065a1551479075c48e3b7b6d87d7ab0b972738783f563a3c4f620b4664c0d056abdff74921424f0ffb WHIRLPOOL 5acde0373803770198ba78a97e5de20259c5697c898b80747fd65904898dc8d036838bdab117918624ea398cd970e9d3734b4cc3f56c8c1c55b7984dc47df2f7
-DIST drupal-7.21.tar.gz 3163798 SHA256 84884612fd7c02b7a6c6c3e9c335af941f08a61e5dc349f245e24d819569d99b SHA512 7d2dbafb3cbeaa8c536f3d6a41244d460da54d73fc0ca273a4d4b128dbe95e4aab8fd10d069a1a8e79a4142d7174610b7bae3b8d5079be2bafe36b0f9ae549e0 WHIRLPOOL d6d39f2386707d4af082cb0b2a09bea55bd83e0304019f484e3ffc47d390f27469c6b5535f4c038cc510c7afeb77306de91fc4bb39bbdff5581532416e1b5a85
 DIST drupal-7.22.tar.gz 3183014 SHA256 3f64ccfbb1c62bdef870207aa5de84ad11da1c8a94800fce5ad3a484b47cb29b SHA512 70d441b6d3dba456de3be12accaf1297b648c80efb35108823e553e7afc4dd1a9dd29b5d726f0ded5f2ebf7271294e0792043e4259e317cba2376733348966a9 WHIRLPOOL 7dfb69c33d3f2bf92546e569ccf21b4fa02860efd0b6fc33a62aae688f31240d64f26cfb324558bd527bd469a23355a67264923e0244f8d1319f1057b3185ee7
 EBUILD drupal-6.28.ebuild 1577 SHA256 86153bba08a3c7afa928afd05cb8248e8591c612400df04b024aa5cdef8f4ef9 SHA512 a946123f98782430a72bbb8e616c419f1b7ae9d165acd15dd7e055a11613ec7bcf1b1e630fb88e585216cdddc477ad68bfb67b24735de15ff62c61f1829bd0ee WHIRLPOOL 788afd8f71481259d3af5e944e012e1cf09debfaa383f3e96f3e04dcea6082625d1aee8188be1851cd0b5dd556ad5cb203542d10cfac9fa661cfe047b99d1829
-EBUILD drupal-7.20.ebuild 1720 SHA256 217f198606a0a7bcc9f62c0103e62349350b9ca94d31d9eeee0ac0036b5809f0 SHA512 c906939bcee7968643aa7f76d71f3e7f1032cc244ee227259c246b2d40ca10ea3aff3399ea16b58703919e97ebfa9f7ce216edd327f88af4a50dc29206a5cfc1 WHIRLPOOL dd419643fc9de05169dbd0b1d03bbb9f0bda48328b848ee825b9619efccccabbf371980ecc7925ccc5e8ed9ceecdb5fbf734202f449eaa263f5c6725e67c9e8d
-EBUILD drupal-7.21.ebuild 1720 SHA256 86a7af15a3b6004028ca1c2cc19ce2946e2f7c818ca19d347ccc7a0219446771 SHA512 39cc87dea552f4e5441e5b71b3d3df5922789d75383c53dc94740727df4512b6d06c8b2501ff598213ffe8bb9c5932c4b05513cb3d751a8894617ea98bc841d2 WHIRLPOOL fcf9b037d53e6a1a93ca29f0961f812a7dec34c992a60664a142391953544561261468d3cd53e5ce3597d6285b2b473e6321314624b5c2cbeb4f47aa7a28fb28
 EBUILD drupal-7.22.ebuild 1720 SHA256 0e0db0947c33a7aee6d9e254c8402cbb93d83a0db1841959e4b104a338cd0acc SHA512 c0bc794595e0ab83267417f59e6b9af5e87ebd43374a51215ebc4598b25d2243abf1d6383a5bd4f2cf52807b174d40800efba0c51d5557e7299e78c2f503282d WHIRLPOOL 5e1c30654a5b9b56af04502c5f63b680c8012197ebb38426450dfaed7da666ef5376ec22d881d2b6a0c7adeef2dbd2ac72c576b44fba525d048b8d94026e4ce7
-MISC ChangeLog 15175 SHA256 19af046d37df83c03436c77059d05ab7efe0f76ef4d0d4e9faf118d05b3e0259 SHA512 89943571dc31805ea234b17c71f55bc6d1ce2aef017bc71468de73dc4d83e424187b858bc25a1265cc4e78c191541e0a5b09a712a4b282cb27a95867ee0f704d WHIRLPOOL 5aa4429b709eb03842240131795a8a86f551844a232c79778eb2db79fd827953da012e2e5a9788b2746c9e6c1f77b0f1c1ef67e9c897101bfcefb37e859934f1
+MISC ChangeLog 15283 SHA256 6da76710ee9ee72f8af0e5c4a2127a6c18f34576bc02bcb29eebd66b0aa388f9 SHA512 b13859b80f653f461dbf2a75083b5c86ba10127fb161880bcb3e181cd69bfb0aff5012835046091d2e1c1b95cca420c21f65f766f9d0473b614b87aea3185217 WHIRLPOOL aa527b07cc5dcf1168c2097624fa71315b9d24e271827b7724508f80ea0f4153e621cbb9a32d2863d6980c26f0de08953079645ea949933ed9ed2331912035d8
 MISC metadata.xml 162 SHA256 43c8abb1bfcf55dc16e273c011f146d11197054559a26da3500c9b454ceeed40 SHA512 bb84d2a2083ba579e9b0e1d7db9997561af9eeeb41c1af4af41a6f51aedfc3e03cac9cb1a1f730ce576065925ba44de8e6de9d35c392e9d1f002f8a1e89feded WHIRLPOOL d36edc46fcf9a70b7618a861f337cfc7baab6088d13817a5d57c98a5168b23b6408d6641f167569afe9e542cb29d40988c757a86f52daaa3e8bf409730a515c3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRX/KbAAoJEEqz6FtPBkyjeMwH/3fqdSYoB551smTl0Q/BqvEW
-u7/sWVgdwhifnxCDr2x5NooS2G5xXAOPdbNR/NGasSEpBfQtsM99fRtu1u1dZ9BO
-rcE3P4EXfVgLwo0WPORg24Rtm8vzmsOLyPzlflYzsDBu2nEh3QIoZDV47M3qlolB
-GX0AIA7oc8Yl9ujvSqTI/1ymxyzvfXIZ+EWEGE1pI6An9dPIuccUi4/Zxxjeq5mZ
-HMZv3dq/22Y66jVG18a42drWK+SGG6zLB9sF/lv1SgMzrs6+u3NzDaC5lBVVqRTj
-kuG2Vk4KpwftHhfhq6fHJC/XJRryUf3nfVoGImD6QrqTrdcwaFm1LXdQnHJG86s=
-=8cte
+iQEcBAEBCAAGBQJRX/LiAAoJEEqz6FtPBkyjWgQH/1Nh3Nfic0WhhT5l3dIYFlfu
+zQQaaj32tYaRzx1f10V1NeoaExCVwbq4AzqNSAuH6lLmgrrBiXA3epwOeNTGfous
+6pQwXc93zYBRQjFm4edE+zdG1yZMOQmERIudUCV7UCLuVk0ZQ9+kNgHl9L1XXC45
+VVugkbny00RLueXqGFq+c4FM9w1+ZZV7pKGWL9IU1hrQ/Ty0+mWjkQKYBmGxZ85w
+WmJhUpeU6giTRzDyoCyKGMg9nAqFke1u/WDKEhG8M+EfgZVKqVMOWBrjydQOSHgD
+AmDo4JDa47XO/5/uCp1f1aDxDf4G42UhKMpu3/lAGByTrOsJ8/2immObKrVk5i4=
+=jm99
 -----END PGP SIGNATURE-----
diff --git a/www-apps/drupal/drupal-7.20.ebuild b/www-apps/drupal/drupal-7.20.ebuild
deleted file mode 100644
index ac1172216787..000000000000
--- a/www-apps/drupal/drupal-7.20.ebuild
+++ /dev/null
@@ -1,60 +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-7.20.ebuild,v 1.1 2013/02/24 23:23:09 radhermit 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 sqlite"
-
-RDEPEND="virtual/httpd-php
-	dev-lang/php[gd,pdo,postgres?,xml]
-	dev-php/pecl-apc
-	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
-}
diff --git a/www-apps/drupal/drupal-7.21.ebuild b/www-apps/drupal/drupal-7.21.ebuild
deleted file mode 100644
index cec19bcd8c8b..000000000000
--- a/www-apps/drupal/drupal-7.21.ebuild
+++ /dev/null
@@ -1,60 +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-7.21.ebuild,v 1.1 2013/03/07 07:38:56 radhermit 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 sqlite"
-
-RDEPEND="virtual/httpd-php
-	dev-lang/php[gd,pdo,postgres?,xml]
-	dev-php/pecl-apc
-	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
-}