Removed blocking of dos2unix

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

7 files changed, 40 insertions, 28 deletions

diff --git a/sci-chemistry/cns/ChangeLog b/sci-chemistry/cns/ChangeLog
index 07d51acb8a5b..f1de133e998d 100644
--- a/sci-chemistry/cns/ChangeLog
+++ b/sci-chemistry/cns/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-chemistry/cns
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cns/ChangeLog,v 1.23 2010/04/05 21:15:30 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cns/ChangeLog,v 1.24 2010/06/28 21:05:46 jlec Exp $
+
+  28 Jun 2010; Justin Lecher <jlec@gentoo.org> cns-1.2.1.ebuild,
+  cns-1.2.1-r1.ebuild, cns-1.2.1-r2.ebuild, cns-1.2.1-r3.ebuild,
+  cns-1.2.1-r4.ebuild:
+  Removed blocking of dos2unix
 
 *cns-1.2.1-r4 (05 Apr 2010)
 
diff --git a/sci-chemistry/cns/Manifest b/sci-chemistry/cns/Manifest
index 1af3c73b2618..e8d90de25ebd 100644
--- a/sci-chemistry/cns/Manifest
+++ b/sci-chemistry/cns/Manifest
@@ -20,18 +20,18 @@ DIST cns_solve_1.21_all.tar.gz 32739912 RMD160 ab763373923264497d1ccb507cab23b2e
 DIST cns_solve_1.2_all.tar.gz 30456531 RMD160 45cff57b3f026d730032cfc1c9476880f7cc81ab SHA1 1611ad499746993a9d210e6053e1cdd1553848a7 SHA256 230847d8e00def4b55dda8c50d9148bca11a88ed6bc575e735041c91f8fff064
 EBUILD cns-1.1.ebuild 3598 RMD160 c659528cda734552ca1faa9bc85c371b92d90d46 SHA1 e891a1be5f873e869bce5a6b617bbfd54a7aa71d SHA256 2be38322ddc333590c4d891f675921cabb0e18ef795042c1c4a849beb0793f6b
 EBUILD cns-1.2-r1.ebuild 4467 RMD160 cc3f1a26a8c28c111f25b74572dc4af3bb1d56c9 SHA1 f4da145be4190c1837e3262291f75c9eeaa3ef2d SHA256 ac40399a59987612e7602811cb79fdb4ae0295d23222afb6947ad1b79f5a8238
-EBUILD cns-1.2.1-r1.ebuild 5531 RMD160 93f382ecb94f6b6a21108182a2aae18547bc704a SHA1 f80f7203f79cd527b2ccdd2755971a21a6b87cba SHA256 0866f9e38ce28d128db71974d1832f7fc6124f0d11b02f90111cd8a5434b075c
-EBUILD cns-1.2.1-r2.ebuild 6085 RMD160 bbf32a77b2c3d84becb95d390704b77943348ac1 SHA1 4e09e5ce780edb8f78eea2456be1aebd0ebef3a9 SHA256 26812e41de70704d1327b5e9abcdd73eb63b03162aa0ff3e340594d1da0506ec
-EBUILD cns-1.2.1-r3.ebuild 6212 RMD160 c42de027f4b43219617f1ff14ee7f2183719ba38 SHA1 d4c2c9155047d1da4225af0f9f8d391ed02b53f9 SHA256 9bb0e75981db8f7feff60465311b4840b398c1f8a095dfe0ebc9a3888d59addc
-EBUILD cns-1.2.1-r4.ebuild 6536 RMD160 2d6ffd2f5d33cb1ee82f1941a845f2880b7196f1 SHA1 862abc4c0324cda2bff4a1624b8172517f7e833e SHA256 c7c92a842e450e203f1098b05edd9a82545c331b008b4b7ece8a63539685774f
-EBUILD cns-1.2.1.ebuild 5574 RMD160 23000fd54ce250a3dbf40ab71d12c539fda0d9fd SHA1 42c852c40d23eeec1280359d5adfe8c51a7ebf24 SHA256 7c1f6871416f516773af3cd23d8be9c2b0e978401898d5932622a2dd2b121301
+EBUILD cns-1.2.1-r1.ebuild 5585 RMD160 d25d66002ffe133c390912e265f81aae860134c9 SHA1 239355135deb0213fe9bb9c85c480e3bce86a887 SHA256 9c91c6093b03f28c7c59cd73aa08c32397867fce5bfc28a6f1b5534a92c73ec4
+EBUILD cns-1.2.1-r2.ebuild 6132 RMD160 8dd964fed1d90f708689d6e63e9ec0dc6b9f45cf SHA1 7ebbf35a7e8ec2e2f246389a3fdfcf93e8fb5d87 SHA256 853162df3142ce1a46e05d77b2e50672cda0a41efd25daee1261109d91493aaf
+EBUILD cns-1.2.1-r3.ebuild 6258 RMD160 353ad806f567cc71f4137f75f78743ed38d14fed SHA1 9424d69c95fa65418b6c34b2675dc7827f465b59 SHA256 0ee874568facb4e188d4718f034c8cdb60f1517cdc663996468f5b1f6ad46d4e
+EBUILD cns-1.2.1-r4.ebuild 6582 RMD160 544cf18f4dd459c7d2325da7998fef6db0eebaa3 SHA1 e263f40adcd54c724b341e3b49d79286521fe352 SHA256 192c853f998484cd71a7d6bec6a35071c5846dd74cbc67c6bca7ff08c2a029d1
+EBUILD cns-1.2.1.ebuild 5620 RMD160 84fae2bc1f0780f77b931ee23a18acdd7353e766 SHA1 4b58160d9a20c103a7f443491ed5e1d5bade2afe SHA256 8504163c5874f0e90582ef37a44800ec2dbf9b112282682c237236e708ed79cf
 EBUILD cns-1.2.ebuild 3497 RMD160 9e097171ebd44f1a7e5dd317beeb6b65aefac2f6 SHA1 3afc4b415d2ef559b717843a05bc6afb8ee651a2 SHA256 1a6094c8bca3797e62c375a2370cc7425e9c1dd1106d20f202681bc5a87da1fc
