Drop unnecessary die usage

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

4 files changed, 43 insertions, 38 deletions

diff --git a/app-text/texlive-core/ChangeLog b/app-text/texlive-core/ChangeLog
index 300db15ec7a6..c3cac71d1ced 100644
--- a/app-text/texlive-core/ChangeLog
+++ b/app-text/texlive-core/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/texlive-core
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/texlive-core/ChangeLog,v 1.219 2015/02/28 17:45:07 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/texlive-core/ChangeLog,v 1.220 2015/03/09 12:17:39 jlec Exp $
+
+  09 Mar 2015; Justin Lecher <jlec@gentoo.org> metadata.xml,
+  texlive-core-2014-r2.ebuild:
+  Drop unnecessary die usage
 
 *texlive-core-2014-r2 (28 Feb 2015)
 *texlive-core-2013-r2 (28 Feb 2015)
diff --git a/app-text/texlive-core/Manifest b/app-text/texlive-core/Manifest
index cdb5feb0c301..fc37c5ae1f8f 100644
--- a/app-text/texlive-core/Manifest
+++ b/app-text/texlive-core/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX texmf-update2010 5163 SHA256 b19566f0c8032a7f24ee0ead26d627e306ee360aa8a5948a1256bc2760f89856 SHA512 e89bb321b438a70c23db587ac092cb8a98c783157c42bf1df80dce00e10c58741b5a6c685a3ee5511b61f4a2a98b833faf3d6d8f8dc24ab2e4a4342875d8454c WHIRLPOOL c62b97abaadf95b1452851ac88a7575001ca09f4e26f8e582f6fffde0b90c5fdafc0d78f3ec030152bd34a7cec44e5ae2ad2bab46d978dabb90a69d4b6f95b41
 DIST texlive-20120701-source.tar.xz 131904044 SHA256 9666617d5dac3e82578e696835cc9f251ee0a56d162d86dff08659ac5dcb6c81 SHA512 0e8653aa21094e079900d17256f0768ac5514690a3725d96923d5fdc7633484d611441df1af8c674b38b9ce6a8845a9004976cd00635742dfc6837aa433caf5f WHIRLPOOL 9d570a1bd58cca8baed399ab53eb767c7c3db607c00363ce563e14dfccdd235703c538e6a651aa7f2934adf21f8477775f1547f9e7f3d957b89af644c89bcb57
@@ -352,24 +352,26 @@ EBUILD texlive-core-2012.ebuild 11140 SHA256 d0901aa92229f159fac7b9ebcecc12c7ffa
 EBUILD texlive-core-2013-r1.ebuild 11630 SHA256 6c0f1fd2ab68ca0b5cc1e99852d0c5d072ec75542bdc05fe5fad0e550881781d SHA512 e36652cbed625d8499b2feb034299a01e6fafc9ce2f269bffe53898550bcf95ce5258d2f5f60a865062c0db8f4a54300695ba4a6850104555635cd05d103dfb4 WHIRLPOOL 5d776018b3b3846a2f959e09f3979accf8327540a10b6354f8a169ba65e8b96294cb0bb03e69994b4ab56e16d32ed934cbf8619f283e99b835bd4e9f007f91f8
 EBUILD texlive-core-2013-r2.ebuild 11630 SHA256 7db516011338ee74694cb31339bdb584ae8272f27b2d839d4522e25a0079a0bc SHA512 494299ef585e5d342666aa53f467ffce4bb1e35918e23cb8a6c3c7324ed6698f94484675f391ef4f9edac0a34b1af35c9d985e77e38894609479f039130d4489 WHIRLPOOL fd0b3c6d60b7a345c876fb93193c2f32c70d24116834d0f759d3f156f4dc47ebc33ea5d09bf1620226ec257a9dc90f418844ccfc185cf1f23e87348b215f75d4
 EBUILD texlive-core-2014-r1.ebuild 11010 SHA256 f4dc0070805201d7100c7fd02af0866205de96d632a52fc0ead17c6f23ed55b5 SHA512 b6f50f664d6762e269b5cbf563de00ce419d55ba3652618045e1fa611e806f7747ea5b837d74cee156aca85c4b67a43340862227777a490a692b9dd2a5a192cf WHIRLPOOL 17f9a543ce5d0c5f3076ba78eff99e3b1d5d748e1c94d93d0bf9c39807af3589763622b1ef566dde4bf371e33fb9ca3d9e2cf97e06ddbf5fa7b0eabb5b63f9b2
