diff options
author | Justin Lecher <jlec@gentoo.org> | 2010-06-28 21:05:46 +0000 |
---|---|---|
committer | Justin Lecher <jlec@gentoo.org> | 2010-06-28 21:05:46 +0000 |
commit | 8b2fef7efbc1927d3c23786132c65e940376522d (patch) | |
tree | 5acff52150bdbe828637fd4b359ce498f3ba4722 /sci-chemistry/cns | |
parent | Fix idmapd/gssd dep calculation with nfs mounts #324725 by Михаил. (diff) | |
download | gentoo-2-8b2fef7efbc1927d3c23786132c65e940376522d.tar.gz gentoo-2-8b2fef7efbc1927d3c23786132c65e940376522d.tar.bz2 gentoo-2-8b2fef7efbc1927d3c23786132c65e940376522d.zip |
Removed blocking of dos2unix
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'sci-chemistry/cns')
-rw-r--r-- | sci-chemistry/cns/ChangeLog | 7 | ||||
-rw-r--r-- | sci-chemistry/cns/cns-1.2.1-r1.ebuild | 10 | ||||
-rw-r--r-- | sci-chemistry/cns/cns-1.2.1-r2.ebuild | 8 | ||||
-rw-r--r-- | sci-chemistry/cns/cns-1.2.1-r3.ebuild | 7 | ||||
-rw-r--r-- | sci-chemistry/cns/cns-1.2.1-r4.ebuild | 7 | ||||
-rw-r--r-- | sci-chemistry/cns/cns-1.2.1.ebuild | 9 |
6 files changed, 30 insertions, 18 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/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() { |