Version Bump

Package-Manager: portage-2.2_rc62/cvs/Linux x86_64
RepoMan-Options: --force

4 files changed, 54 insertions, 38 deletions

diff --git a/sci-libs/coot-data/ChangeLog b/sci-libs/coot-data/ChangeLog
index b7d883f1daa0..4a21692c20be 100644
--- a/sci-libs/coot-data/ChangeLog
+++ b/sci-libs/coot-data/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/coot-data
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/coot-data/ChangeLog,v 1.8 2009/10/10 00:12:29 patrick Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/coot-data/ChangeLog,v 1.9 2010/02/05 23:31:14 jlec Exp $
+
+*coot-data-2 (05 Feb 2010)
+
+  05 Feb 2010; Justin Lecher (jlec) <jlec@gentoo.org> -coot-data-1.ebuild,
+  +coot-data-2.ebuild:
+  Version Bump
 
   10 Oct 2009; Patrick Lauer <patrick@gentoo.org> coot-data-1.ebuild:
   Fixing Homepage, other half of #285068
diff --git a/sci-libs/coot-data/Manifest b/sci-libs/coot-data/Manifest
index 1fd28c1c0d4c..fbca9ad817c2 100644
--- a/sci-libs/coot-data/Manifest
+++ b/sci-libs/coot-data/Manifest
@@ -1,5 +1,14 @@
-DIST reference-structures.tar.gz 6945369 RMD160 0dd9b2057cf5d6b0d060d704231aa7c5518f0b3b SHA1 796842664877ae1d71b7c64bfb0219b839325cf7 SHA256 ba0a21e1f7f9065c7dd691e784d6508edc9ffae8b31923e5def5f1cbb7108b06
-DIST refmac-lib-data-monomers.tar.gz 2163068 RMD160 1443977959247c28cf1e7ad6683d0e72228f4cce SHA1 738188574335734a17062a5cb45db0e6610df2ca SHA256 e4c9f89fd3bc1d3ab74c8270ed187875524800e0b72fb8131e298baa2b555a58
-EBUILD coot-data-1.ebuild 1079 RMD160 ab8eecb71d66bce5697de11c89b821f0dd076739 SHA1 8be9fee4a682f5cb25f9da61f6fdaa52000186ad SHA256 954e862a86a611c2ad0a1b3dcdc6b0d2e4710ec10259e25e5bc33d280b323a51
-MISC ChangeLog 1254 RMD160 6829d82725a95d9451023faaafb31beddc092cbc SHA1 6907f9815b2aadf57288e0470e178be294d848e9 SHA256 1ec21bdc45c56a339132a1b6fe36c4e788da2fc1c9a4b7ba96cff30e944d26b2
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST reference-structures-2.tar.gz 6728787 RMD160 811e7eb4fcd768721e89d82c12135f9bfff0091b SHA1 9c9173115bb57e7ab0734fd5347bcac574860045 SHA256 44db38506f0f90c097d4855ad81a82a36b49cd1e3ffe7d6ee4728b15109e281a
+EBUILD coot-data-2.ebuild 972 RMD160 57c4e1bf3113fc2762c72382b418ce803bc6796b SHA1 1ec80d4e2e60a52694f20ea7ccc0c5d7d52e7edd SHA256 d9e698b0ac0617623c60b8cc2187c74a318033f64e99c1c4b6f7b5705b59d791
+MISC ChangeLog 1393 RMD160 0d5f5bf99c8a2857d20c9af3716a6da165788b03 SHA1 84ffb49dcaa369ccf380f2f7f12607dce1b9e358 SHA256 f4174e0610381e184ffb70afd6d9b684b439b5b3ee498e021342a9af544a4c59
 MISC metadata.xml 166 RMD160 4452298fd03e7c9395d1182bfe69d60a14144af6 SHA1 cb0b513473c0348f4f6f6cd9a132e4884155fddb SHA256 84c92b49702daf95eace8d2765215cbd8650da4ef776f9f700b5ce3785dec852
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAktsqkcACgkQgAnW8HDreRZVhQCfayqu8pnuEOMUrMnwz67eoa58
+sZkAoMedqPX3n4Y2l7DpPPvS95tJ88wN
+=ZN9z
+-----END PGP SIGNATURE-----
diff --git a/sci-libs/coot-data/coot-data-1.ebuild b/sci-libs/coot-data/coot-data-1.ebuild
deleted file mode 100644
index 9565bf64bb25..000000000000
--- a/sci-libs/coot-data/coot-data-1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/coot-data/coot-data-1.ebuild,v 1.5 2009/10/10 00:12:29 patrick Exp $
-
-DESCRIPTION="Data for the Crystallographic Object-Oriented Toolkit"
-HOMEPAGE="http://www.biop.ox.ac.uk/coot/"
-SRC_URI="http://www.ysbl.york.ac.uk/~emsley/software/extras/reference-structures.tar.gz
-	http://www.ysbl.york.ac.uk/~emsley/software/extras/refmac-lib-data-monomers.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ppc x86"
-IUSE=""
-RDEPEND=""
-DEPEND="${RDEPEND}"
-
-src_install() {
-	dodir /usr/share/coot
-	ebegin "Copying reference structures to ${D}/usr/share/coot/"
-	cp -R ${WORKDIR}/reference-structures ${D}/usr/share/coot/
-	eend
-	ebegin "Copying monomer library to ${D}/usr/share/coot/"
-	cp -R ${WORKDIR}/lib ${D}/usr/share/coot/
-	eend
-
-	# Coot looks in the wrong spot for the monomer library
-	# Listens to ccp4's CCP4_LIB rather than CLIBD_MON
-	cat << EOF >> ${T}/coot
-COOT_REFMAC_LIB_DIR="/usr/share/coot/lib"
-EOF
-
-	newenvd ${T}/coot 20coot
-}
diff --git a/sci-libs/coot-data/coot-data-2.ebuild b/sci-libs/coot-data/coot-data-2.ebuild
new file mode 100644
index 000000000000..d432282384a4
--- /dev/null
+++ b/sci-libs/coot-data/coot-data-2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/coot-data/coot-data-2.ebuild,v 1.1 2010/02/05 23:31:14 jlec Exp $
+
+EAPI="3"
+
+DESCRIPTION="Data for the Crystallographic Object-Oriented Toolkit"
+HOMEPAGE="http://www.biop.ox.ac.uk/coot/"
+#SRC_URI="http://www.ysbl.york.ac.uk/~emsley/software/extras/reference-structures.tar.gz"
+SRC_URI="mirror://gentoo/reference-structures-${PV}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RESTRICT="binchecks strip"
+
+S="${WORKDIR}"
+
+src_install() {
+	insinto /usr/share/coot
+	doins -r reference-structures || die
+
+	# Coot looks in the wrong spot for the monomer library
+	# Listens to ccp4's CCP4_LIB rather than CLIBD_MON
+	cat >> "${T}"/coot <<- EOF
+	COOT_REFMAC_LIB_DIR="${EPREFIX}/usr/share/ccp4/"
+	COOT_REF_STRUCTS="${EPREFIX}/usr/share/coot/reference-structures/"
+	EOF
+
+	newenvd "${T}"/coot 20coot || die
+}