Trick maintainer-more QA warn, add some die functions, run mv only if there is something to mv

Package-Manager: portage-2.1.10.10/cvs/Linux x86_64

3 files changed, 25 insertions, 17 deletions

diff --git a/sci-visualization/gri/ChangeLog b/sci-visualization/gri/ChangeLog
index 60e5b16b5cdc..0441255ae0dc 100644
--- a/sci-visualization/gri/ChangeLog
+++ b/sci-visualization/gri/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-visualization/gri
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gri/ChangeLog,v 1.8 2011/08/08 16:44:56 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gri/ChangeLog,v 1.9 2011/08/12 16:29:57 bicatali Exp $
+
+  12 Aug 2011; Sébastien Fabbro <bicatali@gentoo.org> gri-2.12.23.ebuild:
+  Trick maintainer-more QA warn, add some die functions, run mv only if there
+  is something to mv
 
   08 Aug 2011; Sébastien Fabbro <bicatali@gentoo.org> gri-2.12.23.ebuild:
   Updated netcdf dependency, thanks dli
diff --git a/sci-visualization/gri/Manifest b/sci-visualization/gri/Manifest
index ec0ea433f009..6bc71569dc40 100644
--- a/sci-visualization/gri/Manifest
+++ b/sci-visualization/gri/Manifest
@@ -6,13 +6,13 @@ AUX gri-2.12.18-postscript.patch 3997 RMD160 4b390be9c915573812ba2e3d2289b2d9037
 DIST gri-2.12.19.tar.gz 1658449 RMD160 6243770193d75224a6034688a8d7897ecb63c2bb SHA1 d7d81354b1d06917eeb8b79167832fd223102d55 SHA256 9c1b315f309268a64c538c691644ac83665c88a65c408d427afe8ed22592b6e6
 DIST gri-2.12.23.tar.gz 1668587 RMD160 9cd7861c88f7db0ec9a23e9cc2a2971a9d763842 SHA1 75856cc100040da28ba7d667e12301293e7dd5a5 SHA256 a24e703f30250ed705c0a242aa59a24748259ea7355fca52152f367f45bfd2e7
 EBUILD gri-2.12.19.ebuild 2008 RMD160 efbbb64a9b45ca68711b38253313927690c0bc1d SHA1 42fdba434c2793cd8bf75003305e9766ee69ac47 SHA256 de51045ec596948db848f1300a90fec05c34478f713528e95a00a97b5db1f444
-EBUILD gri-2.12.23.ebuild 1788 RMD160 e769f41c459b90ad62bbcf28a4138a9400468028 SHA1 ef4c8ec8af76e745aa968e7c1053759650edbc70 SHA256 e3e76e9a32560a50121ca5c0625248461c7fc425d120f25fee29296bcc33e077
-MISC ChangeLog 7024 RMD160 cb65256630b6afe88760ae3601d11aed1972f16e SHA1 ad56c77aa04bef433a7ca06331ce32b6c08a1448 SHA256 ec64e643090f15e30789aa16ee6559063ec5efc9714907fe338985dfe5e1c693
+EBUILD gri-2.12.23.ebuild 2035 RMD160 ef6b33e32948c0eb590b1e2a5ceaae04f61a240c SHA1 1312c1b7092ec2f9800fb45ac95992e67a1c2948 SHA256 8de8a92d6243743b76d707bbbc634b4144bd97a845f5e2c688f173f16288f215
+MISC ChangeLog 7199 RMD160 946b8e9ac94aa918dd62113ea24aba980cfa702d SHA1 4f130aa9d3c6a2913c2d140fe9a36c5ad1f3ac4d SHA256 15f7321cec0cc607c42a54b679377cbe4575b4848718be76d934ca3423ca8580
 MISC metadata.xml 156 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 SHA1 da2b240a255820145b7c83a5c48e45b96b7e9ee6 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk5AEpIACgkQ1ycZbhPLE2DrZQCfbh/Xg1sYyA7c5yqua181lTLU
-yaEAn0DTNGXvYrrQsXUjovoUNehcWYpq
-=26wG
+iEYEARECAAYFAk5FVX8ACgkQ1ycZbhPLE2DGCQCglfrmWYZ3cEHKtcOfwkcG5tuW
+GTAAnjH7JF+N1+HjVSScfAhIHczZGyVJ
+=gF6u
 -----END PGP SIGNATURE-----
diff --git a/sci-visualization/gri/gri-2.12.23.ebuild b/sci-visualization/gri/gri-2.12.23.ebuild
index 073d1e58123b..6833260e7954 100644
--- a/sci-visualization/gri/gri-2.12.23.ebuild
+++ b/sci-visualization/gri/gri-2.12.23.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gri/gri-2.12.23.ebuild,v 1.2 2011/08/08 16:44:56 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gri/gri-2.12.23.ebuild,v 1.3 2011/08/12 16:29:57 bicatali Exp $
 
 EAPI=4
 
@@ -26,6 +26,9 @@ SITEFILE="50gri-gentoo.el"
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-2.12.18-postscript.patch
+	# Makefile.am contains a call to the missing script that triggers gentoo qa
+	sed -i -e 's|${SHELL} ../missing --run tex|tex|g' \
+		doc/Makefile.in || die
 }
 
 src_compile() {
@@ -36,25 +39,26 @@ src_compile() {
 src_install() {
 	default
 	# license text not necessary
-	rm "${ED}"/usr/share/gri/doc/license.txt
+	rm "${ED}"/usr/share/gri/doc/license.txt || die
 
 	# install target installs it always and in the wrong location
 	# remove it here and call elisp-install in case of USE=emacs below
-	rm -rf "${ED}"/usr/share/emacs
+	rm -rf "${ED}"/usr/share/emacs || die
 
 	if ! use doc; then
-		sed -i -e "s/Manual at.*//" "${ED}"/usr/share/gri/startup.msg
-		rm "${ED}"/usr/share/gri/doc/{cmd,}refcard.ps
-		rm -rf "${D}"/usr/share/gri/doc/html
+		sed -i -e "s/Manual at.*//" "${ED}"/usr/share/gri/startup.msg || die
+		rm "${ED}"/usr/share/gri/doc/{cmd,}refcard.ps || die
+		rm -rf "${ED}"/usr/share/gri/doc/html || die
 	fi
 	if ! use examples; then
-		sed -i -e "s/Examples at.*//" "${ED}"/usr/share/gri/startup.msg
-		rm -rf "${ED}"/usr/share/gri/doc/examples
+		sed -i -e "s/Examples at.*//" "${ED}"/usr/share/gri/startup.msg || die
+		rm -rf "${ED}"/usr/share/gri/doc/examples || die
 	fi
-
 	#move docs to the proper place
-	mv "${ED}"/usr/share/gri/doc/* "${ED}"/usr/share/doc/${PF}
-	rmdir "${ED}"/usr/share/gri/doc
+	use doc || use examples && \
+		mv -f "${ED}"/usr/share/gri/doc/* "${ED}"/usr/share/doc/${PF}
+	rm -rf "${ED}"/usr/share/gri/doc || die
+
 
 	if use emacs; then
 		cd src