convert INSDESTTREE/EXEDESTTREE as well and add more calls to die

Package-Manager: portage-2.1.2.3

4 files changed, 47 insertions, 35 deletions

diff --git a/sci-chemistry/ccp4/ChangeLog b/sci-chemistry/ccp4/ChangeLog
index b4306f7d7cab..6bc3e41c9af0 100644
--- a/sci-chemistry/ccp4/ChangeLog
+++ b/sci-chemistry/ccp4/ChangeLog
@@ -1,10 +1,10 @@
 # ChangeLog for sci-chemistry/ccp4
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccp4/ChangeLog,v 1.10 2007/04/07 04:30:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccp4/ChangeLog,v 1.11 2007/04/07 08:31:50 vapier Exp $
 
   07 Apr 2007; Mike Frysinger <vapier@gentoo.org> ccp4-6.0.1-r1.ebuild,
   ccp4-6.0.2.ebuild:
-  Convert DOCDESTTREE usage into proper calls to "docinto".
+  Convert *DESTTREE abuse into proper calls to the *into functions.
 
   15 Mar 2007; Danny van Dyk <kugelfang@gentoo.org> ccp4-6.0.1-r1.ebuild,
   ccp4-6.0.2.ebuild:
diff --git a/sci-chemistry/ccp4/Manifest b/sci-chemistry/ccp4/Manifest
index 2fdf7b994661..db4d4209a629 100644
--- a/sci-chemistry/ccp4/Manifest
+++ b/sci-chemistry/ccp4/Manifest
@@ -71,18 +71,18 @@ DIST refmac5.tcl-r1.39.2.3-r1.42.diff 2464 RMD160 fca236184597ab86fc9ac7333834e6
 DIST rotmat.f-17July2006.diff 1002 RMD160 59cc822edbdc73b24e51cff013c71e4d68927979 SHA1 31fed5d06e8c8afc719f74d50acb0e833b893202 SHA256 1ee4f3288dba6404d59f51b9f9e1b4475413f7e40991204ab39474ee559605b1
 DIST sc.f-r1.9-r1.9.2.1.diff 8783 RMD160 815d25cff0fa76f73dc43da9757ad753ec392f9c SHA1 f55e2e8c84ec8cd3b94cb703b50abff625e3a7fb SHA256 418feea2ccf0014c3c2c83ab9460873114057480fd2a1dcabe305a1b956ad86b
 DIST setup.fh-r1.5-r1.5.2.1.diff 1317 RMD160 45a16b00792706553e7bf23a2f54415cd5ee1b43 SHA1 2a7417cf998b5e9fcac3b3b8a2deb05627d29d1a SHA256 637564c5723fb7de04d3a06817eec704ac708b74264716905690250e42aed146
