(#162740) Bump.

Package-Manager: portage-2.1.2.7

5 files changed, 156 insertions, 22 deletions

diff --git a/sci-chemistry/cns/ChangeLog b/sci-chemistry/cns/ChangeLog
index 25833d4ce123..0b23d6eeccf2 100644
--- a/sci-chemistry/cns/ChangeLog
+++ b/sci-chemistry/cns/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-chemistry/cns
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cns/ChangeLog,v 1.6 2007/03/15 17:08:43 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cns/ChangeLog,v 1.7 2007/06/22 07:01:13 dberkholz Exp $
+
+*cns-1.2 (22 Jun 2007)
+
+  22 Jun 2007; Donnie Berkholz <dberkholz@gentoo.org>; cns-1.1.ebuild,
+  +cns-1.2.ebuild:
+  (#162740) Bump.
 
   15 Mar 2007; Danny van Dyk <kugelfang@gentoo.org> cns-1.1.ebuild:
   QA: Removed illegal use of ${ROOT}. Bug #168043
diff --git a/sci-chemistry/cns/Manifest b/sci-chemistry/cns/Manifest
index 1a4766c2a48c..421ac5fbeef6 100644
--- a/sci-chemistry/cns/Manifest
+++ b/sci-chemistry/cns/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 1.1-time-length-10.patch 443 RMD160 664ae29ccb2921954ffb14653e4560ed2bef1fa4 SHA1 ca1ddd1535c54bd541570eaf0187eb4c6f638e13 SHA256 73ca56b80588aabd513d6f5171db1217189899e04b5e460a55824eef13c5505a
 MD5 53591c4f04cc3ac9c21ba8da86ffa24b files/1.1-time-length-10.patch 443
 RMD160 664ae29ccb2921954ffb14653e4560ed2bef1fa4 files/1.1-time-length-10.patch 443
@@ -8,14 +5,19 @@ SHA256 73ca56b80588aabd513d6f5171db1217189899e04b5e460a55824eef13c5505a files/1.
 DIST cns_solve_1.1_basic_inputs.tar.gz 5049767 RMD160 eb5686a006d53cf269456eaecd7507842c8a10eb SHA1 255e7c5170168f9e032ef9e84a870eddf176f4ce SHA256 916d86d96159bd945a3b05e26c71af0cc6097234776385630f618fa2641cf3eb
 DIST cns_solve_1.1_data.tar.gz 18770504 RMD160 a18470f31fa6213e817dadf3c3c56231ebce9e63 SHA1 3eaae5ecd1df14412083af8a31a6e3f7b14c4753 SHA256 da59213013b845ca357decfc11337c7dfdb3134bd012c710291c66e8febdbb37
 DIST cns_solve_1.1_test.tar.gz 2852870 RMD160 2f7e7b5ed4e603b2459944a8991829d1361315b5 SHA1 c50587cf3fdfcb1266d13dbd689a9b8b094fb681 SHA256 c5d049596cca4f6985b0b4997f4fa62345d2c111b8fab534918829ade1899a23
-EBUILD cns-1.1.ebuild 3580 RMD160 c935b2406c44d41db30c174fa62693b2f2b5ab06 SHA1 c6cc57f89bc3d91f0c1fa365e7934a0f13a615ae SHA256 4234512cdf84dcf9720ece11887089b79f168235931709bbfea7d84c74a9dbfc
-MD5 36383e5b59d74c9c64fb47f254ea8ca6 cns-1.1.ebuild 3580
-RMD160 c935b2406c44d41db30c174fa62693b2f2b5ab06 cns-1.1.ebuild 3580
-SHA256 4234512cdf84dcf9720ece11887089b79f168235931709bbfea7d84c74a9dbfc cns-1.1.ebuild 3580
-MISC ChangeLog 1066 RMD160 238cba11c5fddb8d3a7c9f131b209c55c9f3cbdd SHA1 541a74a02c5dd943cdccf78344bda9837d359579 SHA256 9ff8cc8ee8ca2d5594e96f01a37127a23fcd97fd3da23301459f025c0cea1093
-MD5 34751af2245edcda8c92b46e49ba9f1a ChangeLog 1066
-RMD160 238cba11c5fddb8d3a7c9f131b209c55c9f3cbdd ChangeLog 1066
-SHA256 9ff8cc8ee8ca2d5594e96f01a37127a23fcd97fd3da23301459f025c0cea1093 ChangeLog 1066
+DIST cns_solve_1.2_all.tar.gz 30456531 RMD160 45cff57b3f026d730032cfc1c9476880f7cc81ab SHA1 1611ad499746993a9d210e6053e1cdd1553848a7 SHA256 230847d8e00def4b55dda8c50d9148bca11a88ed6bc575e735041c91f8fff064
+EBUILD cns-1.1.ebuild 3627 RMD160 7afb52c6e1fb8fb0dad02f7cadf00753394a43de SHA1 6a3ca889ec45b7f3d07e87025ce336cd716ac46b SHA256 80af06cf6075ad20db398ef3c6cbec8c5e92bee09d039fcdcc0634a7db2c6146
+MD5 b89c4d5f044c8d6d7155855dd49dea76 cns-1.1.ebuild 3627
+RMD160 7afb52c6e1fb8fb0dad02f7cadf00753394a43de cns-1.1.ebuild 3627
+SHA256 80af06cf6075ad20db398ef3c6cbec8c5e92bee09d039fcdcc0634a7db2c6146 cns-1.1.ebuild 3627
+EBUILD cns-1.2.ebuild 3526 RMD160 9179b57dcbbe8d75b97fa6abf8568213dbe85fd6 SHA1 3d8b846fb0e7d479d3c7cf97f31b76ca8ae012a8 SHA256 10324bf7c2f0dad705ff2c4c51c8d17c7469a4e0d18d08ea2f4e3b8fa1f974c9
+MD5 cad9887e9edc4445e3c3814e4ae34b5d cns-1.2.ebuild 3526
+RMD160 9179b57dcbbe8d75b97fa6abf8568213dbe85fd6 cns-1.2.ebuild 3526
+SHA256 10324bf7c2f0dad705ff2c4c51c8d17c7469a4e0d18d08ea2f4e3b8fa1f974c9 cns-1.2.ebuild 3526
+MISC ChangeLog 1199 RMD160 2c8cf60c7a801f8b3261b37ccf95872773fd0c77 SHA1 8b84d6d231f4d161186c9fcd2447a72403ac70d4 SHA256 3b32dc4ac01cc84bd0550af925bce4de391087a8ae6598116e75ef5d8323d16d
+MD5 ca3dac2672f9f10b75f6f8e44e322839 ChangeLog 1199
+RMD160 2c8cf60c7a801f8b3261b37ccf95872773fd0c77 ChangeLog 1199
+SHA256 3b32dc4ac01cc84bd0550af925bce4de391087a8ae6598116e75ef5d8323d16d ChangeLog 1199
 MISC metadata.xml 166 RMD160 4452298fd03e7c9395d1182bfe69d60a14144af6 SHA1 cb0b513473c0348f4f6f6cd9a132e4884155fddb SHA256 84c92b49702daf95eace8d2765215cbd8650da4ef776f9f700b5ce3785dec852
 MD5 43628e9f5743b5c3b018a82669a76bc7 metadata.xml 166
 RMD160 4452298fd03e7c9395d1182bfe69d60a14144af6 metadata.xml 166
@@ -23,10 +25,6 @@ SHA256 84c92b49702daf95eace8d2765215cbd8650da4ef776f9f700b5ce3785dec852 metadata
 MD5 b385cdc2d3d0081bc11e84da22d9bdbf files/digest-cns-1.1 804
 RMD160 f61ade67504a936a20ba4da9835af097c8cae912 files/digest-cns-1.1 804
 SHA256 8d3e2c15dea9f13feb8c0f6ef3d46f5e4892a1f51175176146bd76915ff9c0cf files/digest-cns-1.1 804
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
-
-iD8DBQFF+X2+5mJXAu5GbtIRAkqxAJ47LQ7KvtgRjveogqdh3B5PJT1kNwCfSSvw
-lixmh7cmpKgrhLrF8T0CjmU=
-=ZLU1
------END PGP SIGNATURE-----
+MD5 fc43bb6a094383b0d23f972804920841 files/digest-cns-1.2 259
+RMD160 c7558e8567e1f9ba6e8c567c1aeb0f061b35c87c files/digest-cns-1.2 259
+SHA256 a5448713d044cf6c88894266096a09518a40cd515df46820f6577175cea5d2ed files/digest-cns-1.2 259
diff --git a/sci-chemistry/cns/cns-1.1.ebuild b/sci-chemistry/cns/cns-1.1.ebuild
index e772a65dc1cc..29ae2413ac5d 100644
--- a/sci-chemistry/cns/cns-1.1.ebuild
+++ b/sci-chemistry/cns/cns-1.1.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/cns/cns-1.1.ebuild,v 1.3 2007/03/15 17:08:43 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cns/cns-1.1.ebuild,v 1.4 2007/06/22 07:01:13 dberkholz Exp $
 
 inherit eutils fortran toolchain-funcs
 
@@ -17,8 +17,7 @@ LICENSE="cns"
 SLOT="0"
 KEYWORDS="ppc x86"
 IUSE="test"
-RDEPEND="|| ( app-shells/tcsh app-shells/csh )
-	!app-text/dos2unix"
+RDEPEND="|| ( app-shells/tcsh app-shells/csh )"
 DEPEND="${RDEPEND}"
 S="${WORKDIR}/${MY_P}"
 
@@ -117,6 +116,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/*
+
+	# Conflits with app-text/dos2unix
+	rm -f "${D}"/usr/bin/dos2unix
 }
 
 pkg_postinst() {
diff --git a/sci-chemistry/cns/cns-1.2.ebuild b/sci-chemistry/cns/cns-1.2.ebuild
new file mode 100644
index 000000000000..46ab988a4828
--- /dev/null
+++ b/sci-chemistry/cns/cns-1.2.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cns/cns-1.2.ebuild,v 1.1 2007/06/22 07:01:13 dberkholz Exp $
+
+inherit eutils fortran toolchain-funcs
+
+MY_PN="${PN}_solve"
+MY_P="${MY_PN}_${PV}"
+
+DESCRIPTION="Crystallography and NMR System"
+HOMEPAGE="http://cns.csb.yale.edu/"
+SRC_URI="${MY_P}_all.tar.gz"
+RESTRICT="fetch"
+LICENSE="cns"
+SLOT="0"
+KEYWORDS="~ppc ~x86"
+IUSE=""
+RDEPEND="|| ( app-shells/tcsh app-shells/csh )
+	!app-text/dos2unix"
+DEPEND="${RDEPEND}"
+S="${WORKDIR}/${MY_P}"
+
+FORTRAN="g77 gfortran"
+
+pkg_nofetch() {
+	einfo "Fill out the form at http://cns.csb.yale.edu/cns_request/"
+	einfo "and place these files:"
+	einfo "${A}"
+	einfo "in ${DISTDIR}."
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# The length of time must be at least 10, not 9
+	# http://gcc.gnu.org/ml/fortran/2006-02/msg00198.html
+	epatch "${FILESDIR}"/1.1-time-length-10.patch
+
+	# Set up location for the build directory
+	# Uses obsolete `sort` syntax, so we set _POSIX2_VERSION
+	sed -i \
+		-e "s:_CNSsolve_location_:${S}:g" \
+		-e "17 s:\(.*\):\1\nsetenv _POSIX2_VERSION 199209:g" \
+		"${S}"/cns_solve_env
+}
+
+src_compile() {
+	local GLOBALS
+	if [[ ${FORTRANC} = g77 ]]; then
+		GLOBALS="-fno-globals"
+	fi
+
+	# make install really means build, since it's expected to be used in-place
+	emake \
+		CC="$(tc-getCC)" \
+		F77="${FORTRANC}" \
+		LD="${FORTRANC}" \
+		CCFLAGS="${CFLAGS} -DCNS_ARCH_TYPE_\$(CNS_ARCH_TYPE) \$(EXT_CCFLAGS)" \
+		F77OPT="${FFLAGS:- -O2} \$(CNS_MALIGN_I86)" \
+		F77STD="${GLOBALS}" \
+		LDFLAGS="${LDFLAGS}" \
+		g77install \
+		|| die "emake failed"
+}
+
+src_test() {
+	# We need to force on g77 manually, because we can't get aliases working
+	# when we source in a -c
+	einfo "Running tests ..."
+	csh -c \
+		"setenv CNS_G77; source cns_solve_env; make run_tests" \
+		|| die "tests failed"
+	einfo "Displaying test results ..."
+	cat "${S}"/*_g77/test/*.diff-test
+}
+
+src_install() {
+	# Install to locations resembling FHS
+	sed -i \
+		-e "s:${S}:usr:g" \
+		-e "s:^\(setenv CNS_SOLVE.*\):\1\nsetenv CNS_ROOT usr:g" \
+		-e "s:^\(setenv CNS_SOLVE.*\):\1\nsetenv CNS_DATA \$CNS_ROOT/share/data:g" \
+		-e "s:^\(setenv CNS_SOLVE.*\):\1\nsetenv CNS_DOC \$CNS_ROOT/share/doc/${PF}:g" \
+		-e "s:CNS_MODULE \$CNS_SOLVE/modules:CNS_MODULE \$CNS_DATA/modules:g" \
+		-e "s:\$CNS_LIB:\$CNS_DATA:g" \
+		-e "s:CNS_HELPLIB \$CNS_SOLVE/helplib:CNS_HELPLIB \$CNS_DATA/helplib:g" \
+		-e "s:\$CNS_SOLVE/bin/cns_info:\$CNS_DATA/bin/cns_info:g" \
+		"${S}"/cns_solve_env
+
+	# Get rid of setup stuff we don't need in the installed script
+	sed -i \
+		-e "83,$ d" \
+		-e "37,46 d" \
+		"${S}"/cns_solve_env
+
+	newbin "${S}"/*_g77/bin/cns_solve* cns_solve \
+		|| die "install cns_solve failed"
+
+	# Can be run by either cns_solve or cns
+	dosym cns_solve /usr/bin/cns
+
+	# Don't want to install this
+	rm -f "${S}"/*_g77/utils/Makefile
+
+	dobin "${S}"/*_g77/utils/* || die "install utils failed"
+
+	dobin "${S}"/bin/cns_{edit,header,transfer,web} || die "install bin failed"
+
+	insinto /usr/share/cns
+	doins -r "${S}"/libraries "${S}"/modules "${S}"/helplib
+	doins "${S}"/bin/cns_info
+	doins "${S}"/cns_solve_env
+
+	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/*
+}
+
+pkg_postinst() {
+	ewarn "You must source ${ROOT}usr/share/cns/cns_solve_env"
+	ewarn "before running CNS. It's a C-shell script,"
+	ewarn "so you also must be using csh or tcsh."
+}
diff --git a/sci-chemistry/cns/files/digest-cns-1.2 b/sci-chemistry/cns/files/digest-cns-1.2
new file mode 100644
index 000000000000..1b3fb7cb9da1
--- /dev/null
+++ b/sci-chemistry/cns/files/digest-cns-1.2
@@ -0,0 +1,3 @@
+MD5 66b54d9f9e780beee850e4dd07d7031a cns_solve_1.2_all.tar.gz 30456531
+RMD160 45cff57b3f026d730032cfc1c9476880f7cc81ab cns_solve_1.2_all.tar.gz 30456531
+SHA256 230847d8e00def4b55dda8c50d9148bca11a88ed6bc575e735041c91f8fff064 cns_solve_1.2_all.tar.gz 30456531