Fix up ebuild syntax and add die to external commands

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

4 files changed, 25 insertions, 21 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/Manifest b/www-apps/drupal/Manifest
index 5189ce24182a..343e5aea0336 100644
--- a/www-apps/drupal/Manifest
+++ b/www-apps/drupal/Manifest
@@ -4,18 +4,18 @@ 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-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
+EBUILD drupal-6.30.ebuild 1589 SHA256 551f4ae24e2f55b204bdca2b746505f54929cc05a412fce0a9f94bbc15c8e3d8 SHA512 2a1a53e69ccb67ba5e31f30e3d8140d6e32fbd7a8975a8a3125dcc4f3ba7cc45ee5f0820ad3296f7f39ae94b629b3b45034f352133160a95aa1634a5ee550c8c WHIRLPOOL 239abed881c8fa3a992aedbd1d59a319182ee39278aa8e80715b7bdac5e8729db783b943c6fe5ccf3a4258c3c3d7bbe0aea45df780075571ccab6874cda650fb
+EBUILD drupal-7.26.ebuild 1992 SHA256 5ac4c0f20b169d585483bbcde4983920bc26ada67b234310d83abe57112bc0cd SHA512 44d5dd2a3cdaaa87d79b3c21f2a4ea43b08f1d4382ea167d8243f1f4bf16c2e4ea2623472fea8c6f7a6faac508e16fd4bb877763c1c482dd6bcf30dac709e6ce WHIRLPOOL f8beaa25b7eebb6e0bf5fd0919b51e5a03075d8521b6e35f57dcb8087cf2113793a150d28235908fa0778f676c0602bea13574d747ff09607db56238a329b414
+MISC ChangeLog 16497 SHA256 efe65cbaf87109341a29d03fd3203646861563d8100d94ebf45b363a31e3d575 SHA512 b3d75a290467f0951a3e4e8e3064e448cf03e8799f1769d8239c591dc29c22d0e44b09b7dd0152982164adf1ec1b3763ec2dcea693f39fb2f5e956e03720a3f1 WHIRLPOOL c5d117242819ba8e888a4b1db6de9ae7840e04cd478e52c67f9fa4d3641092d3fd24f85eaa42428c9321435c8f674d4a22fed1ad8d858008f87a24ab3f26a596
 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
+iQEcBAEBCAAGBQJS4I4BAAoJEGw+uP08RytW4RsH/RX0/VJ2OPVdLna4spvSTlUg
+nWgH2vSN04OJ8YhXg8bveToJkfjPlR9KJIbF65U5cnxZqxmvWAn2QqegS/tg4Cfi
+6Okg/CYkicrpHa64nj4ymDTmWZiF2OYBoXvTFTNZjwi2+VE9VgHNFpKgfGqFNomx
+qHW77PJApaL1NBFsBD6PPIu63NxZvQeq6/yT0aQdPRFSvGC1pEnEo0sF4c13wt/q
+9jAK3lNPJPPBKmgKWevuBdVvVhnvltYn8i8EvpAHN5Qzcm2VZrJl5zH9IYgEEPWB
+ua8629mpg0imTa5knNEH7OKZsneLzIaIOa49MDXcHTWaDzgFEO0MHHRF/fY6zGI=
+=TDa/
 -----END PGP SIGNATURE-----
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
 }