-EBUILD ccp4-6.0.1-r1.ebuild 13944 RMD160 fc7ec5aa03290af987c496acdd89b075ce4ddd30 SHA1 02b204c8ba4e1831b0a2cf87a3506be1c8e37fd6 SHA256 57aedc5e8e3e96703ddd98fd2a3c11e65bbb4b32a9601f02ef18a5338e17b87e
-MD5 ef9a2046608085c09735a997e97c2038 ccp4-6.0.1-r1.ebuild 13944
-RMD160 fc7ec5aa03290af987c496acdd89b075ce4ddd30 ccp4-6.0.1-r1.ebuild 13944
-SHA256 57aedc5e8e3e96703ddd98fd2a3c11e65bbb4b32a9601f02ef18a5338e17b87e ccp4-6.0.1-r1.ebuild 13944
-EBUILD ccp4-6.0.2.ebuild 13410 RMD160 c312dfe539f7f7d4d00d3d83a1755e29c6e014ea SHA1 7d0fd1c20966b0357ada578c5b14803daa39ed18 SHA256 92b6478d0c13e99f8226574976289e98e7f6c8902ae8698826ab5af56922e50f
-MD5 1ccb26c931aca1fd0e17b102b13a9b3a ccp4-6.0.2.ebuild 13410
-RMD160 c312dfe539f7f7d4d00d3d83a1755e29c6e014ea ccp4-6.0.2.ebuild 13410
-SHA256 92b6478d0c13e99f8226574976289e98e7f6c8902ae8698826ab5af56922e50f ccp4-6.0.2.ebuild 13410
-MISC ChangeLog 2618 RMD160 8b9e50f89de677207ee72ff7a51e3bb77dbe9aed SHA1 4e12c72723c981dca0333ff9c4bec728cab1bddf SHA256 7f8132cde9fee0b289dd3e84b906f7d989a47f9c6aa9347aab3c02c66ba2ff79
-MD5 66806c1688f5a896966d39daf92a4d2b ChangeLog 2618
-RMD160 8b9e50f89de677207ee72ff7a51e3bb77dbe9aed ChangeLog 2618
-SHA256 7f8132cde9fee0b289dd3e84b906f7d989a47f9c6aa9347aab3c02c66ba2ff79 ChangeLog 2618
+EBUILD ccp4-6.0.1-r1.ebuild 13942 RMD160 997765e9977dfb850b4d40ce5e967f9b7e99e82c SHA1 787e60971ee9926f8211058f1962c8c3bc93ecb7 SHA256 eb6b65a52180eabcaaa8927e99347e7bd62227b9f615270bc03777d3fdc46920
+MD5 97b04da2cb34ea8f7e2d251e771b1cdf ccp4-6.0.1-r1.ebuild 13942
+RMD160 997765e9977dfb850b4d40ce5e967f9b7e99e82c ccp4-6.0.1-r1.ebuild 13942
+SHA256 eb6b65a52180eabcaaa8927e99347e7bd62227b9f615270bc03777d3fdc46920 ccp4-6.0.1-r1.ebuild 13942
+EBUILD ccp4-6.0.2.ebuild 13415 RMD160 b7dacf8e5466af6617ca105ff2e0ed43a8ae10eb SHA1 aa6777252c628a63c26eb73e39ad2243f87ad265 SHA256 86aaa59521e0fb1c6bf8b434fa4cd7cc1039bc1ddad0c3cd57b97e8c73670dde
+MD5 e81c46c469388e7feead8bcbe7d9b3e3 ccp4-6.0.2.ebuild 13415
+RMD160 b7dacf8e5466af6617ca105ff2e0ed43a8ae10eb ccp4-6.0.2.ebuild 13415
+SHA256 86aaa59521e0fb1c6bf8b434fa4cd7cc1039bc1ddad0c3cd57b97e8c73670dde ccp4-6.0.2.ebuild 13415
+MISC ChangeLog 2626 RMD160 f2eb0fbd036233df75b657bda08b254e97997d9f SHA1 3cca34e1ea5a0a39967f1edc3f5e9f7aeef8a600 SHA256 3f8232cb39ba58f357009e3310c76fb9cda2fe66a35fc66c61312d7e76e1f0a6
+MD5 8e7e5f0325f2d6accceeae35c06cc624 ChangeLog 2626
+RMD160 f2eb0fbd036233df75b657bda08b254e97997d9f ChangeLog 2626
+SHA256 3f8232cb39ba58f357009e3310c76fb9cda2fe66a35fc66c61312d7e76e1f0a6 ChangeLog 2626
 MISC metadata.xml 166 RMD160 4452298fd03e7c9395d1182bfe69d60a14144af6 SHA1 cb0b513473c0348f4f6f6cd9a132e4884155fddb SHA256 84c92b49702daf95eace8d2765215cbd8650da4ef776f9f700b5ce3785dec852
 MD5 43628e9f5743b5c3b018a82669a76bc7 metadata.xml 166
 RMD160 4452298fd03e7c9395d1182bfe69d60a14144af6 metadata.xml 166
@@ -96,7 +96,7 @@ SHA256 a9d7f019b604fd193ac9797e76d5c3058771a16866134bdbe9b94ca137405946 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFGFx5n8bi6rjpTunYRAnAAAKDSwrCCuzo79vFesjKMnAL307QtyACfU51m
-rD96WLp92/lbL0J7yzQ/9S8=
-=aJqX
+iD8DBQFGF1cO8bi6rjpTunYRArOiAJ43243HlCEQjvpPcAjBbdBi95VkoQCgojOF
+urm3TjL0o9vNb7ymFpE8OlI=
+=KMOH
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/ccp4/ccp4-6.0.1-r1.ebuild b/sci-chemistry/ccp4/ccp4-6.0.1-r1.ebuild
index 8e6000dc4292..3b167a274f1a 100644
--- a/sci-chemistry/ccp4/ccp4-6.0.1-r1.ebuild
+++ b/sci-chemistry/ccp4/ccp4-6.0.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccp4/ccp4-6.0.1-r1.ebuild,v 1.4 2007/04/07 04:30:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccp4/ccp4-6.0.1-r1.ebuild,v 1.5 2007/04/07 08:31:50 vapier Exp $
 
 inherit fortran eutils gnuconfig toolchain-funcs
 
