Remove old.

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

4 files changed, 13 insertions, 155 deletions

diff --git a/www-apps/drupal/ChangeLog b/www-apps/drupal/ChangeLog
index 6007b02d35b3..b847d2299727 100644
--- a/www-apps/drupal/ChangeLog
+++ b/www-apps/drupal/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-apps/drupal
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/ChangeLog,v 1.104 2014/04/25 07:55:09 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/ChangeLog,v 1.105 2014/04/26 19:46:24 radhermit Exp $
+
+  26 Apr 2014; Tim Harder <radhermit@gentoo.org> -drupal-6.30.ebuild,
+  -drupal-7.26.ebuild:
+  Remove old.
 
 *drupal-7.27 (25 Apr 2014)
 *drupal-6.31 (25 Apr 2014)
diff --git a/www-apps/drupal/Manifest b/www-apps/drupal/Manifest
index b0144d9ef8b5..ba8314df7a30 100644
--- a/www-apps/drupal/Manifest
+++ b/www-apps/drupal/Manifest
@@ -2,24 +2,20 @@
 Hash: SHA256
 
 AUX postinstall-en.txt 830 SHA256 ff1b9004e65d7a46a7d94b23e2ea90563d5703f2afb45b9dec6ff7e750e788dc SHA512 1d753f23faead95249d2a691da4187c7882400b308fbd2ab1c9b55ca109deb0f7f3e9414a9e6b59a74341706bc6d698745aecc38283c02e9daea555b9bc04bfc WHIRLPOOL 27c73d7dd50391fc2305ee08c138c316fea6b56458c375c317a455fd8ea43e32542a015c4911c48a93d912e1a875490e8d6523de312349c6d5d33506c68a661a
-DIST drupal-6.30.tar.gz 1101282 SHA256 c180ffbbcebe0d5821335d409a6041c8c0209339df188f2fbedcb5b1af0e2d2a SHA512 5fa9b45aa76db79590472bce54c8bfa7a42225a37cd7e7d830b65a142030cf70163d3ca5b69cf389ef8dbf9b850f0f03eab43893199bc5f9f05e44e7f5601008 WHIRLPOOL 9a66cb0a168b45ddae0383c7d5e1e8f088907d4d72d8abec27fab3f08899072f72f72529b75bd10fd6aed5aede202498a3ea291308a424042734ea51a2655500
 DIST drupal-6.31.tar.gz 1102375 SHA256 09d2acae0c5d606b08a59ecffbe47e7273f02ff5d0e8d6580d5d26c0563006a8 SHA512 3294ceee615d8b421f968dc040a3555fe155d632061dd37ed476501460bf3f305a28b8e3b1afafa27869d209e9e1f4c4e7cbcdb80a3bb04f0204986c6e404982 WHIRLPOOL 35076d49c04c7576ebb5db1fcda7c602309c6c1a166e2ce02661773df9295c0599005e69c78cdd811e8d573761ae104876f3dcb416595f46bd96ef30b89d075f
-DIST drupal-7.26.tar.gz 3204587 SHA256 8ec209228d1bfde68d3a2083aeefff1a874a6ffef3df605bd721e0bae650585d SHA512 b89989142f076e46f640536dafe6773085d3a0e7e22a67024736c206c2f3926ca5844b41c0d9e85bb1830093f70ac518910ff957da616f675fc9c9f022c4689e WHIRLPOOL cc4e06d2bda16ceabde2ce94ba517ba271dd6eeb8aad1738d401b0f79ad9b9451cfcd2cb306c57bb8d7ef1fa4ac11c23c244ec4fbc3a70dfa79b7c0ef6ec7a7d
 DIST drupal-7.27.tar.gz 3207398 SHA256 9a04062618acdebdaf8ee1e0291c6f3d6808483b9aec9b315e4f15db080a19e2 SHA512 108e671ac9d396ed4905d7513f6788d5866a0d8241f142ec64163a149a11b8aebcf5ecd27caaa7e353d5fd91dc4b185b5df3749e5527b41b31e6ca08fa3eede2 WHIRLPOOL 3e45003d9b4efbba32673747afe1bb698b966db64f63431eb5d1ebff352b8ef38f84c9b67707f50492e80103776b4a88582cf24abf989403c6c0494fe6ca42d8
