Version bump and cleanup wrt bug 498464

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 3C472B56)

4 files changed, 14 insertions, 63 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/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