@@ -255,16 +255,17 @@ src_install() {
 #		${S}/$(get_libdir)/cctbx/cctbx_build/setpaths*
 
 	# Bins
-	EXEDESTTREE="/usr/bin" doexe ${S}/bin/*
+	dobin ${S}/bin/* || die
 
 	# Libs
 	for file in ${S}/lib/*; do
 		if [[ -d ${file} ]]; then
 			continue
 		elif [[ -x ${file} ]]; then
-			dolib.so ${file}
+			dolib.so ${file} || die
 		else
-			INSDESTTREE="/usr/$(get_libdir)" doins ${file}
+			insinto /usr/$(get_libdir)
+			doins ${file} || die
 		fi
 	done
 
@@ -350,18 +351,23 @@ src_install() {
 #	dosym libxdl_view.so.2.0.0 /usr/$(get_libdir)/libxdl_view.so.2.0
 
 	# Environment files, setup scripts, etc.
-	INSDESTTREE="/usr/share/ccp4/include" doins ${S}/include/*
+	insinto /usr/share/ccp4/include
+	doins ${S}/include/*
 
 	# CCP4Interface - GUI
-	INSDESTTREE="/usr/$(get_libdir)/ccp4" doins -r ${S}/ccp4i
-	EXEDESTTREE="/usr/$(get_libdir)/ccp4/ccp4i/bin" doexe ${S}/ccp4i/bin/*
+	insinto /usr/$(get_libdir)/ccp4
+	doins -r ${S}/ccp4i || die
+	exeinto /usr/$(get_libdir)/ccp4/ccp4i/bin
+	doexe ${S}/ccp4i/bin/* || die
 
 	# Data
-	INSDESTTREE="/usr/share/ccp4" doins -r ${S}/lib/data
+	insinto /usr/share/ccp4
+	doins -r ${S}/lib/data || die
 
 	# Include files
+	insinto /usr/include
 	for i in ccp4 clipper mmdb ssm; do
-		INSDESTTREE="/usr/include" doins -r ${S}/include/${i}
+		doins -r ${S}/include/${i} || die
 	done
 
 	# Install docs and examples
diff --git a/sci-chemistry/ccp4/ccp4-6.0.2.ebuild b/sci-chemistry/ccp4/ccp4-6.0.2.ebuild
index cdf37f0a1089..7541be357821 100644
--- a/sci-chemistry/ccp4/ccp4-6.0.2.ebuild
+++ b/sci-chemistry/ccp4/ccp4-6.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccp4/ccp4-6.0.2.ebuild,v 1.3 2007/04/07 04:30:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccp4/ccp4-6.0.2.ebuild,v 1.4 2007/04/07 08:31:50 vapier Exp $
 
 inherit fortran eutils gnuconfig toolchain-funcs
 
@@ -225,16 +225,17 @@ src_install() {
 #		${S}/$(get_libdir)/cctbx/cctbx_build/setpaths*
 
 	# Bins
-	EXEDESTTREE="/usr/bin" doexe ${S}/bin/*
+	dobin ${S}/bin/* || die
 
 	# Libs
 	for file in ${S}/lib/*; do
 		if [[ -d ${file} ]]; then
 			continue
 		elif [[ -x ${file} ]]; then
-			dolib.so ${file}
+			dolib.so ${file} || die
 		else
-			INSDESTTREE="/usr/$(get_libdir)" doins ${file}
+			insinto /usr/$(get_libdir)
+			doins ${file} || die
 		fi
 	done
 
@@ -320,18 +321,23 @@ src_install() {
 #	dosym libxdl_view.so.2.0.0 /usr/$(get_libdir)/libxdl_view.so.2.0
 
 	# Environment files, setup scripts, etc.
-	INSDESTTREE="/usr/share/ccp4/include" doins ${S}/include/*
+	insinto /usr/share/ccp4/include
+	doins ${S}/include/* || die
 
 	# CCP4Interface - GUI
-	INSDESTTREE="/usr/$(get_libdir)/ccp4" doins -r ${S}/ccp4i
-	EXEDESTTREE="/usr/$(get_libdir)/ccp4/ccp4i/bin" doexe ${S}/ccp4i/bin/*
+	insinto /usr/$(get_libdir)/ccp4
+	doins -r ${S}/ccp4i || die
+	exeinto /usr/$(get_libdir)/ccp4/ccp4i/bin
+	doexe ${S}/ccp4i/bin/* || die
 
 	# Data
-	INSDESTTREE="/usr/share/ccp4" doins -r ${S}/lib/data
+	insinto /usr/share/ccp4
+	doins -r ${S}/lib/data || die
 
 	# Include files
+	insinto /usr/include
 	for i in ccp4 clipper mmdb ssm; do
-		INSDESTTREE="/usr/include" doins -r ${S}/include/${i}
+		doins -r ${S}/include/${i} || die
 	done
 
 	# Install docs and examples