-EBUILD drupal-6.30.ebuild 1589 SHA256 551f4ae24e2f55b204bdca2b746505f54929cc05a412fce0a9f94bbc15c8e3d8 SHA512 2a1a53e69ccb67ba5e31f30e3d8140d6e32fbd7a8975a8a3125dcc4f3ba7cc45ee5f0820ad3296f7f39ae94b629b3b45034f352133160a95aa1634a5ee550c8c WHIRLPOOL 239abed881c8fa3a992aedbd1d59a319182ee39278aa8e80715b7bdac5e8729db783b943c6fe5ccf3a4258c3c3d7bbe0aea45df780075571ccab6874cda650fb
 EBUILD drupal-6.31.ebuild 1589 SHA256 1a5ba5a8aa6c7127a64c4eafe1ec97b69c4d673cf38d5626bc8c96f63ce7d224 SHA512 56b11cb782efa284d50b78e40ed19e419aa41443fbbcb16fd4d0d5010eaa2133e3e5fe22810a99e0e1a835c922e8f261402315e47713e8eda0c0bd51e5d977ba WHIRLPOOL 605550d02548eef381a296e243e7da30bdd373e005f5e2482d18d705e57ee5731a8099fd62c0ca8dd69a3c008ea1674dd91f7b9947553a08d32a0363dd9cf397
-EBUILD drupal-7.26.ebuild 1992 SHA256 5ac4c0f20b169d585483bbcde4983920bc26ada67b234310d83abe57112bc0cd SHA512 44d5dd2a3cdaaa87d79b3c21f2a4ea43b08f1d4382ea167d8243f1f4bf16c2e4ea2623472fea8c6f7a6faac508e16fd4bb877763c1c482dd6bcf30dac709e6ce WHIRLPOOL f8beaa25b7eebb6e0bf5fd0919b51e5a03075d8521b6e35f57dcb8087cf2113793a150d28235908fa0778f676c0602bea13574d747ff09607db56238a329b414
 EBUILD drupal-7.27.ebuild 1992 SHA256 62640a57f00d608f9a8425c97d9d7daa899f1730bf16428dfe80fe25355a4d69 SHA512 67557d9a95e5cb71f495f074e3151d3a79bad42fd1be968653568e9d269d03e1888619fd706da92a96c2cffcd1aa8a459ec207d1cdadf8813253cbaaf680f51f WHIRLPOOL 5025dfddf31a3ca1827162cd34c74bf3cc668a403bf8cfb62a882a20062048ded723733b91186a1f6dbc091f8e84601e207253ca23fef2b06c70327c3ef1c0e2