-EBUILD texlive-core-2014-r2.ebuild 11010 SHA256 7ea7fce6f6fabbdfa634f4da5f65b4f56488f60b183d26cb71610444a0f22082 SHA512 c7aefd6e92b685469af6cdb2cd476e26b909cb5ba3ccd8a6c5a136305b9f0f136a03958ae4437f4df21a81b4ed4491d0918c04662f0bc1790c411f5cf33bdfac WHIRLPOOL 303b7ef6e48373a47de3d2f95a2fac4537779352d39b326f4563635e9ab1d2a597e434bccbd704bb29ce01be7892844f6987e2120d7dea78c916de89d6aa7e3b
+EBUILD texlive-core-2014-r2.ebuild 10817 SHA256 163d0c9be0a8ed76bc731964a672ed44d57fd593f9c23ee8ecdeeac9f563681e SHA512 69574555b8e6c48559e5573cc24184b7ac6baa4288da575ab03ae13bc5f6646841101dcdde07c441554b9180b013636a13316719bc2f3a197f930d12038c98b9 WHIRLPOOL 93fd1c3c7ec845159c1c715aef5f36c58772ad924bebd476600041ec8ae157770290293cec0b7fb376c06866906775b359499425253a15ad0725ddbc148b574c
 EBUILD texlive-core-2014.ebuild 10961 SHA256 114ee434dfae05bb8ceeb5c3f23ceaa9d8ea75222dfaa1454f3ec47b63db93ba SHA512 f9ec9b36b8d94ca498cfcc97fb2826e601e5defc00e601fdf53f4b07904e18d91435e51e2bd14cadc205bba0f94cd6702f6084f7d32a61627fb24890f152ac0e WHIRLPOOL b287b8db22418fb6b4df2bb508743f8d7901c50f6c36c84ab5e159d4caddf3182f33319c99991fc02fc94326d38cf0d41b3c223323f165030278863b6e71fa90
