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

(Portage version: 2.1.2.3)

3 files changed, 32 insertions, 20 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/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