Fixed to use doenvd wrt bug #173884Fixed to use doenvd wrt bug #173884

Package-Manager: portage-2.1.2.2

4 files changed, 21 insertions, 19 deletions

diff --git a/sci-biology/emboss/ChangeLog b/sci-biology/emboss/ChangeLog
index 707e795ee295..8fdcc566c332 100644
--- a/sci-biology/emboss/ChangeLog
+++ b/sci-biology/emboss/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-biology/emboss
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/emboss/ChangeLog,v 1.41 2006/12/10 18:49:20 ribosome Exp $
+# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/emboss/ChangeLog,v 1.42 2007/04/09 23:06:58 je_fro Exp $
+
+  09 Apr 2007; Jeff Gardner <je_fro@gentoo.org> +files/22emboss,
+  -files/22emboss-r1, emboss-4.0.0.ebuild:
+  Fixed to use doenvd wrt bug #173884
 
   10 Dec 2006; Olivier Fisette <ribosome@gentoo.org>
   -emboss-3.0.0-r1.ebuild, emboss-4.0.0.ebuild:
diff --git a/sci-biology/emboss/Manifest b/sci-biology/emboss/Manifest
index 264f97ac4eae..9c187c9ffb55 100644
--- a/sci-biology/emboss/Manifest
+++ b/sci-biology/emboss/Manifest
@@ -1,20 +1,20 @@
-AUX 22emboss-r1 110 RMD160 aa416dbfca66cc7822ed162122addadde2756c66 SHA1 c77b477bfdf0e77de4f29794e4fb2e7592557e48 SHA256 cf3bd3b8d2638a0cd14e57839033d63c855114a0e12883bbc7a5106b0cfc01ad
-MD5 ef2dfa3d13837026f59c0cf5f04f67c5 files/22emboss-r1 110
-RMD160 aa416dbfca66cc7822ed162122addadde2756c66 files/22emboss-r1 110
-SHA256 cf3bd3b8d2638a0cd14e57839033d63c855114a0e12883bbc7a5106b0cfc01ad files/22emboss-r1 110
+AUX 22emboss 110 RMD160 aa416dbfca66cc7822ed162122addadde2756c66 SHA1 c77b477bfdf0e77de4f29794e4fb2e7592557e48 SHA256 cf3bd3b8d2638a0cd14e57839033d63c855114a0e12883bbc7a5106b0cfc01ad
+MD5 ef2dfa3d13837026f59c0cf5f04f67c5 files/22emboss 110
+RMD160 aa416dbfca66cc7822ed162122addadde2756c66 files/22emboss 110
+SHA256 cf3bd3b8d2638a0cd14e57839033d63c855114a0e12883bbc7a5106b0cfc01ad files/22emboss 110
 AUX README.Gentoo 1326 RMD160 bfaa4d7d1218d3bd4ea58d54d000da7f58b6bca6 SHA1 8cf13b8aa23c11f0af2aae06916970bf9d8a441f SHA256 33b517b977cc85824847bd6cf4113489a5554fb014f1a6b1d22d6f80c3487e9f
 MD5 615888722f8d6a0c918f936e0cc1cfcd files/README.Gentoo 1326
 RMD160 bfaa4d7d1218d3bd4ea58d54d000da7f58b6bca6 files/README.Gentoo 1326
 SHA256 33b517b977cc85824847bd6cf4113489a5554fb014f1a6b1d22d6f80c3487e9f files/README.Gentoo 1326
 DIST EMBOSS-4.0.0.tar.gz 17651607 RMD160 5b29ac2946a1315928581bf0e40a0f6b5023c599 SHA1 784c729f2d2e746339a90048277c9e4f052e036a SHA256 bbfd127adc064a5211542f3b5400cbb13c7f74d9171fd16b8531cee9fd11b231