-MISC ChangeLog 34786 SHA256 4803c328bac518e2f03fc44be9b25d0bdf885664766c92a218e9eedd80fe5d53 SHA512 044baf86846ed28787d078df279e9dcb9e48021e66462f8db0a5468defe1d4d9097b33fdd3fa242ea251ac2a015c5e1ea2366d62bbec29fdd069dc8a2a730431 WHIRLPOOL a9e2d0ba1449984e06be7f92e94f3b22ee4bec14a3a84cebf1eb6558c6a04fc0152f17d0dddb1a87611d4c8d0a28166a7715d7f7c8335338871d92523b09ad68
-MISC metadata.xml 448 SHA256 ddaca86e81c2eaf01ff5e7d613777a6c2231ed0f09646cb303e23b0e90c08d02 SHA512 c414f498afa7c6effabb5c21f85c1fca64271e9d8a429e15e86661c8b7f12adac0beb6b90c74a7309cfe9d20e639c818dc2a2045b4c315c0924583f0e71dca4b WHIRLPOOL d0537703ae9ac1a072795b05ee90b1e06d4f1dcb61b0e5adbac05f91db442a44846f909e63840518790d765c71b9a6314f58602d1489cb482ca7b7826cd88ee1
+MISC ChangeLog 34904 SHA256 05f90433351344f5612902313129de7a426b5ac3678f9b2f0506b8f391fd7e27 SHA512 7bd6b0fd7d9f5b0a0f0454a69f54504849aaab48813d8b27c2305123cbf3e992701532fb3230624e0ea7d7baf1556b2e37ec660f63cb294849ef68defba8b1aa WHIRLPOOL 9c45f4bab1d94126e594703364cc21267290f94c9f9fb86811d3b43f2633b52534a700d6a2653e5168296f1819bc522a4e236a1593c79b3e6cc0bcb83ce485aa
+MISC metadata.xml 460 SHA256 753a65eced4f57be9d1a7bf0b5ec47602b8cae9af975e423adabd6dcaa27d179 SHA512 d0dc8da34ce7d482396d8890359e112d6813ec67bd5f8f3e26f5dac10a5c11ec5c295ab6efed7129a28d5316946e555581d3ba616806ccdb0e020cd2e523ce85 WHIRLPOOL 4f69cdc5d5b8ddea9ec159df7f75cb4c345962176cecc8fefd5761b9f0c209caf447fc131fccaba224cbe9b4faaab2db24bd4cae271e078bf6079bd0def5ef31
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJU8f8eAAoJEJOE+m71LUu6q60P/3QIq49WezuK89/uhsANGxvb
-EVvORjAQNmXRKLHD65jHpMESzO0TjLkR89uvmmXXJdMz+ilywWDrPUcEPtiRh2N2
-5eNoG5CvHmJd65fAFglXJqZY9CDvvJ8XBrSE/oPSZ0KLI25i9AS6mE9XaztChuLV
-hOJ418Q/T7G4oUh7bWt8NZ8KsalIA/yt3ZYUxQ+7XUZ6LZddP3kZs0jTc9Frq44f
-47ac9UCQDELkrJpSn6ecACRDchIrYaKmeF+gGiHsJ0xOX2XfLIy+JWyXEtvoynde
-DFNa4a65QVVbTSURJqlb0RbRlOfLV5iUKixGsm97ToWCWXEgAQx1avwKD3A48+0T
-NctMdXjqyTw2Ccklb4myFWE8Wun+bR5iliyEfjDZdVYXxtVqX+ILEdcxu7PBiN+v
-NUwa5RdHkJMDi51CwfNLfovcHe3js6UXw3df7k+UOD/jgnHlywD9uj2RzGrAq7fv
-IXNR9jkURep2IbfbjOGkZ0ogEve5aafEysr378LAT0NW/W291/mxu6BHnpOu3B0Z
-RsAHo30IPlqOHy/otWCYjGUAkHFK2H0cc9olsb11NJ9BdD8JaUiUO2L4C0jlZlwl
-ZwNNJcz2NyoZpiiA74Qd4FFwE4qngF6PifZ3AkeinSDRSfWNLm7pD3A1v84UF4tV
-JGvzrNI0tqKfJ9ctJQ6b
-=J6Zi
+iQJ8BAEBCgBmBQJU/Y9kXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirKbYP/0Zu3m6LX7XzH6I5nFhrHWYl
+oZm9cKObZxdP1zLBcvGTrGhTHDXq6FyOWtkImGIzubNVd7JJxVfUx/Ebv9030Z/I
+/TIPHILoCLfwX0iOuVBIxwNo67yVGm+0Sp+fQYneLHbvxVb4Dz04UXNBrdYgFU6M
+eX0VDWu088CiP/CQZXiV9nWYbVFsDsszNlUZ5eI+51z2ObP8ZuKJc0uomgxMIyHx
+BqC83xSQcnM4BgBOCyqS6OqEwQCRq0MBmIr4Q+sJ8OsnARMhznRxO+DNbLEr9J9K
+5hjgi7KdMlQzsTBMTrVO8YPTVv1F2quda9GhAzI/whtayWaRxf3fHV+/jjz5/ygL
+yiR2oh3EODVbPOTnqt0lRDoB/xlL6Cw1MyQC6UlXSA+sWjc9vGeqqTUzy0leHADN
+wNM8M+qRJBZIPSB5vcEUtyNw3cjcfpptW/MAUeK9yqbn+8xRq2aZVI9Fy+cwqfsi
++RxxgiSJTZi7IruT+JhPOGD66b8aiM41D+/s57BPJqaOd5SF2rzp5fKmJbKNnlFQ
+OwNI2PXgC04OhpE/TeV6yKQslI1wgSWxOqlOiiDa/LSiNDaeSZJ8uj40KL/55b8L
+giiLrik/kTS9EfYNjuSJweA6pb5Okf2HOI2Cu5HaZIGwMJXAJGLfT10Vp/zwUPxa
+iAaH1mNEM2OzSKcSeyXY
+=FOVz
 -----END PGP SIGNATURE-----