-MISC ChangeLog 4152 RMD160 3cb037666c2b579e81527d08e8917d72fce107ec SHA1 03d46a719f4af3051e22e004ee9044975d41ad76 SHA256 470bf8329e75d21ddd59f7ea31f3b037f00da24ce6a76bc7ae0d358b888b636f
+MISC ChangeLog 4337 RMD160 022a7c7f918ff9d65e7827a3e56b3b97aac64fdd SHA1 f43a0d2049d1edcdba2f1618c4f8f72da6180923 SHA256 68c4cc815f176428f011d5fc27576e6bdb797b8f180dfab72a512bafde14244a
 MISC metadata.xml 302 RMD160 d60d9cd875115eaba68ad4b504bff76b39a136b0 SHA1 ecdd8feeea2de489927403f1941acfc582c17222 SHA256 a374144760a8ac1f72b1c625c41f98cee3f74511c964133bda119da580664c50
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAku6UvcACgkQgAnW8HDreRYpsgCfXT5xGtA0TaZIx2eFf0wzdIxa
-Ei0AoIbsOb831iB/oM9XBi1f8mqM3h47
-=rN//
+iEYEARECAAYFAkwpDrEACgkQgAnW8HDreRY32gCeJua/25A5KHDLHXWKhBTvpnUM
+S7AAoLdLqa/LhNY4pWbj0E1lFJ7btAzI
+=xHBI
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/cns/cns-1.2.1-r1.ebuild b/sci-chemistry/cns/cns-1.2.1-r1.ebuild
index cc538da0e785..43cb66d7f7b8 100644
--- a/sci-chemistry/cns/cns-1.2.1-r1.ebuild
+++ b/sci-chemistry/cns/cns-1.2.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cns/cns-1.2.1-r1.ebuild,v 1.2 2010/02/06 12:02:19 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cns/cns-1.2.1-r1.ebuild,v 1.3 2010/06/28 21:05:46 jlec Exp $
 
 EAPI="2"
 
@@ -19,8 +19,7 @@ LICENSE="cns"
 KEYWORDS="~amd64 ~x86"
 IUSE="openmp"
 
-RDEPEND="app-shells/tcsh
-	!app-text/dos2unix"
+RDEPEND="app-shells/tcsh"
 DEPEND="${RDEPEND}"
 
 RESTRICT="fetch"
