summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Damashek <sdamashek@gentoo.org>2014-01-23 03:35:48 +0000
committerSamuel Damashek <sdamashek@gentoo.org>2014-01-23 03:35:48 +0000
commit8c6d6f97ab3f2ef0393419261c5d103aacefb462 (patch)
tree1a2559d4528f5e4a564b53381dbeba3c89ac7d69 /www-apps/drupal
parentRemove old. (diff)
downloadgentoo-2-8c6d6f97ab3f2ef0393419261c5d103aacefb462.tar.gz
gentoo-2-8c6d6f97ab3f2ef0393419261c5d103aacefb462.tar.bz2
gentoo-2-8c6d6f97ab3f2ef0393419261c5d103aacefb462.zip
Fix up ebuild syntax and add die to external commands
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 3C472B56)
Diffstat (limited to 'www-apps/drupal')
-rw-r--r--www-apps/drupal/ChangeLog6
-rw-r--r--www-apps/drupal/drupal-6.30.ebuild10
-rw-r--r--www-apps/drupal/drupal-7.26.ebuild10
3 files changed, 15 insertions, 11 deletions
diff --git a/www-apps/drupal/ChangeLog b/www-apps/drupal/ChangeLog
index 855c3d376c73..b8a4f616406f 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.102 2014/01/22 16:47:48 sdamashek Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/ChangeLog,v 1.103 2014/01/23 03:35:48 sdamashek Exp $
+
+ 23 Jan 2014; Samuel Damashek <sdamashek@gentoo.org> drupal-6.30.ebuild,
+ drupal-7.26.ebuild:
+ Fix up ebuild syntax and add die to external commands
*drupal-7.26 (22 Jan 2014)
*drupal-6.30 (22 Jan 2014)
diff --git a/www-apps/drupal/drupal-6.30.ebuild b/www-apps/drupal/drupal-6.30.ebuild
index 12355371eba8..29679ec01762 100644
--- a/www-apps/drupal/drupal-6.30.ebuild
+++ b/www-apps/drupal/drupal-6.30.ebuild
@@ -1,6 +1,6 @@
# 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.1 2014/01/22 16:47:48 sdamashek Exp $
+# $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
@@ -29,9 +29,9 @@ src_install() {
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
+ rm -f ${docs} INSTALL COPYRIGHT.txt || die
- cp sites/default/{default.settings.php,settings.php}
+ cp sites/default/{default.settings.php,settings.php} || die
insinto "${MY_HTDOCSDIR}"
doins -r .
@@ -49,9 +49,9 @@ src_install() {
}
pkg_postinst() {
- ewarn
+ 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}"
- ewarn
+ echo
}
diff --git a/www-apps/drupal/drupal-7.26.ebuild b/www-apps/drupal/drupal-7.26.ebuild
index 3c57c066e338..9b7613ff354e 100644
--- a/www-apps/drupal/drupal-7.26.ebuild
+++ b/www-apps/drupal/drupal-7.26.ebuild
@@ -1,6 +1,6 @@
# 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.1 2014/01/22 16:47:48 sdamashek Exp $
+# $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
@@ -57,9 +57,9 @@ src_install() {
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
+ rm -f ${docs} INSTALL COPYRIGHT.txt || die
- cp sites/default/{default.settings.php,settings.php}
+ cp sites/default/{default.settings.php,settings.php} || die
insinto "${MY_HTDOCSDIR}"
doins -r .
@@ -77,9 +77,9 @@ src_install() {
}
pkg_postinst() {
- ewarn
+ 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}"
- ewarn
+ echo
}