diff --git a/app-text/texlive-core/metadata.xml b/app-text/texlive-core/metadata.xml
index 68edcb81679a..d03aa9f02781 100644
--- a/app-text/texlive-core/metadata.xml
+++ b/app-text/texlive-core/metadata.xml
@@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
-	<maintainer>
-		<email>aballier@gentoo.org</email>
-		<name>Alexis Ballier</name>
-	</maintainer>
-	<longdescription lang="en">
+  <herd>tex</herd>
+  <maintainer>
+    <email>aballier@gentoo.org</email>
+    <name>Alexis Ballier</name>
+  </maintainer>
+  <longdescription lang="en">
 		TeXLive core binaries
 	</longdescription>
-	<use>
-	<flag name='xetex'>Add support for XeTeX: a TeX system with Unicode and modern font technologies.</flag>
-	</use>
+  <use>
+    <flag name="xetex">Add support for XeTeX: a TeX system with Unicode and modern font technologies.</flag>
+  </use>
 </pkgmetadata>
-
diff --git a/app-text/texlive-core/texlive-core-2014-r2.ebuild b/app-text/texlive-core/texlive-core-2014-r2.ebuild
index f77b84023451..d27b5227fb5e 100644
--- a/app-text/texlive-core/texlive-core-2014-r2.ebuild
+++ b/app-text/texlive-core/texlive-core-2014-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/texlive-core/texlive-core-2014-r2.ebuild,v 1.1 2015/02/28 17:45:07 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/texlive-core/texlive-core-2014-r2.ebuild,v 1.2 2015/03/09 12:17:39 jlec Exp $
 
 EAPI=5
 
@@ -236,9 +236,9 @@ src_configure() {
 
 src_compile() {
 	tc-export CC CXX AR RANLIB
-	emake SHELL="${EPREFIX}"/bin/sh texmf="${EPREFIX}"${TEXMF_PATH:-/usr/share/texmf-dist} || die "emake failed"
+	emake SHELL="${EPREFIX}"/bin/sh texmf="${EPREFIX}"${TEXMF_PATH:-/usr/share/texmf-dist}
 
-	cd "${B}"
+	cd "${B}" || die
 	# Mimic updmap --syncwithtrees to enable only fonts installed
 	# Code copied from updmap script
 	for i in `egrep '^(Mixed|Kanji)?Map' "texmf-dist/web2c/updmap.cfg" | sed 's@.* @@'`; do
@@ -255,9 +255,9 @@ src_compile() {
 
 src_install() {
 	dodir ${TEXMF_PATH:-/usr/share/texmf-dist}/web2c
-	emake DESTDIR="${D}" texmf="${ED}${TEXMF_PATH:-/usr/share/texmf-dist}" run_texlinks="true" run_mktexlsr="true" install || die "install failed"
+	emake DESTDIR="${D}" texmf="${ED}${TEXMF_PATH:-/usr/share/texmf-dist}" run_texlinks="true" run_mktexlsr="true" install
 
-	cd "${B}"
+	cd "${B}" || die
 	dodir /usr/share # just in case
 	cp -pR texmf-dist "${ED}/usr/share/" || die "failed to install texmf trees"
 	cp -pR "${WORKDIR}"/tlpkg "${ED}/usr/share/" || die "failed to install tlpkg files"
@@ -268,19 +268,19 @@ src_install() {
 
 	docinto texk
 	cd "${B}/texk"
-	dodoc ChangeLog README || die "failed to install texk docs"
+	dodoc ChangeLog README
 
 	docinto dviljk
 	cd "${B}/texk/dviljk"
-	dodoc ChangeLog README NEWS || die "failed to install dviljk docs"
+	dodoc ChangeLog README NEWS
 
 	docinto makeindexk
 	cd "${B}/texk/makeindexk"
-	dodoc ChangeLog NOTES README || die "failed to install makeindexk docs"
+	dodoc ChangeLog NOTES README
 
 	docinto web2c
 	cd "${B}/texk/web2c"
-	dodoc ChangeLog NEWS PROJECTS README || die "failed to install web2c docs"
+	dodoc ChangeLog NEWS PROJECTS README
 
 	use doc || rm -rf "${ED}/usr/share/texmf-dist/doc"