Cleaned for current HEAD

(Portage version: 2.2.0_alpha37/git/Linux x86_64, signed Manifest commit with key 70EB7916)

5 files changed, 23 insertions, 43 deletions

diff --git a/sci-chemistry/coot/ChangeLog b/sci-chemistry/coot/ChangeLog
index 07b2eb379..61ad2d879 100644
--- a/sci-chemistry/coot/ChangeLog
+++ b/sci-chemistry/coot/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  28 May 2011; Justin Lecher <jlec@gentoo.org> -files/9999-clipper.patch,
+  files/9999-lidia.patch, coot-9999.ebuild:
+  Cleaned for current HEAD
+
   02 May 2011; Justin Lecher <jlec@gentoo.org> coot-9999.ebuild:
   Fix x11-libs/goocanvas SLOT
 
diff --git a/sci-chemistry/coot/Manifest b/sci-chemistry/coot/Manifest
index ce794a219..cdeaff287 100644
--- a/sci-chemistry/coot/Manifest
+++ b/sci-chemistry/coot/Manifest
@@ -1,19 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX 9999-clipper.patch 314 RMD160 23780b108f2cabb1ba54de038b2e1716e4e4566e SHA1 a0832f4375c790ea6fd6888e9abb842a974c3909 SHA256 989fe91aa3760e2c0d34983943a9744a0ec9eb740737baeaa46c2bf8ea5c7169
 AUX 9999-gl.patch 383 RMD160 6460e87e4da57ff845f96f072dec1354ed117bee SHA1 00bc0bbfc7d4fb00ebc8477941469bef2ed6b670 SHA256 9d47a6cf2d0c7644b945f88acdc7af146df4f9a5a8f883a0e72e1bc8ccf8b380
 AUX 9999-goocanvas.patch 702 RMD160 9b26975eb658f15dfd806e47be9c11bcb7f850db SHA1 37bb70847ced34b754fe7cf5fea878b93bb6ed12 SHA256 162b21a3afb2d523df315ec021faf7a6497eb3b4fe00f90f601527fe1c22621a
 AUX 9999-include.patch 345 RMD160 6e42ce2afa7141f9cdcda0ca3ea5a11ef4f0f15f SHA1 3df3955307115ed8527f55fb49452905991c36cc SHA256 07b61fb298da857c5c37abb492cf192c65f9b538a3fc2d316aca7f4269e25a75
-AUX 9999-lidia.patch 1043 RMD160 331a05df5ecba315c371568922b4d1320bc8df2d SHA1 65eea09b38101b8bac5564a4c2ec4436ff4c44a0 SHA256 f29b4efb1f83ab04400ad934f037e4b6f42bdb35c9e82de5b77d86ce8acc6790
-DIST greg-data.tar.gz 8041681 RMD160 dc03bc233bed69fd6288a92a48b9a7e0bbf56129 SHA1 6e27bd0053758cf829a3ff8bd07b94c9e1ffb777 SHA256 46b9bb2dc9f5dfff463a5fe95e8e583e2a44760ae96fc0b8b5b4bd455e35862d
-EBUILD coot-9999.ebuild 4101 RMD160 cbc359609f906d614f03fb2655be3aaa6f12baf0 SHA1 4c46aab716544c32a8631ff05f405a040122d752 SHA256 aaaeef71fcaf80654d749cff909af10932ac8e7b88df17e9afff576b2b50bf70
-MISC ChangeLog 9661 RMD160 c4c7f92b55a95dcc332a08e58ebd8e5dd34c8154 SHA1 309ff517634998420b90c5e7fd122dee62585f81 SHA256 95a0e90b1623ce15ae39b2fb747be706b031d9ae20735a051fc94ca6a2c86acb
+AUX 9999-lidia.patch 518 RMD160 bc1ac82f5d0e1c51f5cebaceb758ca306ea638d9 SHA1 7eb4f7e08ab0aea2f94d2ef27f26fc2aa796f21e SHA256 4b0cc3ed5a0a21cc9af5c2148779a6b82d2ad555720843af237efe0a3cc15be8
+DIST greg-data.tar.gz 8041684 RMD160 355c54c63e83cbe28932278b4d19ae1cb353d530 SHA1 79da6d49a80c4744d406b8ecdbf6c04fc3bbdf3f SHA256 81828d3e257bfe98a5e04e74256a9217c7ad7dc7194948e8b0fac194ae2fbab8
+EBUILD coot-9999.ebuild 4066 RMD160 dbd1a1b9f00c90d010c74b8e91d9bb20489b254b SHA1 65473fb1dac322b09f02222b45c81cb5d5f16735 SHA256 7c19748e60b92792521391999685438b73b07bf3cd90733c6f031e6c2a352ea7
+MISC ChangeLog 9807 RMD160 b4e17905e91237635026e7b0c3eb634c1e8468d9 SHA1 872196f5aad27ad23c7fbaf9a294f18995be282a SHA256 db0f537149aa35923925109c0ce3004bf2357f5b5d5e8eae47e70d358b97fbea
 MISC metadata.xml 306 RMD160 303613d4bb58ea149f418efc0d41f550ecbb94ca SHA1 1caeb2549f7f6a1dd44f2200784be8f2a7f294ab SHA256 f0ead885a2ede3186db2797473c72249fb525de661c279ca2ce7b8b152399bf6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2+T2oACgkQgAnW8HDreRbfXgCgwr1EjxfmSS5GRQdtHoZ66GZ3