@@ -176,7 +175,10 @@ src_install() {
 	dohtml \
 		-A iq,cgi,csh,cv,def,fm,gif,hkl,inp,jpeg,lib,link,list,mask,mtf,param,pdb,pdf,pl,ps,sc,sca,sdb,seq,tbl,top \
 		-f all_cns_info_template,omac,def \
-		-r doc/html/*
+		-r doc/html/* || die
+
+	# Conflits with app-text/dos2unix
+	rm -f "${D}"/usr/bin/dos2unix
 }
 
 pkg_info() {
diff --git a/sci-chemistry/cns/cns-1.2.1-r2.ebuild b/sci-chemistry/cns/cns-1.2.1-r2.ebuild
index a911028998ce..1f255cd6d6c3 100644
--- a/sci-chemistry/cns/cns-1.2.1-r2.ebuild
+++ b/sci-chemistry/cns/cns-1.2.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cns/cns-1.2.1-r2.ebuild,v 1.2 2010/03/07 09:54:15 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cns/cns-1.2.1-r2.ebuild,v 1.3 2010/06/28 21:05:46 jlec Exp $
 
 EAPI="3"
 
@@ -20,8 +20,7 @@ LICENSE="cns"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="aria openmp"
 
-RDEPEND="app-shells/tcsh
-	!app-text/dos2unix"
+RDEPEND="app-shells/tcsh"
 DEPEND="${RDEPEND}"
 PDEPEND="aria? ( sci-chemistry/aria )"
 
@@ -194,6 +193,9 @@ src_install() {
 		-A iq,cgi,csh,cv,def,fm,gif,hkl,inp,jpeg,lib,link,list,mask,mtf,param,pdb,pdf,pl,ps,sc,sca,sdb,seq,tbl,top \
 		-f all_cns_info_template,omac,def \
 		-r doc/html/* || die
+
+	# Conflits with app-text/dos2unix
+	rm -f "${D}"/usr/bin/dos2unix
 }
 
 pkg_info() {
diff --git a/sci-chemistry/cns/cns-1.2.1-r3.ebuild b/sci-chemistry/cns/cns-1.2.1-r3.ebuild
index e6cbce88bf7a..dbaadbaff966 100644
--- a/sci-chemistry/cns/cns-1.2.1-r3.ebuild
+++ b/sci-chemistry/cns/cns-1.2.1-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cns/cns-1.2.1-r3.ebuild,v 1.1 2010/03/20 13:33:12 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cns/cns-1.2.1-r3.ebuild,v 1.2 2010/06/28 21:05:46 jlec Exp $
 
 EAPI="3"
 
@@ -20,8 +20,7 @@ LICENSE="cns"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="aria openmp"
 
-RDEPEND="app-shells/tcsh
-	!app-text/dos2unix"
+RDEPEND="app-shells/tcsh"
 DEPEND="${RDEPEND}"
 PDEPEND="aria? ( ~sci-chemistry/aria-2.3.1 )"
 
@@ -196,6 +195,8 @@ src_install() {
 		-A iq,cgi,csh,cv,def,fm,gif,hkl,inp,jpeg,lib,link,list,mask,mtf,param,pdb,pdf,pl,ps,sc,sca,sdb,seq,tbl,top \
 		-f all_cns_info_template,omac,def \
 		-r doc/html/* || die
+	# Conflits with app-text/dos2unix
+	rm -f "${D}"/usr/bin/dos2unix
 }
 
 pkg_info() {
diff --git a/sci-chemistry/cns/cns-1.2.1-r4.ebuild b/sci-chemistry/cns/cns-1.2.1-r4.ebuild
index 47f07c3a834e..e0fcb147b539 100644
--- a/sci-chemistry/cns/cns-1.2.1-r4.ebuild
+++ b/sci-chemistry/cns/cns-1.2.1-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cns/cns-1.2.1-r4.ebuild,v 1.1 2010/04/05 21:15:30 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cns/cns-1.2.1-r4.ebuild,v 1.2 2010/06/28 21:05:46 jlec Exp $
 
 EAPI="3"
 
@@ -20,8 +20,7 @@ LICENSE="cns"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="aria openmp"
 
-RDEPEND="app-shells/tcsh
-	!app-text/dos2unix"
+RDEPEND="app-shells/tcsh"
 DEPEND="${RDEPEND}"
 PDEPEND="aria? ( ~sci-chemistry/aria-2.3.1 )"
 
@@ -207,6 +206,8 @@ src_install() {
 		-A iq,cgi,csh,cv,def,fm,gif,hkl,inp,jpeg,lib,link,list,mask,mtf,param,pdb,pdf,pl,ps,sc,sca,sdb,seq,tbl,top \
 		-f all_cns_info_template,omac,def \
 		-r doc/html/* || die
+	# Conflits with app-text/dos2unix
+	rm -f "${D}"/usr/bin/dos2unix
 }
 
 pkg_info() {
diff --git a/sci-chemistry/cns/cns-1.2.1.ebuild b/sci-chemistry/cns/cns-1.2.1.ebuild
index 8595ee6447c6..7c0cb33baa01 100644
--- a/sci-chemistry/cns/cns-1.2.1.ebuild
+++ b/sci-chemistry/cns/cns-1.2.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cns/cns-1.2.1.ebuild,v 1.5 2010/02/06 21:49:39 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cns/cns-1.2.1.ebuild,v 1.6 2010/06/28 21:05:46 jlec Exp $
 
 inherit eutils fortran toolchain-funcs versionator flag-o-matic
 
@@ -17,8 +17,7 @@ LICENSE="cns"
 SLOT="0"
 KEYWORDS="amd64 ~ppc ~x86"
 IUSE="openmp"
-RDEPEND="app-shells/tcsh
-	!app-text/dos2unix"
+RDEPEND="app-shells/tcsh"
 DEPEND="${RDEPEND}"
 S="${WORKDIR}/${MY_P}"
 
@@ -171,6 +170,8 @@ src_install() {
 		-A iq,cgi,csh,cv,def,fm,gif,hkl,inp,jpeg,lib,link,list,mask,mtf,param,pdb,pdf,pl,ps,sc,sca,sdb,seq,tbl,top \
 		-f all_cns_info_template,omac,def \
 		-r doc/html/*
+	# Conflits with app-text/dos2unix
+	rm -f "${D}"/usr/bin/dos2unix
 }
 
 pkg_info() {