-MISC ChangeLog 16664 SHA256 fbd3558623dd0b883708f7a2287c79b091768da1515f05688558e8b3e8647f5a SHA512 3bbb0b5b6dbcdfa20afd85f910f47c6eea88c5def1b1e9e8edf763e6c3e234f8392c8842658382a315913d54415b52ac5ffb77459e57c6afe161a3f1e9d6ad2b WHIRLPOOL 3b8edccb857888eec2a0947a5997c3ce1bb5a87934eda03890006405fcc38994d5dbd041d33146b7d3910065ea8b032808a98c73cad608cebdac80fef1b20129
+MISC ChangeLog 16772 SHA256 8b349598d0104b6e300996d1d739a68d974332d2651b832cadd0864810c256fb SHA512 89be4b5a8b0e6b210b81de1b0e3703690900a1ec65ec3bf63c34943919d2bb56a84d2f6f7138d34a67ebe127f14729cb3c0cf8d3223801ec5a125557c55781d5 WHIRLPOOL 3a8df3c4d69c35a20d648fb4a887d3f9c039f93392a2131fcdc6728248e76449d31abcd997553acc770667d305bc8c62debf8dc4a547416127bbdca969e94456
 MISC metadata.xml 334 SHA256 b1d825183ede1df66432e5d9cbc1f0f227d4c238ae1262c3cf492810d3ba5ce2 SHA512 1579decab2343f47cc16d738f45e6152b4f8567f6e0f53e05c587c126d1c05c94ecbbb1bc9aaaf6885bdb53b3bccedc0f63d125e3c245465c24a12a216bd4730 WHIRLPOOL a6446b0fcf9824990c48b511889a402e39f3edd5d9d7d8c58d574abd5435db1b5b4006407340589073e79f50a85d55c90ce1059a2944566cfe9901607adfecae
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTWhTfAAoJEEqz6FtPBkyj5gYIAKkKVDXAFo0WQAhArYfRcwoD
-vf7BOxieXaA71GBK2FHXGzT3gaGaJ4hanNy2Uvv39J5o5d0f8y/y0zpLk8f/lv3Q
-8bl6xF48dtVs4OpdA6CwJupniTwmwpAP5nlKMybk4RJ+2N/pQ+2hWv2ztCb3Mp13
-Bin//5i1SuZKVdDXmJe8wcpVKTGKFaCXlHpUAo5fX4ig99xXN38wYZzdoysmOr+c
-CGigy+Gllysxc94EIkass0TzRUUpz970ipicNf+RnFIHzapL3AMoktxhmbkojb6p
-OpX0e8uE8M0av1k93Koz8iqcI+xI90OI2RZAuH1WdWp+RX330GBLLL0MQyOSY10=
-=AOkf
+iQEcBAEBCAAGBQJTXA0UAAoJEEqz6FtPBkyjliYH/A/Shvsg1AGq2wahpvXhttdn
+f9x/F4uBPDVda8bBJAOWqucV9/o0uR+Zsouqx/gUcOmANN5ghGPNJdj+oKFfH/J6
+ZXd+0d/Bhspgqm0/mBkUu4WK3NIAqk3OS+hV5rVxr9+X64KKsX01LojkrZ4sgwKA
+jkK8r7HGI+mGPQen5HuhxaZLu+H87rnC8OXdZvTMAFTXhkHXbUyehoo7J1y4zD2V
+SgwphmWJwJWuN4SApAN6MRGCXH2yHxevybLsDPX4N2tGwEdczzQVqIxPRgrtI8Gj
+osk2Gw66OkuvCSq7R8mZZs/x4OGPmwXo92iQrs9l5tXy0Gq1haoWS6NwARY79CQ=
+=ODam
 -----END PGP SIGNATURE-----
diff --git a/www-apps/drupal/drupal-6.30.ebuild b/www-apps/drupal/drupal-6.30.ebuild
deleted file mode 100644
index 29679ec01762..000000000000
--- a/www-apps/drupal/drupal-6.30.ebuild
+++ /dev/null
@@ -1,57 +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/drupal/drupal-6.30.ebuild,v 1.2 2014/01/23 03:35:48 sdamashek 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 || die
-
-	cp sites/default/{default.settings.php,settings.php} || die
-	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() {
-	echo
-	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}"
-	echo
-}
diff --git a/www-apps/drupal/drupal-7.26.ebuild b/www-apps/drupal/drupal-7.26.ebuild
deleted file mode 100644
index 9b7613ff354e..000000000000
--- a/www-apps/drupal/drupal-7.26.ebuild
+++ /dev/null
@@ -1,85 +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/drupal/drupal-7.26.ebuild,v 1.2 2014/01/23 03:35:48 sdamashek 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 || die
-
-	cp sites/default/{default.settings.php,settings.php} || die
-	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() {
-	echo
-	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}"
-	echo
-}