-aWgAoMEGaLPbQ8tAb/QUEcE6lqyzuPwe
-=9NDF
+iEYEARECAAYFAk3g0bAACgkQgAnW8HDreRZFOgCgvwKyIFXVsW22/JnxgeG2jXxp
+rpMAni+GHyeMc279YTI1T5PYB7765cox
+=hOSs
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/coot/coot-9999.ebuild b/sci-chemistry/coot/coot-9999.ebuild
index 67b679feb..bfeee1e85 100644
--- a/sci-chemistry/coot/coot-9999.ebuild
+++ b/sci-chemistry/coot/coot-9999.ebuild
@@ -73,7 +73,6 @@ pkg_setup() {
 PATCHES=(
 	"${FILESDIR}"/${PV}-lidia.patch
 	"${FILESDIR}"/${PV}-goocanvas.patch
-	"${FILESDIR}"/${PV}-clipper.patch
 	"${FILESDIR}"/${PV}-include.patch
 	"${FILESDIR}"/${PV}-gl.patch
 	)
diff --git a/sci-chemistry/coot/files/9999-clipper.patch b/sci-chemistry/coot/files/9999-clipper.patch
deleted file mode 100644
index e3f028f98..000000000
--- a/sci-chemistry/coot/files/9999-clipper.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-Index: lidia-core/Makefile.am
-===================================================================
---- lidia-core/Makefile.am	(revision 3299)
-+++ lidia-core/Makefile.am	(working copy)
-@@ -23,3 +23,4 @@
- 
- libcoot_lidia_core_la_SOURCES = lbg-molfile.cc lig-build.cc
- 
-+libcoot_lidia_core_la_LIBADD = $(CLIPPER_LIBS)
diff --git a/sci-chemistry/coot/files/9999-lidia.patch b/sci-chemistry/coot/files/9999-lidia.patch
index 0ca154c96..207651367 100644
--- a/sci-chemistry/coot/files/9999-lidia.patch
+++ b/sci-chemistry/coot/files/9999-lidia.patch
@@ -1,28 +1,15 @@
-Index: lbg/Makefile.am
-===================================================================
---- lbg/Makefile.am	(revision 3478)
-+++ lbg/Makefile.am	(working copy)
-@@ -32,6 +32,12 @@
- 	$(top_builddir)/utils/libcoot-utils.la \
- 	$(CLIPPER_LIBS) $(MMDB_LIBS) $(GSL_LIBS) $(RDKIT_LIBS) $(GOOCANVAS_LIBS) $(GTK_LIBS)
- 
-+libcoot_lidia_la_LIBADD = \
-+	$(top_builddir)/coot-utils/libcoot-coord-utils.la \
-+	$(top_builddir)/lidia-core/libcoot-lidia-core.la \
-+	$(top_builddir)/geometry/libcoot-geometry.la \
-+	$(GTK_LIBS) $(GSL_LIBS) $(GOOCANVAS_LIBS)
+ lidia-core/Makefile.am |    4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/lidia-core/Makefile.am b/lidia-core/Makefile.am
+index 17d468d..78bf054 100644
+--- a/lidia-core/Makefile.am
++++ b/lidia-core/Makefile.am
+@@ -34,3 +34,7 @@ libcoot_lidia_core_la_SOURCES = lbg-molfile.cc lig-build.cc
+ # test_molfile_SOURCES: test-molfile.cc
+ 
+ # test_molfile_LDADD: libcoot-lidia-core.la
 +
- lidia_SOURCES = lidia-main.cc lbg-callbacks-outer.cc
- 
- include_HEADERS = lbg.hh wmolecule.hh rdkit-interface.hh flev-annotations.hh 
-Index: lidia-core/Makefile.am
-===================================================================
---- lidia-core/Makefile.am	(revision 3478)
-+++ lidia-core/Makefile.am	(working copy)
-@@ -29,3 +29,6 @@
- 
- libcoot_lidia_core_la_SOURCES = lbg-molfile.cc lig-build.cc
- 
 +libcoot_lidia_core_la_LIBADD = \
 +	$(top_builddir)/geometry/libcoot-geometry.la \
-+	$(MMDB_LIBS)
++	$(MMDB_LIBS) $(CLIPPER_LIBS)