-EBUILD emboss-4.0.0.ebuild 3038 RMD160 0d4477134db67b8ed9edf180d81a8ad545643e5b SHA1 4eae18942dad62860e692dae9b8fb0d6869b2229 SHA256 cc610e2b746878e9452b2293bade9739b26cb6bceb50336671c059c3ba623aa2
-MD5 8ba3872c6752008ee96188053b2d7a49 emboss-4.0.0.ebuild 3038
-RMD160 0d4477134db67b8ed9edf180d81a8ad545643e5b emboss-4.0.0.ebuild 3038
-SHA256 cc610e2b746878e9452b2293bade9739b26cb6bceb50336671c059c3ba623aa2 emboss-4.0.0.ebuild 3038
-MISC ChangeLog 7522 RMD160 9918a042adf79e1b0f4fd9d329971542e18a3bc7 SHA1 51f606216c110d8bcf1ba4f93e7b56610e397144 SHA256 22c025294fb2fed7801a4b0a599fbc027e5d739b3d496f509ab23ce8aa4533c5
-MD5 eee5be80ffd518e7dcf83734ba929260 ChangeLog 7522
-RMD160 9918a042adf79e1b0f4fd9d329971542e18a3bc7 ChangeLog 7522
-SHA256 22c025294fb2fed7801a4b0a599fbc027e5d739b3d496f509ab23ce8aa4533c5 ChangeLog 7522
+EBUILD emboss-4.0.0.ebuild 2999 RMD160 f36fcba1fd3153ca27c1392be79ae9914344b56e SHA1 ef13303cd5a130501626a6b4dbcf9d23d79967e9 SHA256 46e5752122f3720db42ff667b377c465a47c017937530cd17a13c515e342ff59
+MD5 2a7ce21cfc7f7e46d9f7ef20dc56a276 emboss-4.0.0.ebuild 2999
+RMD160 f36fcba1fd3153ca27c1392be79ae9914344b56e emboss-4.0.0.ebuild 2999
+SHA256 46e5752122f3720db42ff667b377c465a47c017937530cd17a13c515e342ff59 emboss-4.0.0.ebuild 2999
+MISC ChangeLog 7667 RMD160 efb082ccf14010accdced6eac84d36de91056787 SHA1 18e31ab5189e1566a5a034eb2c7cb499b1c812d8 SHA256 c1e2de771e481d35f6296ab7f939fce36ed888b19b867ea18fdb4ac3bb199753
+MD5 954383f0f92da87f289e54541fa0ecb2 ChangeLog 7667
+RMD160 efb082ccf14010accdced6eac84d36de91056787 ChangeLog 7667
+SHA256 c1e2de771e481d35f6296ab7f939fce36ed888b19b867ea18fdb4ac3bb199753 ChangeLog 7667
 MISC metadata.xml 1021 RMD160 ee767f436af5f815ecb9526df9063438dab8eb14 SHA1 eff46db435f88e0b457ce2a38e5ff786ae6324e1 SHA256 0c5af548d0483d41a3344695cb04acaf0974fb56b70bc1e2ec0a9749ecbc45a0
 MD5 ecba11e4d50ee5cc740817f5becffa83 metadata.xml 1021
 RMD160 ee767f436af5f815ecb9526df9063438dab8eb14 metadata.xml 1021
diff --git a/sci-biology/emboss/emboss-4.0.0.ebuild b/sci-biology/emboss/emboss-4.0.0.ebuild
index 2c0be61fa74d..09c7afaad9d9 100644
--- a/sci-biology/emboss/emboss-4.0.0.ebuild
+++ b/sci-biology/emboss/emboss-4.0.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/emboss/emboss-4.0.0.ebuild,v 1.7 2006/12/10 18:49:20 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/emboss/emboss-4.0.0.ebuild,v 1.8 2007/04/09 23:06:58 je_fro Exp $
 
 DESCRIPTION="The European Molecular Biology Open Software Suite - A sequence analysis package"
 HOMEPAGE="http://emboss.sourceforge.net/"
@@ -54,9 +54,7 @@ src_install() {
 			|| die "Failed to install documentation."
 
 	# Install env file for setting libplplot and acd files path.
-	insinto /etc/env.d
-	newins ${FILESDIR}/22emboss-r1 22emboss || \
-			die "Failed to install environment file."
+	doenvd ${FILESDIR}/22emboss || die "Failed to install environment file."
 
 	# Symlink preinstalled docs to /usr/share/doc.
 	dosym /usr/share/EMBOSS/doc/manuals /usr/share/doc/${PF}/manuals || die
diff --git a/sci-biology/emboss/files/22emboss-r1 b/sci-biology/emboss/files/22emboss
index 177643ced11f..177643ced11f 100644
--- a/sci-biology/emboss/files/22emboss-r1
+++ b/sci-biology/emboss/files/22emboss