Fix missing ||die. Simplify doc-install.

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

3 files changed, 29 insertions, 29 deletions

diff --git a/dev-python/pyqwt/ChangeLog b/dev-python/pyqwt/ChangeLog
index 455bdbc2d8da..271da75dd792 100644
--- a/dev-python/pyqwt/ChangeLog
+++ b/dev-python/pyqwt/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/pyqwt
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyqwt/ChangeLog,v 1.23 2014/06/16 11:34:13 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyqwt/ChangeLog,v 1.24 2014/12/23 09:41:44 mgorny Exp $
+
+  23 Dec 2014; Michał Górny <mgorny@gentoo.org> pyqwt-5.2.0-r1.ebuild:
+  Fix missing ||die. Simplify doc-install.
 
   16 Jun 2014; Michael Palimaka <kensington@gentoo.org> metadata.xml:
   Remove Qt herd.
diff --git a/dev-python/pyqwt/Manifest b/dev-python/pyqwt/Manifest
index 6a60eb612415..69d05f0806e7 100644
--- a/dev-python/pyqwt/Manifest
+++ b/dev-python/pyqwt/Manifest
@@ -2,25 +2,26 @@
 Hash: SHA256
 
 DIST PyQwt-5.2.0.tar.gz 2670893 SHA256 98a8c7e0c76d07701c11dffb77793b05f071b664a8b520d6e97054a98179e70b SHA512 8c409ee228d91d625bf9bd8a5704c3d41f70613b420bc8f1527312dd1ebb686b8482bd68c4b3d1a72edd80673533a4f5a39378221967bea70f389c9dde14f265 WHIRLPOOL ab5e8d1b094552df592062ad41d786e58621465d318eaa2e199cdf45163e39be24f8c268aec33b428b4daa92c4c85342925df109792475507425f90c76e86c70
-EBUILD pyqwt-5.2.0-r1.ebuild 1917 SHA256 2799361a62186c6f4f6f61fca88eb859f014c1d00f5c2bdae1b5be67d96fc90c SHA512 f3657ea810c27d88bfe2695b481f5acde77dc492afc4ec2e13f38cc04403d83df0553e568b6f049f7461bea644febfe3fc66bb7a62929d4d3941321c7570721c WHIRLPOOL a398ac96537a2834a963dc0d73d2d4e296934ae857e3a5cd03802f5e399dfdce9d952ac1e307bdc86cf1ef342a976673f85a3bb1f663ae91d514df13386860a7
+EBUILD pyqwt-5.2.0-r1.ebuild 1866 SHA256 07ca1034af087b63d9126f36612f96370f48a994a0f9dda9119d15e07e3685cc SHA512 8d9652dcd2f109a23dea1075379c2484f48f2078fccd7548897bf480fb6d950090d7675d5f669030cb1782b0e77d5f920f1c607e3a11dc6ec46826e514a5bb3e WHIRLPOOL ac6636dad24654eca1b3911caaad3cdbfc96452e6c6ca8dd089e3c6308a905a56310371f51021fc3343b815c79b7f38d5adac144f9366924c776b61d19b04bbc
 EBUILD pyqwt-5.2.0.ebuild 1572 SHA256 62f031bb6f18a93c6a0d5df223e987580b9719233232ea03d09fd780878ff403 SHA512 8278fe8dfecee018403aff6dc199430c13a25e4916fdb8641aadf3ae75715c019f1aa4d79c676452e4cb3eb6f6df16a15a46db3ebca2b07306706b5d6996d3ba WHIRLPOOL 75d19b8dd58ac926cf1b86ce5d2f46995f5c9c86fae7be694dc2c9cc0c09a9fd0ef7ab39c0a3cc0d2bb22316c4d91f3ec33491839ec8a51bc9b4f22eb67947a8
-MISC ChangeLog 3071 SHA256 6e6ddc43f60957eb833fafadae820e9bba957eaabb501edc6c9591b118a4241f SHA512 99da9e91b2642c65a94fe3a2675809a84d2674d6690ef6ddf763f3cb72b56d82b40cbacf35942cdf94731f7e70a913c97841ffeddb67c7e4627d6a7eef432831 WHIRLPOOL bfb8eb499b327d058c0301cebd56350237d4ed96417eb8647822bcb84dc1b99b3c60552f91db9d1d55ed9ba030e2ba32be5a7473895cc75233cce96d3b906c82
+MISC ChangeLog 3184 SHA256 70d6150e09a5ce36e2ac238ce68aaca225564e90c25b547f7305472819885d70 SHA512 a81d1cf8a4c91df6398245ac1fd28871a2b97eee7dd7f8e86541536a7dcc48ec70c9aa1318063bd11fb22a12a44163b6cf120a38432b0b5e7a4b808c954d6984 WHIRLPOOL 367d382af81cc054ce8f18941aa82b2a52950480c9931db2a1eeafe19501e7bec8cd989e1f6d4561cb24850d507f4d35ae072665a34666b2dd95c0b1d56902c5
 MISC metadata.xml 509 SHA256 7f6c5a900916411b1f8048531ef479512aaa73d87b4b3179dbd3e6fb599bc6a2 SHA512 a2104edb2c2015f01cd3263e2f2f5ac3412a75aa8e359c1a31b37c216ac60b6b1265f84dbadc61732229a2f727e16a9e3724149451291f4106d27b3e0436fae3 WHIRLPOOL 4cc4276ba2a53923d1ddaac51b005c6efe606aed80c61d707c595a1ceb7a64df40f27e2c16c12c8567453ff1bbeb3f7055236fb8afe57c5d723d0aa80597564b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQJiBAEBCABMBQJTntY2RRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
-MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
-7LorD/9i/tOL22Kj6TussZtztXRqOQYOTUII/M8O9OikvTzb9AvZNAFOwGHC9HRV
-4Dcnctkd2am2CR0CZsIaTD373qmhsMh7TQna+G4OthU4uDyNuEgnOrSG9Mr5bFBO
-RSiK8Od1GEvLSYeW7tF26I8fb5Kjs5HV/WM+ZCr4LHmPs+x7dNNwdUuPjfXd+8PS
-FCmeX0PoA3MrCKTbTg1gdc4oYkciopWDmzxyGZ7Hnz3Ppindbg1DttvCwaCQXKni
-pO1kk5WTpziAatskGizWI6mRpXLsaXzddED3wGslrFpMRMEqZXpOlEATPBKx7fQo
-tV008iQ9qSYd55r/EG2Fkrl0MyqmcHPJApAPYQZ0Tyg5m62kN6sx/8jLzuxxcZQS
-UNSKHCnmKtSE7J04jzW7MhxzWT5hK+CDIlrTGyA5vj59UXRSDW9ld0DNXxMbRYri
-gbISTrg+Kcvxj2rSRYYm7fsbjMdm4rf6VgXBtm2S+q2Op/VNX/zxiWZ/fAObDmgJ
-4PchuTbMsOmzjKqr3GJp8PEa0ygDGP42eLT4kEnj2K389ga7u08m/CB9HO+NC0W4
-CWSD6l+26eJ6lVF4JBqOuQJgh9oWBEmA5UJ0v2WeUESBq7IGkhCnkulKatK19Xh5
-Z2SNByHuuSFTGUKkznNvODw+f8voWW6zPG3WD8Bz/avH6jg29Q==
-=4XlK
+iQJ8BAEBCABmBQJUmTjcXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOVkUP/0OyoUpbwyflKekocGuCIZgS
+VKG9LNODwMAE2ageP4GM7n8sSbeVtewWp7lVPOHcLz8c1vWC7wXTZp6LG75rpgH+
+GRWyV13/qjfbuXbbU/DOIe5OhjFIlKX6TA5lFsn7P6BQ36UVqAzzUdCKrkoy0NWa
+4zuOZ4AKjPPO+epxOwykIqxO7cM5fYG4cM3HUW7x/GDIuLWpdh2oVXMaE0PF66Yp
+PDB2iXwsKh90TSh8uoOZKegW6mGnv/J2Z9w4DzT6/3NVJz7WMDs2hwdpVhRChtJx
+sv1uyR7kLOkHqP53jQORTMAv2szUJh+mvy4p8Z/VXk4fAZQ4gLv5MOfOqObi+W/T
+venrJNzG4VwCBlM/m+A4RQn0Y7WXPaMSHU+ne4v8PjChZ094UEG+CARkpKUNNnHh
+Qb4V7k1aFndqSruML0MiySS+m9D1PmLIVv32eeGvsFOzUY0vKsOEmiODaCHCl92Y
+K9VOYXYii7hQAQPvGgohtOBxWRH5XasppzrQuuoxtZO2/JcqUnx3BMxKTxkpKp08
+AHI24txZxdhNnJHbpzm3/2FMsenIaqKbQTti2FRn47IZxrQxv06QYGlEbdNKBDoZ
+IDCVKvdYlykcg+q5Y/YEt3JughifBOyAn/Egjs9c27HhFfg3VavPZJPepIYS9GhC
+lgWnjQonZt/HyXEY3af/
+=pwEC
 -----END PGP SIGNATURE-----
diff --git a/dev-python/pyqwt/pyqwt-5.2.0-r1.ebuild b/dev-python/pyqwt/pyqwt-5.2.0-r1.ebuild
index 178594f17ed7..9ee2d496cad2 100644
--- a/dev-python/pyqwt/pyqwt-5.2.0-r1.ebuild
+++ b/dev-python/pyqwt/pyqwt-5.2.0-r1.ebuild
@@ -1,10 +1,10 @@
-# 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/dev-python/pyqwt/pyqwt-5.2.0-r1.ebuild,v 1.3 2013/09/05 18:45:58 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyqwt/pyqwt-5.2.0-r1.ebuild,v 1.4 2014/12/23 09:41:44 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_COMPAT=( python2_7 )
 
 inherit flag-o-matic python-r1
 
@@ -49,7 +49,7 @@ src_configure() {
 			-I/usr/include/qwt5 \
 			-lqwt \
 			${myconf[@]} \
-			|| return 1
+			|| die "configure.py failed"
 
 		# Avoid stripping of the libraries.
 		sed -i -e "/strip/d" {iqt5qt4,qwt5qt4}/Makefile || die "sed failed"
@@ -81,13 +81,9 @@ src_install() {
 
 	dodoc ANNOUNCEMENT-${PV} README
 
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins -r sphinx/build/*
-	fi
-
+	use doc && dodoc -r sphinx/build/.
 	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins qt4examples/*
+		docinto examples
+		dodoc -r qt4examples/.
 	fi
 }